From 7aa8988e8c034e3323c613bd8e6b9bebb8442ed2 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期五, 10 四月 2026 10:43:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4 ++--
src/main/java/com/zy/common/model/DetlDto.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 ++-
src/main/resources/application.yml | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d124527..781ec6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -102,7 +102,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getQcStatus());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getQcStatus(),detail.getPlanNo());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -127,6 +127,7 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
+ orderDetl.setSku(detlDto.getPlanNo());
orderDetl.setInspect(Integer.valueOf(detlDto.getQcStatus()));
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 0b1ca17..d411b2a 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -50,10 +50,10 @@
}
}
-// @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- String erpReport = Parameter.get().getErpReport();
+ String erpReport = "true";
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 0d69487..c01f200 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -52,11 +52,12 @@
this.batch = batch;
this.anfme = anfme;
}
- public DetlDto(String matnr, String batch, Double anfme, String qcStatus) {
+ public DetlDto(String matnr, String batch, Double anfme, String qcStatus,String planNo) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
this.qcStatus = qcStatus;
+ this.planNo = planNo;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ddec027..f6d3384 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8888
servlet:
context-path: /@pom.build.finalName@
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=lfdasrsErp
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1