From ab290efb7df666e173fcd88c32f066f333825c5e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 08:50:01 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/common/web/WcsController.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3245881..197356e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -96,6 +96,12 @@
             return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
         }
 
+        try {
+            // 寤惰繜 3 绉掑啀妫�娴�
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
         sourceStaNo.setLocType1(param.getLocType1());
@@ -105,7 +111,7 @@
         switch (param.getIoType()) {
             case 1://婊℃墭鐩樺叆搴�
                 assert waitPakins != null;
-                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
                 break;
             case 10://绌烘墭鐩樺叆搴�
                 dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -309,7 +315,7 @@
             return R.error("搴撳瓨娌℃湁绌烘澘");
         }
         EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
-        emptyPlateOutParam.setOutSite(12);
+        emptyPlateOutParam.setOutSite(101);
         emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
             add(locMast.getLocNo() + "");
         }});
@@ -321,7 +327,7 @@
      * 鍏ㄦ澘鍏ュ簱
      */
     @Transactional
-    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+    public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
@@ -339,14 +345,15 @@
         wrkMast.setIoPri(13D); // 浼樺厛绾�
         wrkMast.setCrnNo(dto.getCrnNo());
         wrkMast.setSourceStaNo(dto.getSourceStaNo());
-        wrkMast.setStaNo(dto.getStaNo());
-        wrkMast.setLocNo(dto.getLocNo());
+        wrkMast.setStaNo(dto.getStaNo());// 鐩爣绔�
+        wrkMast.setLocNo(dto.getLocNo());// 鐩爣搴撲綅
         wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
         wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
         wrkMast.setPicking("N"); // 鎷ｆ枡
         wrkMast.setExitMk("N"); // 閫�鍑�
         wrkMast.setEmptyMk("N"); // 绌烘澘
         wrkMast.setLinkMis("Y");
+        wrkMast.setScWeight(weight);
         wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
         // 鎿嶄綔浜哄憳鏁版嵁
         wrkMast.setAppeTime(now);
@@ -359,6 +366,9 @@
         waitPakins.forEach(waitPakin -> {
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.sync(waitPakin);
+            wrkDetl.setProType(waitPakin.getProType());
+            wrkDetl.setTemp2(waitPakin.getTemp2());
+            wrkDetl.setWeight(wrkMast.getScWeight());
             wrkDetl.setWrkNo(wrkMast.getWrkNo());
             wrkDetl.setIoTime(wrkMast.getIoTime());
             wrkDetl.setAppeTime(now);
@@ -367,16 +377,18 @@
                 Order order = orderService.selectByNo(waitPakin.getOrderNo());
                 if (order != null) {
                     OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
-//                    if (orderDetl == null) {
-//                        orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
-//                    }
+                    wrkDetl.setBatch(orderDetl.getBatch());
+                    wrkDetl.setProType(orderDetl.getProType());
                     wrkDetl.setSPgNO(orderDetl.getSPgNO());
                     wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
-                    wrkDetl.setLuHao(orderDetl.getLuHao());
+//                    wrkDetl.setLuHao(orderDetl.getLuHao());
+                    wrkDetl.setSupp(orderDetl.getSupp());
+                    wrkDetl.setSuppCode(orderDetl.getSuppCode());
                     wrkDetl.setPacking(orderDetl.getPacking());
                     wrkDetl.setColor(orderDetl.getColor());
                     wrkDetl.setWareId(orderDetl.getWareId());
                     wrkDetl.setWareName(orderDetl.getWareName());
+                    wrkDetl.setTemp1(orderDetl.getTemp1());
                 }
             }
             if (!wrkDetlService.insert(wrkDetl)) {
@@ -387,6 +399,7 @@
         Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                 .eq("zpallet", barcode);
         WaitPakin setParam = new WaitPakin();
+        setParam.setWeight(weight);//灏嗘暣鎵橀噸閲忚鍏ラ�氱煡妗�
         setParam.setLocNo(dto.getLocNo());
         setParam.setIoStatus("Y");
         setParam.setModiTime(now);

--
Gitblit v1.9.1