From c302def08211c8cecfbf28308a2bcaf4115ac990 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 28 九月 2025 14:09:10 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 ++
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 7 +++++++
src/main/webapp/static/js/pakStore/stockAdjust.js | 5 ++++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2 ++
src/main/webapp/views/pakStore/stockAdjust.html | 2 +-
6 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 381d7c2..fd67eb5 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -30,6 +30,13 @@
// 鍙樻洿鏁伴噺
private Double count;
+ // 鍙樻洿鏁伴噺
+ private String standby1;
+
+ // 搴忓垪鐮�
+ private String orderNo;
+
+
public LocDetlAdjust(String matnr, String batch, Double count) {
this.matnr = matnr;
this.batch = batch;
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index b36fa4c..70039a2 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -36,6 +36,8 @@
boolean updateAnfme(Double anfme, String locNo, String matnr
,String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
+
+
boolean updateLocNo(String newLocNo, String oldLocNo);
boolean updateBarcode(String locNo, String barcode);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index c0966c3..89a9cd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -74,6 +74,8 @@
}
+
+
@Override
public boolean updateLocNo(String newLocNo, String oldLocNo) {
return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ce1c6c3..bf92460 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1035,7 +1035,7 @@
// todo 鐩樼偣璁板綍
// 淇敼搴撳瓨
if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
- locDetl.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3())) {
+ adjust.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3())) {
throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
// 淇濆瓨璋冩暣璁板綍
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index d94b0c3..e192190 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -7,11 +7,14 @@
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', edit: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
- ,{field: 'standby1', align: 'center', edit: true,title: '浠撳簱'}
+ ,{field: 'standby1', align: 'center', edit: true,title: '浠撳簱缂栧彿'}
];
arrRemove(detlCols, "field", "anfme");
arrRemove(detlCols, "field", "batch");
+ arrRemove(detlCols, "field", "orderNo");
+ arrRemove(detlCols, "field", "standby1$");
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html
index 8cab3f7..0d15218 100644
--- a/src/main/webapp/views/pakStore/stockAdjust.html
+++ b/src/main/webapp/views/pakStore/stockAdjust.html
@@ -126,7 +126,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/stockAdjust.js?v=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pakStore/stockAdjust.js?v=2" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1