From 90acb0ad1372bde74a306b47ec108ddea36fccc9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 08:21:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  274 ------------------------------------------------------
 1 files changed, 0 insertions(+), 274 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2364b23..22dba90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -269,280 +269,6 @@
         }
     }
 
-    public synchronized void generateStoreWrkFile() throws IOException, InterruptedException {
-        try {
-            // 鏍规嵁杈撻�佺嚎plc閬嶅巻
-            for (DevpSlave devp : slaveProperties.getDevp()) {
-                // 閬嶅巻鍏ュ簱鍙�
-                for (DevpSlave.Sta inSta : devp.getInSta()) {
-                    // 鑾峰彇鍏ュ簱绔欎俊鎭�
-                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
-                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
-                    if (staProtocol == null) {
-                        continue;
-                    } else {
-                        staProtocol = staProtocol.clone();
-                    }
-                    Short workNo = staProtocol.getWorkNo();
-                    Short stano = staProtocol.getStaNo();
-
-                    // 灏哄妫�娴嬪紓甯�
-                    boolean back = false;
-                    String errMsg = "";
-                    if (staProtocol.isFrontErr()) {
-                        errMsg = "鍓嶈秴闄�";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isBackErr()) {
-                        errMsg = "鍚庤秴闄�";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isHighErr()) {
-                        errMsg = "楂樿秴闄�";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isLeftErr()) {
-                        errMsg = "宸﹁秴闄�";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isRightErr()) {
-                        errMsg = "鍙宠秴闄�";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isWeightErr()) {
-                        errMsg = "瓒呴噸";
-                        back = true;
-                    }
-                    if (!back && staProtocol.isBarcodeErr()) {
-                        errMsg = "鎵爜澶辫触";
-                        back = true;
-                    }
-                    // 閫�鍥�
-                    if (back) {
-                        if (stano == inSta.getBackSta().shortValue()) {
-                            continue;
-                        }
-                        if (workNo == 0 && stano == 0) {
-                            continue;
-                        }
-                        if (!staProtocol.isPakMk()) {
-                            continue;
-                        }
-//                        News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
-                        staProtocol.setWorkNo(workNo);
-                        staProtocol.setStaNo(inSta.getStaNo().shortValue());
-                        devpThread.setPakMk(staProtocol.getSiteId(), false);
-                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                        TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-                        if (taskWrk != null) {
-                            taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-                            taskWrkMapper.updateById(taskWrk);
-                        }
-                        continue;
-                    }
-                    // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
-                    if (staProtocol.isAutoing() && staProtocol.isLoading()
-                            && staProtocol.isInEnable()
-                            && !staProtocol.isEmptyMk() && (workNo >= 9899)
-                            && staProtocol.isPakMk()) {
-                        // 鑾峰彇鏉$爜鎵弿浠俊鎭�
-                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
-                        if (barcodeThread == null) {
-                            continue;
-                        }
-                        String barcode = barcodeThread.getBarcode();
-                        if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
-                            // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
-                            ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), staProtocol.isHigh() ? 2 : 1);
-                            TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
-                            if (!Cools.isEmpty(taskWrk1)) {
-                                log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗e瓨鍦�");
-                                if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
-                                    StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-                                            .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
-                                    if (Cools.isEmpty(staDesc)) {
-                                        log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗e瓨鍦�");
-                                        return;
-                                    } else {
-                                        staProtocol.setWorkNo(taskWrk1.getWrkNo().shortValue());
-                                        staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
-                                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                                    }
-                                }
-                                return;
-                            }
-                            HashMap<String, Object> headParam = new HashMap<>();
-                            headParam.put("Content-Type", "application/json");
-                            System.out.println(JSON.toJSONString(toWmsDTO));
-                            String response;
-                            try {
-                                response = new HttpHandler.Builder()
-                                        // .setHeaders(headParam)
-                                        .setUri(wmsUrl)
-                                        .setPath(inboundTaskApplyPath)
-                                        .setJson(JSON.toJSONString(toWmsDTO))
-                                        .build()
-                                        .doPost();
-                            } catch (Exception e) {
-                                log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
-                                log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
-                                try {
-                                    BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
-                                    if (Cools.isEmpty(basDevp)) {
-                                        log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
-                                    } else if (basDevp.getStaErr() != 0) {
-                                        basDevp.setStaErr(2);
-                                        basDevpService.updateById(basDevp);
-                                    }
-                                } catch (Exception e1) {
-                                    // 閫�鍥�
-                                    log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
-                                }
-                                staProtocol.setWorkNo((short) 9999);
-                                staProtocol.setStaNo(inSta.getStaNo().shortValue());
-                                devpThread.setPakMk(staProtocol.getSiteId(), false);
-                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//                                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-//                                    if (taskWrk != null) {
-//                                        taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-//                                        taskWrkMapper.updateById(taskWrk);
-//                                    }
-                                continue;
-                            }
-
-                            JSONObject jsonObject = JSON.parseObject(response);
-                            log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
-                            log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
-                            if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
-                                GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
-                                try {
-                                    BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
-                                    if (Cools.isEmpty(basDevp)) {
-                                        log.error("绔欑偣鍙峰紓甯�1" + inSta.getStaNo());
-                                        throw new CoolException("绔欑偣鍙峰紓甯�1,鏈煡璇㈠埌绔欑偣淇℃伅" + inSta.getStaNo());
-                                    }
-                                    Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
-                                    if (staNoCrnNo == 0) {
-                                        basDevp.setStaErr(1);
-                                        basDevpService.updateById(basDevp);
-                                        log.error("绔欑偣鍙峰紓甯�2" + inSta.getStaNo());
-                                        throw new CoolException("绔欑偣鍙峰紓甯�2,绔欑偣鍙蜂笉瀛樺湪" + inSta.getStaNo());
-                                    } else {
-                                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
-                                                .eq("crn_no", staNoCrnNo.longValue())
-                                                .eq("loc_no", getWmsDto.getLocNo()));
-                                        if (Cools.isEmpty(locMast)) {
-                                            basDevp.setStaErr(1);
-                                            basDevpService.updateById(basDevp);
-                                            log.error("绔欑偣鍙峰紓甯�3" + inSta.getStaNo());
-                                            throw new CoolException("绔欑偣鍙峰紓甯�3锛氭宸烽亾涓嶅瓨鍦ㄧ洰鏍囧簱浣�" + inSta.getStaNo());
-                                        }
-                                    }
-                                } catch (Exception e) {
-//                                    log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
-                                    // 閫�鍥�
-                                    log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + errMsg);
-                                    log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
-
-                                    staProtocol.setWorkNo((short) 9999);
-                                    staProtocol.setStaNo(inSta.getStaNo().shortValue());
-                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
-                                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//                                    TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-//                                    if (taskWrk != null) {
-//                                        taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-//                                        taskWrkMapper.updateById(taskWrk);
-//                                    }
-                                    continue;
-                                }
-                                //鏌ョ湅璇ュ簱浣嶆槸鍚︿负绌哄簱浣�
-                                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
-                                        .eq("loc_sts", "O")
-                                        .eq("loc_no", getWmsDto.getLocNo()));
-                                if (Cools.isEmpty(locMast)) {
-                                    try {
-                                        HashMap<String, Object> headParam1 = new HashMap<>();
-                                        headParam1.put("taskNo", getWmsDto.getTaskNo());
-                                        headParam1.put("status", 6);
-                                        headParam1.put("ioType", 1);
-                                        headParam1.put("barcode", barcode);
-                                        String response2;
-                                        response2 = new HttpHandler.Builder()
-                                                // .setHeaders(headParam)
-                                                .setUri(wmsUrl)
-                                                .setPath(taskStatusFeedbackPath)
-                                                .setJson(JSON.toJSONString(headParam1))
-                                                .build()
-                                                .doPost();
-                                        JSONObject jsonObject1 = JSON.parseObject(response2);
-                                        apiLogService.save("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms"
-                                                , wmsUrl + taskStatusFeedbackPath
-                                                , null
-                                                , "127.0.0.1"
-                                                , JSON.toJSONString(headParam1)
-                                                , response
-                                                , true
-                                        );
-                                    } catch (Exception e) {
-                                        log.error("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms", getWmsDto.getWrkNo());
-                                        throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触,娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==锛屽紓甯镐俊鎭細" + e);
-                                    }
-                                }
-
-                                // 鍒涙柊涓�涓叆搴撳伐浣滄。
-                                TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
-                                if (Cools.isEmpty(taskWrk)) {
-                                    taskWrk = createTask(getWmsDto, barcode);
-                                    if (Cools.isEmpty(taskWrk)) {
-                                        log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
-                                    } else {
-                                        taskWrkService.insert(taskWrk);
-                                        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-                                                .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
-                                        staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
-                                        staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
-                                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                                    }
-                                }
-
-                            } else {
-                                continue;
-                            }
-                            apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
-                                    , wmsUrl + inboundTaskApplyPath
-                                    , null
-                                    , "127.0.0.1"
-                                    , JSON.toJSONString(toWmsDTO)
-                                    , response
-                                    , true
-                            );
-
-                        } else {
-                            // 閫�鍥�
-                            log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
-
-                            staProtocol.setWorkNo((short) 9999);
-                            staProtocol.setStaNo(inSta.getStaNo().shortValue());
-                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                            TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
-                            if (taskWrk != null) {
-                                taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
-                                taskWrkMapper.updateById(taskWrk);
-                            }
-                        }
-                    }
-
-
-                }
-            }
-        } catch (Exception e) {
-            log.error("generateStoreWrkFile e", e);
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-
     /**
      * 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
      */

--
Gitblit v1.9.1