From a3a66aa959151e91f57be097b83f2a2715b502f5 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 31 三月 2025 13:11:36 +0800
Subject: [PATCH] 定时任务增加同步锁

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |  612 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 606 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 8974d59..fc60578 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -9,6 +9,8 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.MatMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
 import com.zy.common.constant.MesConstant;
@@ -40,6 +42,8 @@
 
     @Autowired
     private MatService matService;
+    @Autowired
+    private MatMapper matMapper;
     @Autowired
     private WaitPakinService waitPakinService;
     @Autowired
@@ -89,6 +93,9 @@
 
     @Resource
     private OpenServiceImpl openServiceImpl;
+
+    @Resource
+    private OrderDetlMapper orderDetlMapper;
 
     @Override
     @Transactional
@@ -1174,7 +1181,7 @@
         if (wrkMast == null) {
             throw new CoolException("宸ヤ綔妗d笉瀛樺湪锛�" + param.getBarcode());
         }
-        if (wrkMast.getIoType() != 101 || wrkMast.getWrkSts() != 20) {
+        if (wrkMast.getWrkSts() != 20) {
             throw new CoolException(wrkMast.getWrkNo() + ",宸ヤ綔妗g被鍨嬶細" + wrkMast.getIoType() + "宸ヤ綔鐘舵�侊細" + wrkMast.getWrkSts() + ",涓嶅尮閰�");
         }
 
@@ -1200,13 +1207,15 @@
             throw new CoolException("宸ヤ綔妗d笉瀛樺湪锛�" + param.getBarcode());
         }
         if (wrkMast.getIoType() != 107 || wrkMast.getWrkSts() != 2) {
-            throw new CoolException(wrkMast.getWrkNo() + ",宸ヤ綔妗g被鍨嬶細" + wrkMast.getIoType() + "宸ヤ綔鐘舵�侊細" + wrkMast.getWrkSts() + ",涓嶅尮閰�");
+            throw new CoolException(wrkMast.getWrkNo() + "锛氬伐浣滅姸鎬佷笉鍖归厤");
         }
 
         List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
         List<PdckqrParam.Material> materials = param.getMaterials();
 
         boolean isFullyCancelled = compareAndCheckCancellation(wrkDetls, materials);
+        // todo 涓ょ鐩樹袱绠遍渶瑕佺‘瀹氫綅缃病閿�
+
         if (isFullyCancelled) { // 鐩樼偣鐗╂枡纭垚鍔燂紝宸ヤ綔妗h浆鎹� 鐩樼偣鍑哄簱->鐩樼偣鍐嶅叆搴擄紝涓嬪彂鍥炲簱鍛戒护
             // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
             if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -1244,16 +1253,24 @@
             }
 
             // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
-            openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode());
+            openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣纭鎴愬姛鎺ㄩ�乬wcs");
 
             return R.ok("鐩樼偣纭鎴愬姛");
 
         } else { // 鐗╂枡涓嶄竴鑷�
-            // todo 涓嶄竴鑷寸殑澶勭悊澶勭悊鏂规硶寰呭畾
+            // 涓嶄竴鑷寸殑澶勭悊澶勭悊鏂规硶锛氬脊鍑鸿皟鏁寸晫闈�
 
+//            閲嶆柊鎵弿瀹炵墿涓婇潰鐨勭爜杩涜璋冩暣
+//            瀹炵墿鍦ㄥ簱瀛橀噷闈㈢殑鍦版柟娓呯┖锛屼换鍔℃墍鍦ㄥ簱瀛樻竻绌�
+//            灏嗗疄鐗╁拰褰撳墠鎵樼洏浣嶇疆鍜屽簱浣嶇粦瀹�
+//            涓�涓湪绠辨儏鍐电洿鎺ヨ皟鏁�
+//            涓や釜鏈ㄧ鍑轰袱涓� 閮借皟鏁�
+//            涓や釜鏈ㄧ鍑轰竴涓� 璋冩暣涓�涓�
+//            宸ヤ綔妗f爣璁板紓甯�->鍥炲簱
+
+            return R.error("鐩樼偣纭寮傚父");
         }
 
-        return R.error("鐩樼偣纭寮傚父");
     }
 
     @Override
@@ -1412,10 +1429,593 @@
         }
 
         // 鎺ㄩ�丟WCS鐩爣娑堟伅
