From 287170042ad762d32ca574a5ed692648ea8e002f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 四月 2025 08:56:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
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 2b49f04..e5ddb86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -96,8 +96,8 @@
// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ eq("zpallet", param.getBarcode())) > 0) {
+ throw new CoolException(param.getBarcode() + "鏉＄爜宸茬粍鎵�");
}
try{
param.setOrderNo(param.getCombMats().get(0).getOrderNo());
@@ -134,6 +134,7 @@
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
+ detlDto.setMemo(elem.getMemo());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -165,6 +166,7 @@
waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
waitPakin.setWeight(detlDto.getWeight());
+ waitPakin.setMemo(detlDto.getMemo());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -245,6 +247,7 @@
waitPakin.setPayment(detlDto.getPayment());
waitPakin.setUuid(uuid);
waitPakin.setWeight(detlDto.getWeight());
+ waitPakin.setMemo(detlDto.getMemo());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -899,6 +902,15 @@
OrderDetl orderDetl = orderDetlService.selectOne(orderDetlWrapper);
if (Cools.isEmpty(orderDetl)){
return R.error("璁㈠崟涓湭鏌ヨ鍒颁笅鏋舵暟鎹�");
+
+ }
+ EntityWrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<>();
+ manLocDetlWrapper.eq("zpallet",jsonBarcode);
+ manLocDetlWrapper.eq("matnr",jsonManLocDetl.getMatnr());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+ if (Cools.isEmpty(manLocDetl)){
+ return R.error("鎵樼洏鐮佹湭鏌ヨ鍒板簱瀛樹俊鎭�");
+
}
BigDecimal orderQty = new BigDecimal(orderDetl.getQty());
BigDecimal orderWorkQty = new BigDecimal(orderDetl.getWorkQty());
@@ -911,15 +923,6 @@
if (diffWorkQty.doubleValue() > orderDetl.getAnfme()){
return R.error("宸ヤ綔鏁伴噺澶т簬璁㈠崟鏁伴噺");
}
- orderDetl.setQty(diffQty.doubleValue());
- orderDetl.setWorkQty(diffWorkQty.doubleValue());
- if (!orderDetlService.updateById(orderDetl)){
- return R.error("璁㈠崟鏄庣粏鏇存柊澶辫触");
- }
- EntityWrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<>();
- manLocDetlWrapper.eq("zpallet",jsonBarcode);
- manLocDetlWrapper.eq("matnr",jsonManLocDetl.getMatnr());
- ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
BigDecimal locDetlAnfme = new BigDecimal(manLocDetl.getAnfme());
BigDecimal diffAnfme = locDetlAnfme.subtract(anfme);
@@ -928,16 +931,18 @@
}
if (diffAnfme.doubleValue() == 0){
if (!manLocDetlService.delete(manLocDetlWrapper)){
- return R.error("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ throw new RuntimeException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
}
-
} else if (diffAnfme.doubleValue() > 0) {
manLocDetl.setAnfme(diffAnfme.doubleValue());
if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)){
- return R.error("鏇存柊搴撳瓨鏄庣粏澶辫触");
+ throw new RuntimeException("鏇存柊搴撳瓨鏄庣粏澶辫触");
}
-
-
+ }
+ orderDetl.setQty(diffQty.doubleValue());
+ orderDetl.setWorkQty(diffWorkQty.doubleValue());
+ if (!orderDetlService.updateById(orderDetl)){
+ return R.error("璁㈠崟鏄庣粏鏇存柊澶辫触");
}
Order order = orderService.selectByNo(jsonOrderNo);
if (IsOrderStatus(jsonOrderNo)){
@@ -949,7 +954,6 @@
throw new RuntimeException("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
}
-
return R.ok();
}
--
Gitblit v1.9.1