From 6ed5a93b84ce849a9a61650d41ee60c726ef97ce Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 09:20:35 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |    6 ++++++
 src/main/webapp/static/js/common.js         |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e30519c..f87ff1e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -241,6 +241,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 1
             and b.row1 &lt;= 3
@@ -255,6 +256,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 4
             and b.row1 &lt;= 7
@@ -269,6 +271,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 8
             and b.row1 &lt;= 11
@@ -283,6 +286,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 12
             and b.row1 &lt;= 14
@@ -297,6 +301,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 15
             and b.row1 &lt;= 18
@@ -311,6 +316,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 19
             and b.row1 &lt;= 21
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3f0c85f..ff4c525 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -244,7 +244,7 @@
     ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
     ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
     ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
-    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
     ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
     ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
     ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}

--
Gitblit v1.9.1