From 58e14d5664e2832ad272693999f84b7f2c1094e8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 01 七月 2023 13:15:05 +0800
Subject: [PATCH] st组托订单修复，组托订单2数量改未完成数量
---
src/main/java/com/zy/asrs/controller/OrderController.java | 11 +++++++++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 +--------
src/main/webapp/static/js/stoMan/stoQue.js | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4be0ae7..1ae4d6b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -434,10 +434,17 @@
return R.ok(orderService.selectAllorderNo());
}
+ //璁㈠崟缁勬墭2
@RequestMapping(value = "/order/list/orderNo")
public R orderListorderNo(@RequestParam String orderNo) {
-
- return R.ok(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo)));
+ //鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
+ List<OrderDetl> orderDetl1=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo));
+ List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
+ for (OrderDetl o: orderDetl1) {
+ o.setAnfme(o.getAnfme()-o.getWorkQty());
+ orderDetls.add(o);
+ }
+ return R.ok(orderDetls);
}
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 ee26e48..2169f86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -124,12 +124,7 @@
combMat.setBatch("");
}
}
-
-
-
-
Date now = new Date();
-
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -175,7 +170,6 @@
// 鍏宠仈缁勬墭
} else {
for (CombParam.CombMat combMat : param.getCombMats()) {
- Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
if (orderDetl == null) {
throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
@@ -183,7 +177,7 @@
}
Double anfme = orderDetl.getAnfme();
Double workQty = orderDetl.getWorkQty();
- if ( anfme - (workQty+sum) < 0) {
+ if ( anfme - (workQty+combMat.getAnfme()) < 0) {
throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
@@ -726,7 +720,6 @@
manLocDetlEntityWrapper.eq("loc_no",manPakOut.getLocNo());
manLocDetlEntityWrapper.eq("matnr",manPakOut.getMatnr());
if (checkManLocDetl.getAnfme().intValue() == manPakOut.getCount()){
-
if(!manLocDetlService.delete(manLocDetlEntityWrapper)){
return R.error("鍒犻櫎骞冲簱搴撳瓨澶辫触");
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..718549c 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -157,7 +157,7 @@
switch (obj.event) {
// 鏌ョ湅鏄庣粏
case 'locDetl':
- // locDetl(data.locNo);
+ locDetl(data.locNo);
if (data.locSts.trim() === ''
|| data.locSts.trim() === 'S'
|| data.locSts.trim() === 'D'
--
Gitblit v1.9.1