From 82f825105d954770c0e6176e2f9248b40ba90f8e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 九月 2023 09:25:44 +0800
Subject: [PATCH] #盘点+批次
---
src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java | 4 +++-
src/main/java/com/zy/asrs/entity/param/ExamineParam.java | 1 +
src/main/java/com/zy/asrs/controller/OrderCheckController.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
src/main/webapp/static/js/orderCheck/orderCheck.js | 3 ++-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderCheckController.java b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
index e6e9da7..674e0fc 100644
--- a/src/main/java/com/zy/asrs/controller/OrderCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
@@ -149,6 +149,7 @@
orderCheck.setDocType(16L);
orderCheck.setCreateTime(now);
orderCheck.setUpdateTime(now);
+
if (!orderCheckService.insert(orderCheck)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曚富妗ｅけ璐�");
}
@@ -167,6 +168,7 @@
locCheck.setCreateTime(now);
locCheck.setUpdateTime(now);
locCheck.setOrderNo(param.getOrderNo());
+ locCheck.setBatch(manLocDetl.getBatch());
if (!locCheckService.insert(locCheck)){
return R.error("鎻掑叆澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/entity/param/ExamineParam.java b/src/main/java/com/zy/asrs/entity/param/ExamineParam.java
index 2ff3a46..e853a4f 100644
--- a/src/main/java/com/zy/asrs/entity/param/ExamineParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ExamineParam.java
@@ -20,6 +20,7 @@
private String matnr;
private String maktx;
private Double realAnfme;
+ private String batch;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index ddafb63..56587e3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -905,7 +905,8 @@
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", combParam.getOrderNo())
.eq("matnr", detl.getMatnr())
- .eq("loc_no", detl.getLocNo());
+ .eq("loc_no", detl.getLocNo())
+ .eq("batch",detl.getBatch());
LocCheck CheckDetl = locCheckService.selectOne(wrapper);
if (CheckDetl == null){
Date now = new Date();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
index 29698e0..2e7c3c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
@@ -195,7 +195,8 @@
for (ExamineParam.data list:param.getList()){
EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
wrapper.eq("matnr", list.getMatnr())
- .eq("loc_no", list.getLocNo());
+ .eq("loc_no", list.getLocNo())
+ .eq("batch", list.getBatch());
ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
if (manLocDetl == null){
@@ -215,6 +216,7 @@
manLocDetl1.setModiTime(now);
manLocDetl1.setOrderNo(list.getOrderNo());
manLocDetl1.setStockFreeze(1);
+ manLocDetl1.setBatch(list.getBatch());
if (!manLocDetlService.insert(manLocDetl1)){
return R.error("鎻掑叆鏁版嵁澶辫触");
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index ae2a8e0..d465eb5 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -133,8 +133,9 @@
cols: [[ //宸ュ叿鏉℃槑缁�
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О'},
{field: 'locNo', title: '搴撲綅鍙�'},
+ {field: 'batch', title: '鎵规'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
--
Gitblit v1.9.1