From 3ff680c755e797879d0629efec67f109d233a857 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 23 七月 2025 11:05:34 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9cd40d6..e54971f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -84,9 +84,12 @@
                 return R.parse(CodeRes.NO_COMB_700);
             }
             int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+            if (countLoc > 0) {
+                return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+            }
             int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
-            if (countLoc > 0 || countWrk > 0) {
-                return R.error(CodeRes.EXIST_500);
+            if (countWrk > 0) {
+                return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
             }
         }
         if (Cools.isEmpty(param.getLocType1())) {
@@ -102,7 +105,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());
@@ -318,13 +321,14 @@
      * 鍏ㄦ澘鍏ュ簱
      */
     @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) {
+        long start = System.currentTimeMillis();
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         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(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+        StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -344,6 +348,7 @@
         wrkMast.setExitMk("N"); // 閫�鍑�
         wrkMast.setEmptyMk("N"); // 绌烘澘
         wrkMast.setLinkMis("Y");
+        wrkMast.setScWeight(weight);
         wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
         // 鎿嶄綔浜哄憳鏁版嵁
         wrkMast.setAppeTime(now);
@@ -356,6 +361,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);
@@ -363,17 +371,19 @@
             if (!Cools.isEmpty(waitPakin.getOrderNo())) {
                 Order order = orderService.selectByNo(waitPakin.getOrderNo());
                 if (order != null) {
-                    OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch());
-                    if (orderDetl == null) {
-                        orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null);
-                    }
-                    wrkDetl.setSPgNO(order.getTemp2());
+                    OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
+                    wrkDetl.setBatch(orderDetl.getBatch());
+                    wrkDetl.setProType(orderDetl.getProType());
+                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                     wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
                     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)) {
@@ -384,6 +394,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);
@@ -407,6 +418,7 @@
         } else {
             throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
         }
+        log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
         return dto;
     }
 

--
Gitblit v1.9.1