From 6f44f6cfadef657c5fd55bdb9974c2b8e3262ba8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 12:51:22 +0800
Subject: [PATCH] 修改3.0 9.20
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 17 ++++++++++++++---
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java | 4 ++++
inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java | 10 ++++++++--
inventory-server/src/main/resources/mapper/SaleMapper.xml | 3 ++-
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
index d28113e..ed7a45b 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
@@ -10,6 +10,8 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -25,8 +27,12 @@
@Scheduled(cron = "0 0 4 * * ?") // 姣忓ぉ鍑屾櫒4鐐硅Е鍙�
public void pullDataFromOtherSystem() {
+ //鑾峰彇鍓嶄竴澶╁噷鏅ㄦ椂闂�
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+ String dateTime = LocalDateTime.now().minusDays(1).with(LocalTime.of(0, 0, 0)).format(formatter);
//鑾峰彇涓婚攢鍞暟鎹�
- List<Map<String, Object>> order = SyncOrder.getMainOrder("2023-08-01 10:00:00 ");
+ List<Map<String, Object>> order = SyncOrder.getMainOrder(dateTime);
List<Sale> list = order.stream().map(orde -> {
Sale sale = new Sale();
sale.setOrderNumber(orde.get("orderNo").toString());//璁㈠崟缂栧彿
@@ -42,7 +48,7 @@
}).collect(Collectors.toList());
saleService.saveBatch(list);
for (Sale sale : list) {
- List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder("2023-08-01 10:00:00", sale.getOrderNumber());
+ List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder(dateTime, sale.getOrderNumber());
List<SaleMaterial> saleMaterials = innerOrder.stream().map(inorder -> {
SaleMaterial saleMaterial = new SaleMaterial();
saleMaterial.setName(inorder.get("productName").toString()); //浜у搧鍚嶇О
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
index 04d32db..c309f10 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
@@ -36,6 +36,10 @@
@JsonSerialize
private String proname;
+ //澶囨敞
+ @JsonSerialize
+ private String note;
+
//涓嬪崟浜�
@JsonSerialize
@NotBlank(message = "涓嬪崟浜轰笉鑳戒负绌�")
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index 0c674fa..b57e94c 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -14,7 +14,8 @@
name,
proname,
type,
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ note
from mom_ocean.sale
where state=1
<if test="orderNumber!=null and orderNumber!=''">
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index 8db80aa..0498b09 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,17 +1,20 @@
package com.yuanchu.mom;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.yuanchu.mom.Task.SyncOrder;
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.SaleMaterial;
import com.yuanchu.mom.vo.Result;
+import javafx.scene.input.DataFormat;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@SpringBootTest
@@ -53,4 +56,12 @@
System.out.println(saleMaterials);
}
}
+
+ @Test
+ void aaa() {
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+ System.out.println(LocalDateTime.now().minusDays(1).with(LocalTime.of(0,0,0)).format(formatter));
+
+ }
}
--
Gitblit v1.9.3