From 7500ea270ab631379feced83e94b387d1885fb49 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 27 六月 2022 15:51:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 ++++++++++++
src/main/resources/mapper/LocDetlMapper.xml | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 +++++++---
3 files changed, 21 insertions(+), 5 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 a1465f6..e063e4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -418,11 +418,15 @@
BasDevp sta = basDevpService.checkSiteStatus(staNo);
//鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
+ if (order.getSettle() != 1 && order.getSettle() != 2){
+ throw new CoolException("璇ヨ鍗曞凡澶勭悊");
+ }
+
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
@@ -453,7 +457,7 @@
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
- if(orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
+ if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
@@ -464,7 +468,7 @@
if(!Cools.isEmpty(orderDetl.getBatch())){
wrapper.eq("batch", orderDetl.getBatch());
}
- if(orderDetlService.update(orderDetl, wrapper)){
+ if(!orderDetlService.update(orderDetl, wrapper)){
throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
}
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 4691203..df7b234 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -784,6 +784,18 @@
}
}
+ if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
+// OrderDetl orderDetl = orderDetlService.selectItem()
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
+ }
+ }
+
// // 璁㈠崟鍏宠仈
// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// for (WrkDetl wrkDetl : wrkDetls) {
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b78afe1..3d1dedc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -214,7 +214,7 @@
and a.batch = #{batch}
</if>
<if test="orderNo != null and orderNo != ''">
- and a.orderNo = #{orderNo}
+ and a.order_no = #{orderNo}
</if>
<if test="locNos != null and locNos.size > 0">
@@ -314,7 +314,7 @@
</select>
<select id="selectLocDetlSumQty" resultType="double">
- select SUM(qty) qty
+ select SUM(anfme) anfme
from asr_loc_detl
where loc_no=#{locNo}
</select>
--
Gitblit v1.9.1