From d8629bcb6b815c4149f21dadeea11367b1ed19d9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 23:41:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/DevpSlave.java              |    2 
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   95 +------------------------------
 src/main/java/com/zy/core/MainProcess.java                  |    4 
 src/main/resources/application.yml                          |   42 ++++++++------
 4 files changed, 31 insertions(+), 112 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 2a99f8c..9b7d133 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -537,11 +537,7 @@
         try {
             for (DevpSlave devp : slaveProperties.getDevp()) {
                 // 閬嶅巻鎷f枡鍏ュ簱鍙�
-                for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
-                    if (!(pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339)) {
-                        continue;
-                    }
-
+                for (DevpSlave.Sta pickSta : devp.getPickInSta2()) {
                     // 鑾峰彇鎷f枡鍏ュ簱绔欎俊鎭�
                     DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                     StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -556,93 +552,8 @@
                             && (staProtocol.getWorkNo() > 0)
                             && staProtocol.isPakMk()) {
 
-                        WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
-                        if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
-                            continue;
-                        }
-
-                        if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104)
-                                || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
-                            continue;
-                        }
-
-//                        //*********************鍚屽簱浣嶇粍鏍¢獙*********************
-//                        boolean flag = false;
-//                        String th = "";
-//                        List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
-//                        for (String loc : innerLoc) {
-//                            LocMast locMast = locMastService.selectById(loc);
-//                            if (locMast == null) {
-//                                continue;
-//                            }
-//
-//                            if (!locMast.getLocSts().equals("F")) {
-//                                flag = true;
-//                                th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
-//                                break;
-//                            }
-//                        }
-//                        if (flag) {
-//                            News.info(th);
-//                            continue;
-//                        }
-//                        //*********************鍚屽簱浣嶇粍鏍¢獙*********************
-
-                        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
-                            News.info(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
-                            continue;
-                        }
-
-                        try {
-                            LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//婧愬簱浣�
-                            SearchLocParam param = new SearchLocParam();
-                            param.setWrkNo(wrkMast.getWrkNo());
-                            param.setBarcode(wrkMast.getBarcode());
-                            param.setIoType(wrkMast.getIoType());
-                            param.setSourceStaNo(pickSta.getStaNo());
-                            param.setLocType1(locMast.getLocType1());
-                            String response = new HttpHandler.Builder()
-                                    .setUri(wmsUrl)
-                                    .setPath("/rpc/pakin/loc/v2")
-                                    .setJson(JSON.toJSONString(param))
-                                    .build()
-                                    .doPost();
-                            JSONObject jsonObject = JSON.parseObject(response);
-                            Integer code = jsonObject.getInteger("code");
-                            if (code.equals(200)) {
-                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
-                                //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
-                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
-                                if (liftStaProtocol == null) {
-                                    News.info(wrkMast.getWrkNo() + "鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯澶辫触");
-                                    continue;
-                                }
-
-                                // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
-                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
-                                wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
-                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
-                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
-                                wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
-                                wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
-                                wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
-                                wrkMast.setModiTime(new Date());
-                                if (wrkMastMapper.updateById(wrkMast) == 0) {
-                                    News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
-                                    continue;
-                                }
-
-                                staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
-                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                            } else if (code == 500) {
-                                News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        }
+                        staProtocol.setStaNo((short) 341);//鍐欏叆鐩爣绔�
+                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                     }
                 }
 
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 261ec36..489211f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -52,8 +52,8 @@
                     mainService.initRealtimeBasMap();
                     // 鎷f枡銆佸苟鏉垮啀鍏ュ簱
                     mainService.stnToCrnStnPick();
-//                    // 鎷f枡銆佸苟鏉垮啀鍏ュ簱(325銆�331銆�333銆�339)
-//                    mainService.stnToCrnStnPick2();
+                    // 鎷f枡銆佸苟鏉垮啀鍏ュ簱(325銆�331銆�333銆�339)
+                    mainService.stnToCrnStnPick2();
                     // 鐩樼偣鍐嶅叆搴�
                     mainService.stnToCrnStnPlate();
                     // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 5e48bcc..24365d1 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -27,6 +27,8 @@
 
     private List<Sta> pickInSta = new ArrayList<>();
 
+    private List<Sta> pickInSta2 = new ArrayList<>();
+
     private List<Sta> pickOutSta = new ArrayList<>();
 
     private List<StaRack> rackInStn = new ArrayList<>();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d18528f..0620b45 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -246,24 +246,30 @@
       barcode: ${wcs-slave.barcode[7].id}
       led: ${wcs-slave.led[7].id}
       liftNo: ${wcs-slave.lift[1].id}
-#    pickInSta[8]:
-#      staNo: 331
-#      backSta: 341
-#      barcode: ${wcs-slave.barcode[7].id}
-#      led: ${wcs-slave.led[8].id}
-#      liftNo: ${wcs-slave.lift[1].id}
-#    pickInSta[9]:
-#      staNo: 333
-#      backSta: 341
-#      barcode: ${wcs-slave.barcode[7].id}
-#      led: ${wcs-slave.led[9].id}
-#      liftNo: ${wcs-slave.lift[1].id}
-#    pickInSta[10]:
-#      staNo: 339
-#      backSta: 341
-#      barcode: ${wcs-slave.barcode[7].id}
-#      led: ${wcs-slave.led[10].id}
-#      liftNo: ${wcs-slave.lift[1].id}
+    pickInSta2[0]:
+      staNo: 325
+      backSta: 341
+      barcode: ${wcs-slave.barcode[7].id}
+      led: ${wcs-slave.led[8].id}
+      liftNo: ${wcs-slave.lift[1].id}
+    pickInSta2[1]:
+      staNo: 331
+      backSta: 341
+      barcode: ${wcs-slave.barcode[7].id}
+      led: ${wcs-slave.led[8].id}
+      liftNo: ${wcs-slave.lift[1].id}
+    pickInSta2[2]:
+      staNo: 333
+      backSta: 341
+      barcode: ${wcs-slave.barcode[7].id}
+      led: ${wcs-slave.led[9].id}
+      liftNo: ${wcs-slave.lift[1].id}
+    pickInSta2[3]:
+      staNo: 339
+      backSta: 341
+      barcode: ${wcs-slave.barcode[7].id}
+      led: ${wcs-slave.led[10].id}
+      liftNo: ${wcs-slave.lift[1].id}
 #    # 璐ф灦鍏ュ簱绔欑偣
 #    rackInStn[0]:
 #      devpPlcId: ${wcs-slave.devp[0].id}

--
Gitblit v1.9.1