From 608fa275864c7cb4353e5e030e4a1304e56529ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 13:12:05 +0800
Subject: [PATCH] 修改4.0 9.20
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 2 +-
inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java | 3 ---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 8 --------
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 14 ++++++++++++--
inventory-server/src/main/resources/mapper/SaleMapper.xml | 1 +
inspect-server/pom.xml | 12 ------------
6 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index 1c37786..8d64347 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -52,17 +52,5 @@
<version>0.0.20131108.vaadin1</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>core</artifactId>
- <version>3.4.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>javase</artifactId>
- <version>3.4.1</version>
- </dependency>
-
</dependencies>
</project>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 736da38..a5b5b19 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -1,12 +1,9 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.extra.qrcode.BufferedImageLuminanceSource;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.zxing.*;
-import com.google.zxing.common.HybridBinarizer;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;
@@ -15,12 +12,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
index 48c3b9d..55f90ed 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
@@ -49,9 +49,6 @@
ManualTechnologyMapper manualTechnologyMapper;
@Resource
- SpecificationsMapper specificationsMapper;
-
- @Resource
TechnologyMapper technologyMapper;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index 956c217..ea3ff9d 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.Task.SyncOrder;
@@ -23,6 +24,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -194,8 +198,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String synchronization() {
+ //褰撳ぉ鏃堕棿鐨勫噷鏅�4鐐瑰紑濮嬪悓姝�
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+ String dateTime = LocalDateTime.now().with(LocalTime.of(4, 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());//璁㈠崟缂栧彿
@@ -209,9 +217,11 @@
sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
return sale;
}).collect(Collectors.toList());
+ //鍘婚噸
+ list.removeIf(sale -> ObjectUtils.isNotEmpty(saleMapper.selectOne(Wrappers.<Sale>query().eq("order_number", sale.getOrderNumber()))));
this.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/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index b57e94c..ef27ecf 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -43,6 +43,7 @@
specifications,
unit,
number,
+ note,
DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
sm.type
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 0498b09..030a81b 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -62,6 +62,6 @@
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));
-
+ System.out.println(LocalDateTime.now().with(LocalTime.of(4, 0, 0)).format(formatter));
}
}
--
Gitblit v1.9.3