From 90e8096a24e55fa40fbd5dbf7b9d94a6d88940d7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 20 七月 2025 16:20:59 +0800
Subject: [PATCH] 成品库出入库分配堆垛机顺序321

---
 src/main/java/com/zy/common/web/WcsController.java |  219 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 158 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 78c0638..5953a14 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,8 +8,10 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.entity.result.FindLocNoAttributeVo;
 import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.model.LocTypeDto;
 import com.zy.common.model.StartupDto;
@@ -63,6 +65,9 @@
     @Resource
     private ConfigService configService;
 
+    @Resource
+    private WrkMastMapper wrkMastMapper;
+
     @PostMapping("/pakin/loc/v1")
     @ResponseBody
     @Transactional
@@ -90,15 +95,22 @@
 
         StartupDto dto = null;
 
+        // 鍏ュ簱鏈夊紓甯稿嚭鍒板嚭搴撳彛1024
+        if(!Cools.isEmpty(param.getErrMsg())){
+            return exceptionIsOutOfTheWarehouse(param,sourceStaNo,waitPakin);
+        }
+
         if(param.getIoType() == 1) {
             List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
             for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
-                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
+                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
                     if(waitPakin == null) {
                         return R.error("鍏ュ簱閫氱煡妗d负绌�");
                     } else {
-                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("wrk_sts", 2).eq("sta_no", wantBucket.getSite()));
-                        if(wantBucket.getSite() == 1071 && count < 12 || wantBucket.getSite() == 1064 && count < 10 || wantBucket.getSite() == 1078 && count < 12) {
+                        // <4 < 2 < 4
+                        int count = wrkMastMapper.selectInGzxCount(wantBucket.getSite());
+//                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wantBucket.getSite()));
+                        if(wantBucket.getSite() == 1071 && count < 4 || wantBucket.getSite() == 1064 && count < 2 || wantBucket.getSite() == 1078 && count < 4) {
                             dto = startupFullPutStore(param,waitPakin,wantBucket); // 鐩翠緵缃愯绾夸换鍔�
                             if (dto != null) {
                                 log.info("WCS鍏ュ簱鐩翠緵缃愯绾挎帴鍙h繑鍙�:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
@@ -132,6 +144,73 @@
         return R.ok().add(dto);
     }
 
+    /**
+     * 鍏ュ簱寮傚父鍑哄埌鍑哄簱鍙�1024
+     */
+    @Transactional(propagation = Propagation.REQUIRED)
+    public R exceptionIsOutOfTheWarehouse(SearchLocParam param, BasDevp sourceStaNo,WaitPakin waitPakin) {
+
+        StartupDto dto = commonService.getLocNo(param,1024);
+        int workNo = dto.getWorkNo();
+        Date now = new Date();
+        // 鐢熸垚宸ヤ綔妗�
+        WrkMast wrkMast = new WrkMast();
+        wrkMast.setWrkNo(workNo);
+        wrkMast.setIoTime(now);
+        wrkMast.setWrkSts(2L);
+        wrkMast.setIoType(3); // 鍏ュ嚭搴撶姸鎬侊細3.绔欏埌绔�
+        wrkMast.setIoPri(13D); // 浼樺厛绾�
+        wrkMast.setSourceStaNo(dto.getSourceStaNo());
+        wrkMast.setStaNo(dto.getStaNo());
+        wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+        wrkMast.setPicking("N"); // 鎷f枡
+        wrkMast.setExitMk("N"); // 閫�鍑�
+        wrkMast.setEmptyMk("N"); // 绌烘澘
+        wrkMast.setLinkMis("Y");
+        wrkMast.setCtnType(0); // 灏炬墭鏍囪瘑
+        wrkMast.setPdcType(waitPakin != null ? waitPakin.getMaktx() : ""); // 绌烘《绫诲瀷
+        // 鎿嶄綔浜哄憳鏁版嵁
+        wrkMast.setAppeTime(now);
+        wrkMast.setModiTime(now);
+        wrkMast.setLocNo(param.getErrMsg()); // 寮傚父鎻忚堪浣撶幇鍦ㄧ洰鏍囧簱浣嶄笂
+        boolean res = wrkMastService.insert(wrkMast);
+        if (!res) {
+            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+        }
+        // 鐢熸垚宸ヤ綔妗f槑缁�
+        if(waitPakin != null) {
+            WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(waitPakin);
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setIoTime(wrkMast.getIoTime());
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModiTime(now);
+            if (!wrkDetlService.insert(wrkDetl)) {
+                throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+            }
+            // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+            Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+                    .eq("zpallet", param.getBarcode());
+            WaitPakin setParam = new WaitPakin();
+            setParam.setLocNo(dto.getLocNo());
+            setParam.setIoStatus("Y");
+            setParam.setModiTime(now);
+            if (!waitPakinService.update(setParam, wrapper)) {
+                throw new CoolException("鏇存柊閫氱煡妗eけ璐�");
+            }
+        }
+
+        // 鏇存柊婧愮珯鐐逛俊鎭�
+        sourceStaNo.setWrkNo(workNo);
+        sourceStaNo.setModiTime(now);
+        if (!basDevpService.updateById(sourceStaNo)){
+            throw new CoolException("鏇存柊婧愮珯澶辫触");
+        }
+
+        return R.ok(dto);
+    }
+
     // 缃愯瀹屾垚鍏ュ簱
     @PostMapping("/pakin/CanningLine/loc/v1")
     @ResponseBody
@@ -157,66 +236,64 @@
         }
 
         // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
-        Config config = configService.selectConfigByCode("gzwcfh");
+        Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
         boolean fhFlag = false;
+        int fhk = 0; // 鍙戣揣鍙�
         if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
-            String[] split = config.getValue().split("=");
-            for(String item : split) {
-                if(param.getMatnr().equals(item)) {
-                    fhFlag = true;
-                    break;
-                }
-            }
+            fhFlag = true;
+            fhk = Integer.parseInt(config.getValue());
         }
 
         Date now = new Date();
         StartupDto dto;
 
         // 鍒ゆ柇璐存爣寮傚父锛屽妫�閲嶉噺寮傚父鐨勶紝涓嶅垎閰嶅簱浣嶏紝鍘诲線寮傚父鍙�1090
-//        if ( !param.isTbFlag() || param.getGrossWeight() < param.getWeight()) {
-//
-//            // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
-//            WrkMast wrkMast = new WrkMast();
-//            wrkMast.setWrkNo(commonService.getWorkNo(0));
-//            wrkMast.setIoTime(now);
-//            wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
-//            wrkMast.setWrkSts(2L);
-//            wrkMast.setIoPri(13D); // 浼樺厛绾�
-////            wrkMast.setCrnNo(dto.getCrnNo());
-//            wrkMast.setSourceStaNo(param.getSourceStaNo());
-//            wrkMast.setStaNo(1090);
-////            wrkMast.setLocNo(dto.getLocNo());
-//            wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
-//            wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-////            wrkMast.setPicking("N"); // 鎷f枡
-////            wrkMast.setExitMk("N"); // 閫�鍑�
-////            wrkMast.setEmptyMk("N"); // 绌烘澘
-////            wrkMast.setLinkMis("Y");
-////            wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
-//            wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
-//            wrkMast.setAppeTime(now);
-//            wrkMastService.insert(wrkMast);
-//
-//            // 鐢熸垚宸ヤ綔妗f槑缁�----------------------------------------------------
-//            WrkDetl wrkDetl = new WrkDetl();
-//            wrkDetl.sync(mat);
-//            wrkDetl.setWrkNo(wrkMast.getWrkNo());
-//            wrkDetl.setAnfme(wrkDetl1.getAnfme());
-//            wrkDetl.setZpallet(wrkMast1.getBarcode());
-//            wrkDetl.setBatch(param.getBatch());
-//            wrkDetl.setManuDate(param.getManuDate());
-//            wrkDetl.setWeight(param.getWeight());
-//            wrkDetl.setManLength(param.getGrossWeight());
-//            wrkDetl.setInspect(1); // 璐存爣鎴愬姛
-//            wrkDetl.setIoTime(now);
-//            wrkDetl.setAppeTime(now);
-//            wrkDetlService.insert(wrkDetl);
-//
-//            dto = new StartupDto();
-//            dto.setWorkNo(wrkMast.getWrkNo());
-//            dto.setSourceStaNo(wrkMast.getSourceStaNo());
-//            dto.setStaNo(wrkMast.getStaNo());
-//        } else
+        if ( !param.isTbFlag() || !param.isReinspection()) {
+
+            // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
+            WrkMast wrkMast = new WrkMast();
+            wrkMast.setWrkNo(commonService.getWorkNo(0));
+            wrkMast.setIoTime(now);
+            wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
+            wrkMast.setWrkSts(2L);
+            wrkMast.setIoPri(13D); // 浼樺厛绾�
+//            wrkMast.setCrnNo(dto.getCrnNo());
+            wrkMast.setSourceStaNo(param.getSourceStaNo());
+            wrkMast.setStaNo(1090);
+            wrkMast.setLocNo(!param.isTbFlag() ? "璐存爣澶辫触" : "澶嶆閲嶉噺寮傚父");
+            wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
+            wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+//            wrkMast.setPicking("N"); // 鎷f枡
+//            wrkMast.setExitMk("N"); // 閫�鍑�
+//            wrkMast.setEmptyMk("N"); // 绌烘澘
+//            wrkMast.setLinkMis("Y");
+//            wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
+            wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
+            wrkMast.setAppeTime(now);
+            wrkMastService.insert(wrkMast);
+
+            // 鐢熸垚宸ヤ綔妗f槑缁�----------------------------------------------------
+            WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(mat);
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setAnfme(wrkDetl1.getAnfme());
+            wrkDetl.setZpallet(wrkMast1.getBarcode());
+            wrkDetl.setBatch(param.getBatch());
+            wrkDetl.setManuDate(param.getManuDate());
+            wrkDetl.setWeight(param.getWeight());
+            wrkDetl.setManLength(param.getGrossWeight());
+            wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
+            wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
+            wrkDetl.setIoTime(now);
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
+            wrkDetlService.insert(wrkDetl);
+
+            dto = new StartupDto();
+            dto.setWorkNo(wrkMast.getWrkNo());
+            dto.setSourceStaNo(wrkMast.getSourceStaNo());
+            dto.setStaNo(wrkMast.getStaNo());
+        } else
         if(fhFlag) { // 鐩存帴鍙戣揣
             // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
             WrkMast wrkMast = new WrkMast();
@@ -227,7 +304,7 @@
             wrkMast.setIoPri(13D); // 浼樺厛绾�
 //            wrkMast.setCrnNo(dto.getCrnNo());
             wrkMast.setSourceStaNo(param.getSourceStaNo());
-            wrkMast.setStaNo(1016);
+            wrkMast.setStaNo(fhk);
 //            wrkMast.setLocNo(dto.getLocNo());
             wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
             wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -250,9 +327,11 @@
             wrkDetl.setManuDate(param.getManuDate());
             wrkDetl.setWeight(param.getWeight());
             wrkDetl.setManLength(param.getGrossWeight());
+            wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
             wrkDetl.setInspect(1);
             wrkDetl.setIoTime(now);
             wrkDetl.setAppeTime(now);
+            wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
             wrkDetlService.insert(wrkDetl);
 
             dto = new StartupDto();
@@ -302,9 +381,12 @@
                 wrkDetl.setManuDate(param.getManuDate());
                 wrkDetl.setWeight(param.getWeight());
                 wrkDetl.setManLength(param.getGrossWeight());
+                wrkDetl.setVolume(param.getCannedVolume());
                 wrkDetl.setInspect(1); // 璐存爣鎴愬姛
                 wrkDetl.setIoTime(now);
                 wrkDetl.setAppeTime(now);
+                log.warn("鎴愬搧缃愯瀹屾垚锛屾《绫诲瀷淇濆瓨锛屾柊浠诲姟鍙凤細{},鏃т换鍔″彿:{},鏃т换鍔℃《鍨�:{}",workNo,wrkMast1.getWrkNo(),wrkDetl1.getMaktx());
+                wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
                 wrkDetlService.insert(wrkDetl);
 
                 // 鏇存柊鐩爣搴撲綅鐘舵��
@@ -368,14 +450,20 @@
         WrkMast wrkMast = wrkMastService.selectById(wrkNo);
         if (wrkMast == null) {
             throw new CoolException("寮傚父鍙e叆搴撲换鍔″彿鏃犱换鍔★細" + wrkNo);
-        } else if (wrkMast.getLocNo() != null) {
+        } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
             throw new CoolException("寮傚父鍙e叆搴撳簱浣嶅凡鍒嗛厤锛�" + wrkMast.getLocNo());
         }
 
         if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
+            Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());
             wrkMast.setSourceStaNo(1090);
-            wrkMast.setStaNo(1016); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1016
+            wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1024
+            // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
+            if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+                wrkMast.setStaNo(Integer.parseInt(config.getValue()));
+            }
             wrkMastService.updateById(wrkMast);
