From 23d98e719feeba8440522a4474c473cabc10d832 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 10:42:57 +0800
Subject: [PATCH] 代码bug修改调试
---
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 41e56ed..5eb0b41 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,12 +65,14 @@
if (docType.getPakin() == 1) {
//鍏ュ簱鍗�
for (OrderDetl orderDetl : orderDetls) {
+ log.info("璇ュ叆搴撳崟瀵硅薄:" + orderDetl);
insertInDet(orderDetl);
}
insertInHed(order);
} else {
//鍑哄簱鍗�
for (OrderDetl orderDetl : orderDetls) {
+ log.info("璇ュ嚭搴撳崟瀵硅薄:" + orderDetl);
insertOutDet(orderDetl);
}
insertOutHed(order);
@@ -99,7 +103,6 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Map<String, Object> content = getMap(orderDetl);
int insert = erpSqlServer.insert(InDetTB.class, content);
@@ -129,17 +132,23 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
+ DocType docType = docTypeService.selectById(order.getDocType());
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + order.getOrderNo() + "'");
- content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
+ if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
+ if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
+ if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
+ if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+ if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
+ if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
+ if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
content.put("LKName", "'涓壃浜屾湡'");
content.put("bPass", "1");
int insert = erpSqlServer.insert(InHedTB.class, content);
- //String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
- //int update = erpSqlServer.update(sql);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
@@ -167,9 +176,8 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Map<String, Object> content = getMap(orderDetl);
- int insert = erpSqlServer.insert(InDetTB.class, content);
+ int insert = erpSqlServer.insert(OutDetTB.class, content);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:" + content.toString());
@@ -197,17 +205,23 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
+ DocType docType = docTypeService.selectById(order.getDocType());
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + order.getOrderNo() + "'");
- content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
+ if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
+ if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
+ if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
+ if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+ if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
+ if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
+ if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
content.put("LKName", "'涓壃浜屾湡'");
content.put("bPass", "1");
int insert = erpSqlServer.insert(OutHedTB.class, content);
- //String sql = "UPDATE lk_OutHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
- //int update = erpSqlServer.update(sql);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
@@ -220,10 +234,10 @@
private Map<String, Object> getMap(OrderDetl orderDetl) {
Map<String, Object> content = new HashMap<>();
if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
- if (!Cools.isEmpty(orderDetl.getINO())) content.put("iNO", "'" + orderDetl.getINO() + "'");
+ if (!Cools.isEmpty(orderDetl.getINo())) content.put("iNo", "'" + orderDetl.getINo() + "'");
if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("detId", orderDetl.getThreeCode());
- if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
- if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemId", "'" + orderDetl.getMatnr() + "'");
+ if (!Cools.isEmpty(orderDetl.getModel())) content.put("ItemCode", "'" + orderDetl.getModel() + "'");
if (!Cools.isEmpty(orderDetl.getBatch())) content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
if (!Cools.isEmpty(orderDetl.getProType())) content.put("proType", "'" + orderDetl.getProType() + "'");
if (!Cools.isEmpty(orderDetl.getMemo())) content.put("remark", "'" + orderDetl.getMemo() + "'");
--
Gitblit v1.9.1