From c327ae2c32c988c43d6881c9caf196e42bab3f8c Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 27 四月 2023 14:09:48 +0800
Subject: [PATCH] 修复订单系统
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 2bca110..8407805 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -576,7 +576,7 @@
String jsonLocNo = (String) json.get("locNo");
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
-
+ //鏌ヨ鍗�
String jsonOrderNo = (String) json.get("orderNo");
Order order = orderService.selectOne(new EntityWrapper<Order>()
.eq("order_no", jsonOrderNo));
@@ -584,15 +584,23 @@
return R.error("鍙傛暟涓虹┖");
}
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
+ }
+
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderNo));
+ .eq("order_no", jsonOrderNo)
+ .and()
+ .eq("maktx",jsonOrderDetl.getMaktx()));
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
}
- if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getQty()) < 0) {
+ if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
ManLocDetl checkManLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
@@ -604,23 +612,34 @@
manLocDetl.setLocNo(node.getName());
manLocDetl.setNodeId(node.getId());
manLocDetl.setMatnr(orderDetl.getMatnr());
- manLocDetl.setMaktx(orderDetl.getMaktx());
- manLocDetl.setAnfme(orderDetl.getAnfme());
+ manLocDetl.setMaktx(jsonOrderDetl.getMaktx());
+ manLocDetl.setAnfme(jsonOrderDetl.getAnfme());
manLocDetl.setModiTime(date);
manLocDetl.setCreateTime(date);
manLocDetlService.insert(manLocDetl);
} else {
- checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + orderDetl.getAnfme());
+ checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme());
checkManLocDetl.setModiTime(date);
manLocDetlService.update(checkManLocDetl, new EntityWrapper<ManLocDetl>()
.eq("loc_no", jsonLocNo)
.eq("matnr", orderDetl.getMatnr()));
}
-
orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
+
+ //鏇存柊璁㈠崟鐘舵��
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
+ order.setSettle(2L);
+ }else{
+ //宸ヤ綔涓殑鏁伴噺绛変簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�4,瀹屾垚
+ order.setSettle(4L);
+ }
+ if(!orderService.updateById(order)){
+ return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
}
orderService.checkComplete(order.getOrderNo());
@@ -639,6 +658,12 @@
String jsonOrderNo = (String) json.get("orderNo");
Order order = orderService.selectOne(new EntityWrapper<Order>()
.eq("order_no", jsonOrderNo));
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakout()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
+ }
if (Cools.isEmpty(node, order)) {
return R.error("鍙傛暟涓虹┖");
}
@@ -680,6 +705,18 @@
orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
+ //鏇存柊璁㈠崟鐘舵��
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
+ order.setSettle(2L);
+ }else{
+ //宸ヤ綔涓殑鏁伴噺绛変簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�4,瀹屾垚
+ order.setSettle(4L);
+ }
+ if(!orderService.updateById(order)){
+ return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+
orderService.checkComplete(order.getOrderNo());
}
return R.ok("涓嬫灦瀹屾垚");
--
Gitblit v1.9.1