From f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 20:07:12 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/asrs/WrkDetlMapper.xml | 4 ++--
src/main/webapp/static/js/orderPakout/out.js | 7 ++++---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2 ++
src/main/java/com/zy/asrs/controller/MobileController.java | 3 +++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 28f648b..2af50aa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -307,6 +307,9 @@
HashMap<String, Object> map = new HashMap<>();
Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
+ if (mat == null) {
+ continue;
+ }
MatParam matParam = new MatParam();
Synchro.Copy(mat, matParam);
matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index cf2fafc..d750f3e 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -38,6 +38,8 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Autowired
diff --git a/src/main/resources/mapper/asrs/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
index 219f91b..34e41c4 100644
--- a/src/main/resources/mapper/asrs/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
@@ -101,12 +101,12 @@
select awd.*
from asr_wrk_detl awd
left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
- where order_no = #{orderNo}
+ where order_no = #{orderNo} and awm.io_type != 103
union
select distinct awdl.*
from asr_wrk_detl_log awdl
left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
- where awdl.order_no = #{orderNo}
+ where awdl.order_no = #{orderNo} and awml.io_type != 103
and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
</select>
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index cbc392b..559a8a9 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -37,10 +37,11 @@
,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'sku', align: 'center',title: 'U8鏃у搧鍚�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '涓绘暟閲�'}
,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
- ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'manu', align: 'center',title: '杈呭崟浣�'}
+ // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '鍨嬪彿'}
@@ -162,7 +163,7 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '鎵规', align: 'center'},
- {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'anfme', title: '涓绘暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'weight', title: '杈呮暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'unit', align: 'center',title: '鍗曚綅'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
--
Gitblit v1.9.1