-        openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo(),barcode);
+        openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo(),barcode,"pda缁勬墭绔嬪嵆鍏ュ簱鎺ㄩ�乬wcs");
         return R.ok("鍏ュ簱鍚姩鎴愬姛");
     }
 
+    @Override
+    public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
+
+        if (Cools.isEmpty(param,param.getMatList())) {
+            throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
+        }
+        if (Cools.isEmpty(param.getBarcode())) {
+            throw new CoolException("鏉$爜涓嶈兘涓虹┖锛�" + param.getBarcode());
+        }
+
+        int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+        if (zpalletCount > 0) {
+            throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + param.getBarcode());
+        }
+
+        int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+        if (barcodeCount > 0) {
+            throw new CoolException("宸ヤ綔妗e凡瀛樺湪璇ユ墭鐩樼爜锛�" + param.getBarcode());
+        }
+
+        LocTypeDto locTypeDto = new LocTypeDto();
+        locTypeDto.setLocType1((short) 1);
+        int iotype = 1;
+        if (Cools.isEmpty(param.getMatList())) {
+            iotype = 10;
+        }
+
+        // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣�
+        StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto, 0);
+
+        int workNo = dto.getWorkNo();
+        Date now = new Date();
+        // 鐢熸垚宸ヤ綔妗�
+        WrkMast wrkMast = new WrkMast();
+        wrkMast.setWrkNo(workNo);
+        wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
+        wrkMast.setIoTime(new Date());
+        wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
+        wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+        wrkMast.setIoPri(13D); // 浼樺厛绾�
+        wrkMast.setCrnNo(dto.getCrnNo());
+        wrkMast.setSourceStaNo(param.getPalletizingNo());
+        wrkMast.setStaNo(dto.getStaNo());
+        wrkMast.setLocNo(dto.getLocNo());
+        wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+        wrkMast.setPicking("N"); // 鎷f枡
+        wrkMast.setExitMk("N"); // 閫�鍑�
+        wrkMast.setEmptyMk("N"); // 绌烘澘
+        wrkMast.setLinkMis("Y");
+        wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
+        // 鎿嶄綔浜哄憳鏁版嵁
+        wrkMast.setAppeTime(now);
+        wrkMast.setAppeUser(userId);
+        wrkMast.setModiTime(now);
+        wrkMast.setModiUser(userId);
+        wrkMastService.insert(wrkMast);
+
+        if (!Cools.isEmpty(param.getMatList())) {
+            List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
+            List<String> groupNos = new ArrayList<>();
+            for (GwmsGenerateInventoryDto.MatList obj : matList) {
+                WrkDetl wrkDetl = new WrkDetl();
+                wrkDetl.setWrkNo(wrkMast.getWrkNo());
+                obj.getRolls().forEach(roll -> {
+                    wrkDetl.setWrkNo(wrkMast.getWrkNo());
+                    wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
+                    wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
+                    wrkDetl.setUnit(roll.getBoxNo()); // 绠卞彿
+                    wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿
+                    wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿
+                    wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+                    wrkDetl.setBarcode(param.getBarcode());
+                    wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+                    wrkDetl.setColor(obj.getBoxType()); // 鏈ㄧ绫诲瀷
+                    wrkDetl.setManu(obj.getRollType()); // 绠¤姱绫诲瀷
+                    wrkDetl.setSku(obj.getWideInWidth()); // 瀹炴祴瀹藉箙
+                    wrkDetl.setItemNum(obj.getThickness()); // 鐢熺當鍘氬害
+                    wrkDetl.setManuDate(roll.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
+                    wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
+                    wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸
+                    wrkDetl.setLength(roll.getLength()); // 闀垮害
+                    wrkDetl.setSpecs(String.valueOf(roll.getSplices())); // 鎺ュご
+                    wrkDetl.setAnfme(1.0);
+//                    wrkDetl.setThreeCode(null); // 閫氳繃mes鎴杄xcel瀵煎叆妫�娴嬫槸鍚﹀悎鏍� 0涓嶅悎鏍硷紝1 鍚堟牸
+//                    wrkDetl.setDeadWarn(); // 鐞嗚揣鏍囪瘑 0榛樿锛�1鐞嗚揣涓紝2鐞嗚揣瀹屾垚w
+//                    wrkDetl.setInspect(); // 璁㈠崟鏄庣粏涓敤锛屾爣璇嗗璐х殑鐘舵�� 0鏈璐э紝1澶囪揣涓紝2澶囪揣瀹屾垚
+//                    wrkDetl.setDanger(); // 璁㈠崟鏄庣粏涓敤锛屾爣璇嗚法宸烽亾绉诲簱 0鏈Щ搴擄紝1绉诲簱涓紝2绉诲簱瀹屾垚
+                    wrkDetl.setIoTime(now);
+                    wrkDetl.setAppeTime(now);
+                    wrkDetl.setAppeUser(userId);
+                    wrkDetl.setModiUser(userId);
+                    wrkDetl.setModiTime(now);
+                    if (!wrkDetlService.insert(wrkDetl)) {
+                        throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+                    }
+                });
+                groupNos.add(obj.getPackageGroupNo());
+            }
+            // 涓�妤煎弽淇搧鍏ュ簱鐨勬湪绠遍�氳繃鍖呰缁勫彿闇�缁檓es鎺ㄩ�佸緟鍒�
+            pushDpToMes(groupNos);
+        }
+
+        // 鏇存柊鐩爣搴撲綅鐘舵��
+        LocMast locMast = locMastService.selectById(dto.getLocNo());
+        if (locMast.getLocSts().equals("O")) {
+            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+            locMast.setModiTime(now);
+            if (!locMastService.updateById(locMast)) {
+                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+            }
+        } else {
+            throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+        }
+
+        // 涓�妤艰繑淇叆搴撴帹閫乵es鍋氳褰�
+        pushFxrkToMes(param);
+
+        // 杩斿洖GWCS鐩爣淇℃伅
+        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤艰繑淇叆搴撴帹閫乬wcs");
+
+        return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
+    }
+
+    private void pushFxrkToMes(GwmsGenerateInventoryDto param) {
+
+        for (GwmsGenerateInventoryDto.MatList matList : param.getMatList()){
+            matList.setOutOrIn("in");
+            matList.setStockType("杩斾慨鍏ュ簱");
+        }
+
+        boolean success = false;
+        // 鑾峰彇璇锋眰澶�
+        Map<String,Object> headers = new HashMap<>();
+        headers.put("Content-Type","application/json;charset=UTF-8");
+
+        // 鏋勯�犺姹備綋
+        String body = JSON.toJSONString(param);
+        String response = "";
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(MesConstant.MES_CC_IP_PORT)
+                    .setPath(MesConstant.MES_CC_FXRK_URL)
+                    .setHeaders(headers)
+                    .setJson(body)
+                    .build()
+                    .doGet();
+            if (!Cools.isEmpty(response)) {
+                JSONObject jsonObject1 = JSONObject.parseObject(response);
+                int code = (int) jsonObject1.get("code");
+                boolean state  = jsonObject1.getBoolean("state");
+                if (code == 200 && state) {
+                    success = true;
+                }
+            } else {
+                log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL, body, response);
+            }
+        } catch (Exception e) {
+            log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍寮傚父锛歿}", e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍",
+                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+
+    }
+
+    @Override
+    @Transactional
+    public R pdtz(PdtzParam param) {
+
+        String barcode = param.getBarcode();
+        Integer palletizingNo = param.getPalletizingNo();
+        List<PdtzParam.MatList> matList = param.getMatList();
+        // 澧炲姞鍐椾綑瀛楁锛岀粰mes鎺ㄩ�佹椂缁撴瀯鍜屽叆搴撲繚瀛樹竴鑷�
+        for (PdtzParam.MatList matList1 : matList) {
+            matList1.setBarcode(barcode);
+            matList1.setPalletizingNo(palletizingNo);
+        }
+
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+
+        // 瀹炵墿鍖呰缁勫彿
+        List<String> groups = matList.stream().map(PdtzParam.MatList::getPackageGroupNo).distinct().collect(Collectors.toList());
+
+        // 搴撳瓨鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+        List<String> collect1 = locDetls.stream().map(LocDetl::getOrigin).distinct().collect(Collectors.toList());
+        // 宸ヤ綔鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+        List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
+        // 宸ヤ綔鐨勫寘瑁呯粍鍙�
+        List<String> wrkBrandlist = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
+        // 宸ヤ綔璁㈠崟鏄庣粏
+        List<OrderDetl> orderDetlList = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().in("brand", wrkBrandlist));
+
+        Date now = new Date();
+
+        // 鍒ゆ柇瑕佽皟鏁寸殑鏈ㄧ鎵�鍦ㄤ綅缃叧绯�
+        if (collect1.size() == 0 || collect2.size() == 0){
+            return R.parse(barcode+"锛氫换鍔″簱瀛樺紓甯革紒");
+        } else if(collect1.size() == 2 && collect2.size() == 1) { // 2鍑�1锛岄兘鏄崟绠辩殑
+            if (matList.size() == 0) { // 瀹炵墿鏄┖
+                // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                // todo 鏍囪寮傚父锛屾帹閫乵es锛屽洖搴�
+                for(OrderDetl orderDetl:orderDetlList) {
+                    orderDetl.setSource(1);
+                    orderDetlMapper.updateById(orderDetl);
+                }
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("delete",wrkBrandlist);
+                kctzPushMes(jsonObject);
+                kctzReturn(wrkMast);
+            } else { // 瀹炵墿涓嶄负绌�
+               // 瀵绘壘瀹炵墿鐨勪綅缃�
+                List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+                if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+                    // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                    locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                    // 琛ュ厖鏈ㄧ浣嶇疆
+                    matList.get(0).setBoxPos(collect2.get(0));
+                    // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+                    insertLocDetl(locMast.getLocNo(),barcode,matList);
+                    // todo 鏍囪寮傚父锛屾帹閫乵es锛屽洖搴�
+                    for(OrderDetl orderDetl:orderDetlList) {
+                        orderDetl.setSource(1);
+                        orderDetlMapper.updateById(orderDetl);
+                    }
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("delete",wrkBrandlist);
+                    jsonObject.put("insert",matList);
+                    kctzPushMes(jsonObject);
+                    kctzReturn(wrkMast);
+                }else { // 瀹炵墿鏈夊簱瀛�
+                    List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+                    return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+                }
+            }
+        } else if(collect1.size() == 1 && collect2.size() == 1) {
+            if (matList.size() == 0) { // 瀹炵墿涓虹┖
+                // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                // 瀹屾垚杩欐潯鐩樼偣浠诲姟锛氭洿鏂拌鍗曞畬鎴愭暟閲忥紝宸ヤ綔涓绘。5
+                for(WrkDetl wrkDetl:wrkDetls) {
+                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+                        // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+                        orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
+                    }
+                }
+                if (locMast.getLocSts().equals("P")) {
+                    locMast.setLocSts("O");
+                    locMast.setBarcode("");
+                    locMast.setSheetNo("");
+                    locMast.setIoTime(now);
+                    locMast.setModiTime(now);
+                    locMastService.updateById(locMast);
+                }
+                // 淇敼宸ヤ綔涓绘。鐘舵��
+                wrkMast.setWrkSts(5L);
+                wrkMast.setModiTime(now);
+                wrkMastService.updateById(wrkMast);
+
+                // todo 鏍囪寮傚父锛屼笉鍥炲簱锛岀粰gwcs涓嬪彂鍘诲彔鐩樻満鍛戒护,鎺ㄩ�乵es
+                for(OrderDetl orderDetl:orderDetlList) {
+                    orderDetl.setSource(1);
+                    orderDetlMapper.updateById(orderDetl);
+                }
+
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("delete",wrkBrandlist);
+                kctzPushMes(jsonObject);
+
+                // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+                openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),3013,wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庡洖鍙犵洏鏈烘帹閫乬wcs");
+            } else { // 瀹炵墿涓嶄负绌�
+                // 瀵绘壘瀹炵墿鐨勪綅缃�
+                List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+                if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+                    // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                    locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                    // 琛ュ厖鏈ㄧ浣嶇疆
+                    for (PdtzParam.MatList matList1:matList) {
+                        matList1.setBoxPos(collect2.get(0));
+                    }
+                    // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+                    insertLocDetl(locMast.getLocNo(),barcode,matList);
+                    // todo 鏍囪寮傚父锛屽洖搴擄紝鎺ㄩ�乵es
+                    for(OrderDetl orderDetl:orderDetlList) {
+                        orderDetl.setSource(1);
+                        orderDetlMapper.updateById(orderDetl);
+                    }
+
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("delete",wrkBrandlist);
+                    jsonObject.put("insert",matList);
+                    kctzPushMes(jsonObject);
+
+                    kctzReturn(wrkMast);
+                } else { // 瀹炵墿鏈夊簱瀛�
+                    List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+                    return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+                }
+            }
+        }  else if (collect1.size() == 2 && collect2.size() == 2) {
+            if (matList.size() == 0) { // 瀹炵墿涓虹┖
+                // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                // 瀹屾垚杩欐潯鐩樼偣浠诲姟锛氭洿鏂拌鍗曞畬鎴愭暟閲忥紝宸ヤ綔涓绘。5
+                for(WrkDetl wrkDetl:wrkDetls) {
+                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+                        // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+                        orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
+                    }
+                }
+                if (locMast.getLocSts().equals("P")) {
+                    locMast.setLocSts("O");
+                    locMast.setBarcode("");
+                    locMast.setSheetNo("");
+                    locMast.setIoTime(now);
+                    locMast.setModiTime(now);
+                    locMastService.updateById(locMast);
+                }
+                // 淇敼宸ヤ綔涓绘。鐘舵��
+                wrkMast.setWrkSts(5L);
+                wrkMast.setModiTime(now);
+                wrkMastService.updateById(wrkMast);
+
+                // todo 鏍囪寮傚父锛屾帹閫乵es,涓嶅洖搴擄紝缁檊wcs涓嬪彂鍘诲彔鐩樻満鍛戒护
+                for(OrderDetl orderDetl:orderDetlList) {
+                    orderDetl.setSource(1);
+                    orderDetlMapper.updateById(orderDetl);
+                }
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("delete",wrkBrandlist);
+                jsonObject.put("insert",matList);
+                kctzPushMes(jsonObject);
+
+                // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+                openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),3013,wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庡洖鍙犵洏鏈烘帹閫乬wcs");
+            } else { // 瀹炵墿涓嶄负绌�
+                // 瀵绘壘瀹炵墿鐨勪綅缃�
+                List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+                if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+                    // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+                    locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+                    // 琛ュ厖鏈ㄧ浣嶇疆
+                    matList.get(0).setBoxPos("宸�");
+                    matList.get(1).setBoxPos("鍙�");
+                    // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+                    insertLocDetl(locMast.getLocNo(),barcode,matList);
+                    // todo 鏍囪寮傚父锛屽洖搴擄紝鎺ㄩ�乵es
+                    for(OrderDetl orderDetl:orderDetlList) {
+                        orderDetl.setSource(1);
+                        orderDetlMapper.updateById(orderDetl);
+                    }
+
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("delete",wrkBrandlist);
+                    jsonObject.put("insert",matList);
+                    kctzPushMes(jsonObject);
+
+                    kctzReturn(wrkMast);
+                } else { // 瀹炵墿鏈夊簱瀛�
+                    List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+                    return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+                }
+            }
+        }
+
+       return R.ok("璋冩暣鎴愬姛");
+    }
+
+    @Override
+    public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+        String orderNo = param.getOrderNo();
+
+        Order order = orderService.selectByNo(orderNo);
+        if (order == null) {
+            return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+        } else if (!order.getSettle().equals(4L)) {
+            return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+        }
+
+        order.setSettle(5L);
+        order.setUpdateBy(userId);
+        order.setUpdateTime(new Date());
+
+        orderService.updateById(order);
+
+        return R.ok("鍙戣揣鏍稿鎴愬姛");
+    }
+
+    // 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
+    void kctzPushMes(JSONObject jsonObject) {
+        // 鎺ュ彛璇锋眰缁撴灉
+        boolean success = false;
+        // 鎺ュ彛璁板綍绌洪棿鍚嶇О
+        String message = "鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es";
+
+        // 鏋勯�犺姹備綋
+        String body = jsonObject.toJSONString();
+        String response = "";
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(MesConstant.MES_CC_IP_PORT)
+                    .setPath(MesConstant.MES_CC_YCTZ_URL)
+                    .setJson(body)
+                    .build()
+                    .doPost();
+            if (!Cools.isEmpty(response)) {
+                JSONObject result = JSON.parseObject(response);
+                if (result.getInteger("code").equals(200)) {
+                    success = true;
+                }
+            } else {
+                log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_YCTZ_URL, body, response);
+            }
+        } catch (Exception e) {
+            log.error(message + "寮傚父锛歿}", e);
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        message,
+                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_YCTZ_URL,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+    }
+
+    // 鐩樼偣寮傚父鍥炲簱
+    @Transactional
+    public void kctzReturn(WrkMast wrkMast) {
+        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+            throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+        }
+        // 鑾峰彇鐩爣绔�
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                .eq("type_no", wrkMast.getIoType() - 50)
+                .eq("stn_no", wrkMast.getStaNo())
+                .eq("crn_no", wrkMast.getCrnNo());
+        StaDesc staDesc = staDescService.selectOne(wrapper);
+        if (Cools.isEmpty(staDesc)) {
+            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+        }
+        Date now = new Date();
+        // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+        Integer staNo = staDesc.getCrnStn();
+        // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+        wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+        wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵��: 14.宸插嚭搴撴湭纭
+        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+        wrkMast.setStaNo(staNo); // 鐩爣绔�
+        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+        wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+        wrkMast.setModiTime(now);
+        if (!wrkMastService.updateById(wrkMast)) {
+            throw new CoolException("鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+        }
+        // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+        locMast.setLocSts("Q");
+        locMast.setModiTime(now);
+        if (!locMastService.updateById(locMast)) {
+            throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+        }
+
+        // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+        openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庢帹閫乬wcs");
+    }
+
+    /**
+     * 璋冩暣搴撳瓨鏄庣粏
+     */
+    @Transactional
+    void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
+        Date now = new Date();
+        for (PdtzParam.MatList mat : matList) {
+            LocDetl locDetl = new LocDetl();
+            locDetl.setBatch("");
+            locDetl.setLocNo(locNo);
+            locDetl.setMatnr(mat.getSpecs()); // 瑙勬牸
+            locDetl.setMaktx(mat.getSpecs()); //瑙勬牸
+            locDetl.setUnit(mat.getBoxNo()); // 绠卞彿
+            locDetl.setModel(mat.getRollNo()); // 鍗峰彿
+            locDetl.setBrand(mat.getPackageGroupNo()); // 鍖呰缁勫彿
+            locDetl.setZpallet(barcode); // 鎵樼洏鐮�
+            locDetl.setBarcode(barcode);
+            locDetl.setOrigin(mat.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+            locDetl.setColor(mat.getBoxType()); // 鏈ㄧ绫诲瀷
+            locDetl.setManu(mat.getRollType()); // 绠¤姱绫诲瀷
+            locDetl.setSku(mat.getWideInWidth()); // 瀹炴祴瀹藉箙
+            locDetl.setItemNum(mat.getThickness()); // 鐢熺當鍘氬害
+            locDetl.setManuDate(mat.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
+            locDetl.setWeight(mat.getNetWeight()); // 鍑�閲�
+            locDetl.setVolume(mat.getGrossWeight()); // 姣涢噸
+            locDetl.setLength(mat.getLength()); // 闀垮害
+            locDetl.setSpecs(String.valueOf(mat.getSplices())); // 鎺ュご
+            locDetl.setAnfme(1.0);
+//                    wrkDetl.setThreeCode(null); // 閫氳繃mes鎴杄xcel瀵煎叆妫�娴嬫槸鍚﹀悎鏍� 0涓嶅悎鏍硷紝1 鍚堟牸
+            locDetl.setAppeTime(now);
+            locDetl.setModiTime(now);
+            locDetlService.insert(locDetl);
+        }
+    }
+
+    /**
+     * 涓�妤煎弽淇搧鍏ュ簱鐨勬湪绠遍�氳繃鍖呰缁勫彿闇�缁檓es鎺ㄩ�佸緟鍒�
+     */
+    private void pushDpToMes(List<String> groupNos) {
+        boolean success = false;
+        // 鑾峰彇璇锋眰澶�
+        Map<String,Object> headers = new HashMap<>();
+        headers.put("Content-Type","application/json;charset=UTF-8");
+
+        // 鏋勯�犺姹備綋
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("groupNos", groupNos);
+        String body = jsonObject.toJSONString();
+
+        String response = "";
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(MesConstant.MES_CC_IP_PORT)
+                    .setPath(MesConstant.MES_CC_DP_URL)
+                    .setHeaders(headers)
+                    .setJson(body)
+                    .build()
+                    .doGet();
+            if (!Cools.isEmpty(response)) {
+                JSONObject jsonObject1 = JSONObject.parseObject(response);
+                int code = (int) jsonObject1.get("code");
+                boolean state  = jsonObject1.getBoolean("state");
+                String msg = (String) jsonObject1.get("message");
+                if (code == 200 && state) {
+                    success = true;
+                }
+                throw new CoolException(msg);
+            } else {
+                log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL, body, response);
+                throw new CoolException("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐�");
+            }
+        } catch (Exception e) {
+            log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅ紓甯革細{}", e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒�",
+                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+    }
+
     private Map<String, String> getPackageGroupNoByGwms(List<String> boxNoList) {
         Map<String, String> map = null;
         Map<String, Object> headers = new HashMap<>();

--
Gitblit v1.9.1