From 707d414c0e6a8baff3ce7affec820f0fc1a13c19 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 24 二月 2026 09:06:04 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
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 53b2a4d..fe251d2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -283,7 +283,9 @@
locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3(), locDetl.getAnfme(), locDetl.getThreeCode()));
locDetl.setOwner(param.getOwnerId());
try {
- locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", locDetl.getMatnr()));
+ locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ .eq("supp_code", locDetl.getStandby1())
+ .eq("matnr", locDetl.getMatnr()));
} catch (Exception e) {
throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡");
}
@@ -416,17 +418,17 @@
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
// OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
- int ioType = (taskDto.isAll() ? 101 : 103);
- if(ioType == 101){
+ int ioType = (taskDto.isAll() ? 101 : 103);
+ if (ioType == 101) {
boolean DiffQty = taskDto.getLocDtos().stream().allMatch(locDto ->
locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_no", locDto.getLocNo())
.eq("matnr", locDto.getMatnr())
- .eq("batch", locDto.getBatch())
- .eq("standby1",locDto.getStandby1())
+ .eq(!Cools.isEmpty(locDto.getBatch()), "batch", locDto.getBatch())
+ .eq("standby1", locDto.getStandby1())
).getDiffQty().compareTo(BigDecimal.ZERO) == 0
);
- if (!DiffQty){
+ if (!DiffQty) {
ioType = 103;
}
}
@@ -559,7 +561,7 @@
List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>()
.eq("loc_no", locDto.getLocNo())
.eq("matnr", locDto.getMatnr())
- .eq("batch", locDto.getBatch())
+ .eq(!Cools.isEmpty(locDto.getBatch()),"batch", locDto.getBatch())
.eq("order_no", locDto.getOrderNo())
);
@@ -585,7 +587,7 @@
}
// 淇敼璁㈠崟鏄庣粏
checkOrderDetls.get(0).setStatus(2);
- if (!checkOrderDetlService.updateById(checkOrderDetls.get(0))){
+ if (!checkOrderDetlService.updateById(checkOrderDetls.get(0))) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
}
}
@@ -962,7 +964,7 @@
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
wrkMast.setIoPri(10D);
wrkMast.setCrnNo(sourceLoc.getCrnNo());
@@ -1279,7 +1281,7 @@
@Transactional(rollbackFor = Exception.class)
public void cancelWrkMast(String workNo, Long userId) {
Date now = new Date();
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",workNo));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", workNo));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
@@ -1385,7 +1387,7 @@
if (wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (!Cools.isEmpty(wrkDetls.get(0).getOrderNo())){
+ if (!Cools.isEmpty(wrkDetls.get(0).getOrderNo())) {
for (WrkDetl wrkDetl : wrkDetls) {
CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
@@ -1400,7 +1402,7 @@
CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", wrkDetls.get(0).getOrderNo()));
List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", checkOrder.getId()));
boolean is = checkOrderDetls.stream().allMatch(item -> item.getStatus().equals(1));
- checkOrder.setSettle(is?1L:12L);
+ checkOrder.setSettle(is ? 1L : 12L);
checkOrderService.updateById(checkOrder);
}
@@ -1525,7 +1527,7 @@
// .淇敼骞舵墭鍏ュ簱鏄庣粏鎵樼爜
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("area_id", locMast.getAreaId())
+ .eq("area_id", locMast.getAreaId())
.eq("loc_no", locMast.getLocNo()));
if (!Objects.isNull(locDetls) && !locDetls.isEmpty()) {
locDetls.forEach(locDetl -> {
@@ -1544,8 +1546,8 @@
wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetl.setBarcode(wrkMast.getBarcode());
if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>()
- .eq("matnr", wrkDetl.getMatnr())
- .eq("standby1", wrkDetl.getStandby1())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("standby1", wrkDetl.getStandby1())
.eq("wrk_no", wrkMast.getWrkNo()))) {
throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
}
@@ -1665,7 +1667,8 @@
if (Cools.isEmpty(mat)) {
throw new CoolException("鐩爣搴撲綅鍟嗗搧缂栫爜鏈夎锛�");
}
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getLocDetls().get(0).getMatnr()));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("matnr", param.getLocDetls().get(0).getMatnr()));
if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
throw new CoolException("寰呬慨鏀瑰晢鍝佹棤搴撳瓨锛屾棤闇�淇敼锛� 鍝佸彿锛�" + param.getLocDetls().get(0).getMatnr());
}
--
Gitblit v1.9.1