From 9c08f3ae419992dda4f4f3ff4650fafd6585ebae Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 24 九月 2025 11:00:00 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/common/web/WcsController.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 473c209..6d8de64 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());
@@ -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() + "");
         }});
@@ -327,7 +333,8 @@
         // 妫�绱㈠簱浣�
         List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
         List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+//        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto,barcode);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -339,8 +346,8 @@
         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"); // 鎷ｆ枡
@@ -360,6 +367,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);
@@ -373,11 +383,13 @@
                     wrkDetl.setSPgNO(orderDetl.getSPgNO());
                     wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
 //                    wrkDetl.setLuHao(orderDetl.getLuHao());
-                    wrkDetl.setWeight(wrkMast.getScWeight());
+                    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)) {
@@ -406,6 +418,9 @@
         if (locMast.getLocSts().equals("O")) {
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiTime(now);
+            if (locMast.getBarcode()==null){
+                locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
+            }
             if (!locMastService.updateById(locMast)) {
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }
@@ -420,7 +435,7 @@
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
-        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
+        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto,barcode);
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
@@ -458,6 +473,9 @@
         if (locMast.getLocSts().equals("O")) {
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiTime(new Date());
+            if (locMast.getBarcode()==null){
+                locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
+            }
             if (!locMastService.updateById(locMast)) {
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }

--
Gitblit v1.9.1