From 0925a458d92d33aa05b2fb03aec3ac8c13e5d763 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 04 一月 2023 11:23:16 +0800
Subject: [PATCH] #中间表对接：订单完结上报完成
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index 168e85b..8cb6b98 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -12,11 +12,8 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.model.DetlDto;
import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpDetTbBak;
-import com.zy.ints.entity.Prdt;
-import com.zy.ints.entity.PrdtBak;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +21,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -142,6 +139,7 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9999L);
orderDetl.setUpdateTime(now);
+ orderDetl.setMemo(erpDetTb.getWh());
if (orderDetlService.insert(orderDetl)){
erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
}else {
@@ -151,6 +149,7 @@
}
}
} else if (status == 1) {
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
HashMap<String, Object> condition = new HashMap<>();
condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
condition.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
@@ -159,7 +158,7 @@
condition.put("qty", "'" + erpDetTb.getQty() + "'");
condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
condition.put("wh", "'" + erpDetTb.getWh() + "'");
- condition.put("billdate", "'" + erpDetTb.getBilldate() + "'");
+ condition.put("billdate", "'" + format + "'");
condition.put("status", "'" + erpDetTb.getStatus() + "'");
condition.put("temp1", "'" + erpDetTb.getTemp1() + "'");
condition.put("temp2", "'" + erpDetTb.getTemp2() + "'");
@@ -167,9 +166,9 @@
erpSqlServer.insert(ErpDetTbBak.class, condition);
HashMap<String, String> condition2 = new HashMap<>();
- condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
+ condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
condition2.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
- condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
+ condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
erpSqlServer.delete(ErpDetTb.class, condition2);
} else if (status == 2) {
--
Gitblit v1.9.1