From d0cbcf35900093c606937a6f78423a0c75d6f939 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 08:07:10 +0800
Subject: [PATCH] #批次
---
src/main/resources/mapper/ManLocDetlMapper.xml | 6 ++++++
src/main/webapp/static/js/picking/picking.js | 8 ++++----
src/main/webapp/views/report/locDetl.html | 1 +
src/main/java/com/zy/asrs/service/ManLocDetlService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/OutController.java | 2 +-
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 2 +-
7 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index d2fa04a..934e4e8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -76,7 +76,7 @@
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<ManLocDetl> manLocDetls = manLocDetlService.queryStock(orderDetl.getMatnr());
+ List<ManLocDetl> manLocDetls = manLocDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch());
for (ManLocDetl locDetl : manLocDetls) {
if (issued > 0) {
boolean sign = false;
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index acf3447..2c6b748 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -55,7 +55,7 @@
// -------------------------------------------------
- List<ManLocDetl> queryStock(@Param("matnr") String matnr);
+ List<ManLocDetl> queryStock(@Param("matnr") String matnr,@Param("batch") String batch);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index 392ba35..8a660c7 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -49,7 +49,7 @@
// --------------------------------------------------
- List<ManLocDetl> queryStock(String matnr);
+ List<ManLocDetl> queryStock(String matnr,String batch);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index cd09fbb..ae587de 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -91,8 +91,8 @@
}
@Override
- public List<ManLocDetl> queryStock(String matnr) {
- return this.baseMapper.queryStock(matnr);
+ public List<ManLocDetl> queryStock(String matnr,String batch) {
+ return this.baseMapper.queryStock(matnr,batch);
}
@Override
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 9b11930..6da6c79 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -419,6 +419,9 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
+ <if test="batch != null || batch != ''">
+ and a.batch = #{batch}
+ </if>
</select>
<delete id="deleteDatailed">
@@ -443,6 +446,9 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
+ <if test="batch != null || batch != ''">
+ and batch = #{batch}
+ </if>
<!-- <choose>-->
<!-- <when test="batch != null and batch!='' ">-->
<!-- and batch = #{batch}-->
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index cf4ac4b..fbca122 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -97,7 +97,7 @@
btnPrint2(data.wrkNo, data.doc_num, 4);
break;
case "del":
- doDel(data.docNum);
+ doDel(data);
break;
case "look":
var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -318,8 +318,8 @@
})
}
- function doDel(docNum) {
- console.log(docNum)
+ function doDel(data) {
+ console.log(data)
layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
shade: .1,
skin: 'layui-layer-admin'
@@ -330,7 +330,7 @@
url: baseUrl+"/pakout/delete/auth",
headers: {'token': localStorage.getItem('token')},
data:{
- docNum:docNum
+ docNum:data.doc_num
},
method: 'GET',
success: function (res) {
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index 570013e..9dbc0a4 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -65,6 +65,7 @@
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'},
{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'},
+ {field: 'batch', align: 'center',title: '鎵规'},
{field: 'anfme', align: 'center',title: '鏁伴噺'},
{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�'},
{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿'},
--
Gitblit v1.9.1