From 06c8c14db3806051a4b8031a7b17a0bd818b3b88 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 30 十一月 2022 16:31:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/SiteController.java    |   10 +++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   49 ++++++++++++++----------
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    4 ++
 src/main/resources/application.yml                          |    4 +-
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index bbcb229..b88b8f9 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -201,5 +201,15 @@
         return R.error("plc宸叉帀绾�");
     }
 
+    /**
+     * 姣嶆墭鐩樺嚭搴�
+     * @return
+     */
+    @PostMapping("/motherPallet")
+    public R motherPalletOut(){
+        boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, null));
+        return R.ok("姣嶆墭鐩樺嚭搴撴垚鍔�");
+    }
+
 
 }
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 531405e..7c25386 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -87,6 +87,8 @@
     private BasErrLogService basErrLogService;
     @Autowired
     private BasCrnErrorMapper basCrnErrorMapper;
+    @Autowired
+    private WrkMastService wrkMastService;
 
     @Value("${wms.url}")
     private String wmsUrl;
@@ -107,7 +109,6 @@
                 }
                 String barcode = barcodeThread.getBarcode();
 
-                barcode = "80011105";
 
                 if (!Cools.isEmpty(barcode)) {
                     log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -161,12 +162,13 @@
                         log.error("宸ヤ綔妗d腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
                         continue;
                     }
-//                    // 鑾峰彇鍏ュ簱閫氱煡妗�
-//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
-//                    if (waitPakins.isEmpty()) {
-//                        log.error("鏃犳鍏ュ簱鏉$爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
-//                        continue;
-//                    }
+
+                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+                            .eq("barcode", barcode)
+                            .eq("io_type", 103));
+                    if (!Cools.isEmpty(checkPick)) {
+                        continue;
+                    }
 
                     try {
 
@@ -337,19 +339,19 @@
             // 閬嶅巻鎷f枡鍏ュ簱鍙�
             for (DevpSlave.Sta pickSta : devp.getPickSta()) {
 //                // 鑾峰彇鏉$爜鎵弿浠俊鎭�
-//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
-//                if (barcodeThread == null) {
-//                    continue;
-//                }
-//                String barcode = barcodeThread.getBarcode();
-//                if(!Cools.isEmpty(barcode)) {
-//                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
-//                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-//                        continue;
-//                    }
-//                } else {
-//                    continue;
-//                }
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+                if (barcodeThread == null) {
+                    continue;
+                }
+                String barcode = barcodeThread.getBarcode();
+                if(!Cools.isEmpty(barcode)) {
+                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+                        continue;
+                    }
+                } else {
+                    continue;
+                }
 
                 // 鑾峰彇鎷f枡鍏ュ簱绔欎俊鎭�
                 SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -363,7 +365,12 @@
 //                // 鍏ュ嚭搴撴ā寮忓垽鏂�
 //                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
 
-                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
+                if (staProtocol.isAutoing()
+                        && staProtocol.isLoading()
+                        && staProtocol.isInEnable()
+                        && !staProtocol.isEmptyMk()
+                        && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
+                        && staProtocol.isPakMk()) {
 //                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                     WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                     if (wrkMast == null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 259eaad..24a02d5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -90,6 +90,10 @@
                     case 2:
                         write((StaProtocol)task.getData());
                         break;
+                    case 3:
+                        OperateResult write = siemensS7Net.Write("DB100.170" , (short) 1);
+                        System.out.println("鍐欏叆鎴愬姛");
+                        break;
                     default:
                         break;
                 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 507e9dc..38fc6fd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -153,13 +153,13 @@
       barcode: ${wcs-slave.barcode[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 12
+      staNo: 15
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 11
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 11
+      staNo: 15
       barcode: ${wcs-slave.barcode[0].id}
 
   # 鏉$爜鎵弿浠�

--
Gitblit v1.9.1