+            log.info("WCS寮傚父鍙e叆搴撴帴鍙h繑鍙�:{},鐩爣绔欑偣:{}", "涓嬬嚎鍑哄簱", wrkMast.getStaNo());
             return R.ok();
         }
 
@@ -593,6 +681,15 @@
         return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
     }
 
+    // 鑷姩鍑虹┖妗�
+    @PostMapping("/autoOutEmptyBucket")
+    @ResponseBody
+    public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+        log.info("鏀跺埌WCS鑷姩鍑虹┖妗舵帴鍙h姹�====>>鍏ュ弬:{}", param);
+        workService.startupFullTakeStore(param, 29L);
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
     @PostMapping("auto/emptyOut/v1")
     @ResponseBody
     public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
@@ -604,7 +701,7 @@
         LocMast locMast;
 
         // 鍏堟壘娴呭簱浣�
-        locMast = locMastMapper.queryLocMasterByLocStsAndRow(Arrays.asList(2, 3), type);
+        locMast = locMastMapper.queryLocMasterByLocStsAndRow(Arrays.asList(2,3,5,6,7,8), type);
 
         // 娴呭簱浣嶆病鏈夊垯鏌ヨ鎵�鏈�
         if (locMast == null) {
@@ -612,7 +709,7 @@
         }
 
         if (locMast == null) {
-            return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩�");
+            return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩樻垨鏃犲彲鐢ㄥ爢鍨涙満");
         }
 
         String locNo = locMast.getLocNo();
@@ -793,7 +890,7 @@
         wrkMast.setIoTime(new Date());
         wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
         wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
-        wrkMast.setIoPri(13D); // 浼樺厛绾�
+        wrkMast.setIoPri(14D); // 浼樺厛绾�
         wrkMast.setCrnNo(dto.getCrnNo());
         wrkMast.setSourceStaNo(dto.getSourceStaNo());
         wrkMast.setStaNo(dto.getStaNo());

--
Gitblit v1.9.1