From 985c427122c8aa1e421bdec8c13e8947117f967d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 14:29:29 +0800
Subject: [PATCH] 兼容四期

---
 src/main/java/com/zy/asrs/controller/OrderController.java         |    4 +++-
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |    3 ++-
 src/main/java/com/zy/asrs/entity/AgvLocDetl.java                  |    3 +++
 src/main/java/com/zy/asrs/controller/AgvMobileController.java     |   12 +++++++++++-
 src/main/java/com/zy/asrs/controller/AgvBasDevpController.java    |    2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 198d92f..6f6c36f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -288,7 +288,7 @@
         List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
         String devNo = map.get("devNo").toString();
         String barcode = map.get("barcode").toString();
-        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("loc_no", devNo).eq("wrk_sts", 205L));
         if (agvWrkMast != null) {
             if (agvWrkMast.getIoType() == 101) {
                 throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 9b224fa..629ebd5 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -401,9 +401,19 @@
 
         if (!Cools.isEmpty(locNo)) {
             listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+            if (listByLocNo != null) {
+                for (AgvLocDetl agvLocDetl : listByLocNo) {
+                    agvLocDetl.setCount(agvLocDetl.getAnfme());
+                }
+            }
         }
         if (!Cools.isEmpty(containerCode)) {
             listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+            if (listByContainerCode != null) {
+                for (AgvLocDetl agvLocDetl : listByContainerCode) {
+                    agvLocDetl.setCount(agvLocDetl.getAnfme());
+                }
+            }
         }
 
         Map<String, Object> result = new HashMap<String, Object>();
@@ -627,7 +637,7 @@
             if (Cools.isEmpty(locMastS)) {
                 throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
             }
-            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0,2)), floor);
+            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0, 2)), floor);
             // 鍚屾璋冩嫧鍗�
             long flowId = snowflakeIdWorker.nextId();
             List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 496b16c..920a63a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -228,7 +228,8 @@
         excludeTrash(param);
         Object o = param.get("orderType");
         if (o != null) {
-            wrapper.in("source", o);
+            String[] split = o.toString().split(",");
+            wrapper.in("source", split);
             param.remove("orderType");
         }
         convert(param, wrapper);
@@ -243,6 +244,7 @@
         return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+
     @RequestMapping(value = "/order/detls/pakin")
     @ManagerAuth
     public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
diff --git a/src/main/java/com/zy/asrs/entity/AgvLocDetl.java b/src/main/java/com/zy/asrs/entity/AgvLocDetl.java
index e5489e8..d9e5f4c 100644
--- a/src/main/java/com/zy/asrs/entity/AgvLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AgvLocDetl.java
@@ -189,6 +189,9 @@
     @TableField("process_sts")
     private Integer processSts;
 
+    @TableField(exist = false)
+    private Double count;
+
 
     public String getProcessSts$(){
         if (null == this.processSts){ return null; }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 0f417f3..f0925a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -106,7 +106,8 @@
                 wrapper.notLike("loc_no", "F1");
             }
         }
-        wapperSetCondition(wrapper, "batch", batch);
+        //涓�鑷存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
+        //wapperSetCondition(wrapper, "batch", batch);
         wapperSetCondition(wrapper, "three_code", csocode);
         //wapperSetCondition(wrapper, "dead_time", isoseq);
 

--
Gitblit v1.9.1