From 47dc5ae0a4e1173c794f151349ce9a07576d0888 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 30 七月 2024 18:48:40 +0800
Subject: [PATCH] 图标修改

---
 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index 6904b70..aff3acf 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -61,13 +61,13 @@
             }
             orderService.remove(order.getId());
         }
-        DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+        DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(), inHedTB.getIoKindID(), Boolean.TRUE);
         Date now = new Date();
         // 鍗曟嵁涓绘。
         order = new Order(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
                 inHedTB.getBillNo(),    // 璁㈠崟缂栧彿
-                DateUtils.convert(inHedTB.getBillDate()),    // 鍗曟嵁鏃ユ湡
+                DateUtils.convert(inHedTB.getMakeDate()),    // 鍗曟嵁鏃ユ湡
                 docType.getDocId(),    // 鍗曟嵁绫诲瀷
                 null,    // 椤圭洰缂栧彿
                 null,    //
@@ -100,11 +100,16 @@
                 inHedTB.getMakeDate(),    // 淇敼鏃堕棿
                 inHedTB.getRemark()    // 澶囨敞
         );
+        order.setTemp1(inHedTB.getTemp1());
+        order.setTemp2(inHedTB.getTemp2());
+        order.setTemp3(inHedTB.getTemp3());
+        order.setWareId(inHedTB.getWareId());
+        order.setWareName(inHedTB.getWareName());
         if (!orderService.insert(order)) {
             throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
         }
         for (InDetTB outDetTB : inDetTBs) {
-            Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+            Mat mat = matService.selectByMatnr(outDetTB.getItemId());
             if (Cools.isEmpty(mat)) {
                 throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
             }
@@ -120,7 +125,7 @@
             orderDetl.setWareName(outDetTB.getWareName());
             orderDetl.setBatch(outDetTB.getItemBatch());
             orderDetl.setAnfme(outDetTB.getMainNum());
-            orderDetl.setINO(outDetTB.getINO());
+            orderDetl.setINo(outDetTB.getINO());
             orderDetl.setOrderId(order.getId());
             orderDetl.setTemp1(outDetTB.getTemp1());
             orderDetl.setTemp2(outDetTB.getTemp2());
@@ -132,7 +137,9 @@
             orderDetl.setUpdateBy(9527L);
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
+            orderDetl.setProType(outDetTB.getProtype());
             orderDetl.setQty(0.0D);
+            orderDetl.setSPgNO(outDetTB.getSPgNO());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
             }
@@ -154,7 +161,7 @@
             }
             orderService.remove(order.getId());
         }
-        DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+        DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(),inHedTB.getIoKindID(), Boolean.FALSE);
         Date now = new Date();
         // 鍗曟嵁涓绘。
         order = new Order(
@@ -193,11 +200,17 @@
                 inHedTB.getMakeDate(),    // 淇敼鏃堕棿
                 inHedTB.getRemark()    // 澶囨敞
         );
+        order.setTemp1(inHedTB.getTemp1());
+        order.setTemp2(inHedTB.getTemp2());
+        order.setTemp3(inHedTB.getTemp3());
+        order.setWareId(inHedTB.getWareId());
+        order.setWareName(inHedTB.getWareName());
+
         if (!orderService.insert(order)) {
             throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
         }
         for (OutDetTB outDetTB : inDetTBs) {
-            Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+            Mat mat = matService.selectByMatnr(outDetTB.getItemId());
             if (Cools.isEmpty(mat)) {
                 throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
             }
@@ -213,7 +226,7 @@
             orderDetl.setWareName(outDetTB.getWareName());
             orderDetl.setBatch(outDetTB.getItemBatch());
             orderDetl.setAnfme(outDetTB.getMainNum());
-            orderDetl.setINO(outDetTB.getINO());
+            orderDetl.setINo(outDetTB.getINO());
             orderDetl.setOrderId(order.getId());
             orderDetl.setTemp1(outDetTB.getTemp1());
             orderDetl.setTemp2(outDetTB.getTemp2());
@@ -226,6 +239,8 @@
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
+            orderDetl.setProType(outDetTB.getProType());
+            orderDetl.setSPgNO(outDetTB.getSPgNO());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
             }

--
Gitblit v1.9.1