From 1e62a6d467407addae8745d8c69454318af56a09 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 18 五月 2024 08:04:09 +0800
Subject: [PATCH] ERP接口

---
 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index a33a046..79c41fc 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -54,7 +54,8 @@
                 .or().eq("io_type",11)
                 .or().eq("io_type",12)
                 .or().eq("io_type",108)
-                .or().eq("io_type",109));
+                .or().eq("io_type",109)
+                .or().eq("io_type",112));
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
                 agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
@@ -111,12 +112,35 @@
                 .or().eq("io_type", 11)
                 .or().eq("io_type", 12)
                 .or().eq("io_type", 109)
-                .or().eq("io_type", 108)).getRecords();
+                .or().eq("io_type", 108)
+                .or().eq("io_type", 112)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.forEach(agvWrkMast -> {
                 try {
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                }
+            });
+        }
+    }
+
+    /*
+    putaway锛氫笂鏋�
+    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
+     */
+    @Scheduled(cron = "0/3 * * * * ? ")
+    public void startAllcationIn(){
+        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
+                ,new EntityWrapper<AgvWrkMast>()
+                        .eq("wrk_sts", 211)
+                        .andNew().eq("io_type", 112)).getRecords();
+
+        if(!Cools.isEmpty(agvWrkMastList)){
+            agvWrkMastList.forEach(agvWrkMast -> {
+                try {
+                    agvWrkMastHandler.startAllcationIn(agvWrkMast);
                 } catch (IOException e) {
                     log.error(e.getMessage());
                 }
@@ -159,6 +183,14 @@
                     if(!Cools.isEmpty(agvWrkMastWorking)){
                         return;
                     }
+                    
+                    agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+                            .eq("source_loc_no",agvWrkMast.getLocNo())
+                            .lt("loc_sts",204L));
+
+                    if(!Cools.isEmpty(agvWrkMastWorking)){
+                        return;
+                    }
 
                     agvWrkMastHandler.startPutWayWrk(agvWrkMast);
                 } catch (IOException e) {

--
Gitblit v1.9.1