From 6b218973dcf03a3601373ebe13fddd7a8896d68f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 25 二月 2025 12:51:01 +0800
Subject: [PATCH] 聚乳酸-出库作业，可以多牌号一起出，冻结状态从后台查
---
src/main/webapp/views/pla/sellout.html | 24 +++++++++++++++---------
src/main/java/com/zy/asrs/controller/PlaController.java | 6 +++++-
src/main/webapp/static/js/pla/stockOut.js | 20 ++++++++++----------
src/main/webapp/static/js/cool.js | 8 ++++++++
4 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 8e6279c..7d5bcca 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -162,7 +162,11 @@
OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);
for (Pla pla : plas) {
-
+ // 鑾峰彇鏈�鏂板喕缁撶姸鎬�
+ Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze").eq("id", pla.getId()));
+ pla.setStockFreeze(pla1.getStockFreeze());
+ pla.setStockFreezeBy(pla1.getStockFreezeBy());
+ pla.setStockFreezeDate(pla1.getStockFreezeDate());
if (pla.getStockFreeze() == 0) {
// throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
log.info("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index e3ae972..41fcca4 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -122,6 +122,14 @@
if(selectOptionDom[0].type === "orderDetl"){
$('#weight').val(selectOptionDom[0].weight);
+ // 鏍规嵁鐗屽彿閫夋嫨杩涜杩囨护
+ checkData = firstData.filter(item => item.brand === $('#maktxV').val())
+ var allWeight = 0;
+ for (var i in checkData){
+ allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
+ }
+ // 鏍规嵁鐗屽彿閲嶆柊娓叉煋
+ $('#qtyWeight').val(allWeight);
}
}
inputDom.val("");
diff --git a/src/main/webapp/static/js/pla/stockOut.js b/src/main/webapp/static/js/pla/stockOut.js
index bed2242..eb063fb 100644
--- a/src/main/webapp/static/js/pla/stockOut.js
+++ b/src/main/webapp/static/js/pla/stockOut.js
@@ -135,7 +135,7 @@
layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
} else {
var data = locDetlData;
- var brand;
+ // var brand;
for(var i=0; i<data.length; i++){
if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme < data[i].qtyAnfme){
@@ -143,12 +143,11 @@
return;
}
- brand = brand ? brand : data[i].brand;
-
- if(brand != data[i].brand){
- layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
- return;
- }
+ // brand = brand ? brand : data[i].brand;
+ // if(brand != data[i].brand){
+ // layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
+ // return;
+ // }
// if(data[i].stockFreeze === 0){
// layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁鍐荤粨鐨勫簱瀛橈紝璇疯В鍐诲悗鎿嶄綔");
// return;
@@ -251,8 +250,9 @@
layer.close(locDetlLayerIdx);
}
-function clearTable(){
- locDetlData = [];
+function clearTable(res){
+ locDetlData = locDetlData.filter(item => item.brand !== res);
tableIns.reload({data: locDetlData});
- parent.location.reload();
+ // parent.location.reload();
+ // console.log(locDetlData)
}
diff --git a/src/main/webapp/views/pla/sellout.html b/src/main/webapp/views/pla/sellout.html
index 64aed60..d5d2dde 100644
--- a/src/main/webapp/views/pla/sellout.html
+++ b/src/main/webapp/views/pla/sellout.html
@@ -127,16 +127,18 @@
}
});
+ var firstData = [];
var checkData = [];
var detailData = [];
var deliveryTime;
function child(data){
checkData = data;
- var allWeight = 0;
- for (var i in checkData){
- allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
- }
- $('#qtyWeight').val(allWeight);
+ firstData = data;
+ // var allWeight = 0;
+ // for (var i in checkData){
+ // allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
+ // }
+ // $('#qtyWeight').val(allWeight);
delivery();
}
@@ -236,8 +238,12 @@
// 鏁版嵁鎻愪氦鍔ㄤ綔
form.on('submit(save)', function () {
- if($('#maktxV').val() != checkData[0].brand){
- layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟");
+ // if($('#maktxV').val() != checkData[0].brand){
+ // layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟");
+ // return;
+ // }
+ if ($('#qtyWeight').val() === '0') {
+ layer.msg("鍙戣揣閲嶉噺涓嶈兘涓�0");
return;
}
@@ -267,8 +273,8 @@
success: function (res) {
if (res.code === 200){
layer.msg("淇敼鎴愬姛");
- tableReload(true);
- parent.clearTable();
+ // tableReload(true);
+ parent.clearTable($('#maktxV').val());
} else if (res.code === 403){
layer.msg(res.msg, {icon: 2})
return;
--
Gitblit v1.9.1