From e46ea3878b409c8a999bf653c3584d122738efb7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 22:31:58 +0800
Subject: [PATCH] 完成部署服务器

---
 src/main/webapp/static/js/pakStore/emptyOut.js              |    4 ++--
 src/main/java/com/zy/asrs/controller/LocMastController.java |   15 +++++++++++++++
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    2 +-
 src/main/java/com/zy/asrs/entity/WrkMast.java               |    2 +-
 src/main/resources/mapper/WrkMastMapper.xml                 |    2 +-
 src/main/java/com/zy/common/web/WcsController.java          |   12 +++++++++---
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index c914c92..dbba795 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -87,6 +87,21 @@
         return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+    @RequestMapping(value = "/locMast/emptyList/auth")
+    @ManagerAuth
+    public R emptyList(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        excludeTrash(param);
+        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+        convert(param, wrapper);
+        wrapper.in("loc_sts","Z","M");
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         boolean sign = false;
         for (Map.Entry<String, Object> entry : map.entrySet()){
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 65f70a3..66dc120 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -137,7 +137,7 @@
     @TableField("exit_mk")
     private String exitMk;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "1姣嶆墭鐩橈紝2瀛愭墭鐩�")
     @TableField("plt_type")
     private Integer pltType;
 
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 0e56f41..008fa17 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -71,7 +71,7 @@
                         if (!Cools.isEmpty(wrkMast.getBarcode())) {
                             locMast.setBarcode(wrkMast.getBarcode());
                         }
-                        locMast.setLocSts(wrkMast.getSourceStaNo() == 1027 || wrkMast.getSourceStaNo() == 1020 || wrkMast.getSourceStaNo() == 1019 ? "M" : "Z");
+                        locMast.setLocSts(wrkMast.getPltType() == 1 ? "M" : "Z");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
                         if (!locMastService.updateById(locMast)) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bbe9aa6..66b5d65 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -105,6 +105,11 @@
                 }
             }
         }
+        // 1.姣嶆墭鐩橈紝2瀛愭墭鐩�
+        int flag = 0;
+        if(param.getIoType() == 10) {
+            flag = param.getBucketType() == 21 ? 1 : 2 ;
+        }
 
         switch (param.getIoType()) {
             case 1://婊℃墭鐩樺叆搴�
@@ -112,7 +117,7 @@
                 dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakin, param.isTailSupportFlag());
                 break;
             case 10://绌烘墭鐩樺叆搴�
-                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1);
+                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 1, flag);
                 break;
             default:
                 break;
@@ -210,7 +215,7 @@
             wrkMast.setIoPri(13D); // 浼樺厛绾�
 //            wrkMast.setCrnNo(dto.getCrnNo());
             wrkMast.setSourceStaNo(param.getSourceStaNo());
-            wrkMast.setStaNo(1016);
+            wrkMast.setStaNo(1024);
 //            wrkMast.setLocNo(dto.getLocNo());
             wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
             wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -762,7 +767,7 @@
     }
 
     @Transactional
-    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea) {
+    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode, int locArea, int flag) {
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
@@ -786,6 +791,7 @@
         wrkMast.setExitMk("N"); // 閫�鍑�
         wrkMast.setEmptyMk("Y"); // 绌烘澘
         wrkMast.setLinkMis("Y");
+        wrkMast.setPltType(flag); // 绌烘嫋绫诲瀷
 //        wrkMast.setBarcode(barcode);
 //        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
         // 鎿嶄綔浜哄憳鏁版嵁
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 4ffbb83..fdfd529 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -75,7 +75,7 @@
         select * from asr_wrk_mast
         where wrk_sts=5
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,3,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and dateadd(mi,2,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 8bbc97c..5b934a7 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -37,11 +37,11 @@
     tableIns = table.render({
         elem: '#locMast',
         headers: {token: localStorage.getItem('token')},
-        url: baseUrl+'/locMast/list/auth',
+        url: baseUrl+'/locMast/emptyList/auth',
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        where: {loc_sts: "D"},
+        where: {},
         even: true,
         toolbar: '#toolbar',
         defaultToolbar: ['filter'],

--
Gitblit v1.9.1