From 853a65ae9b42fe890b66ecc3bdb427f69b23d210 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:36:48 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 95 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 44 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 6310d78..aa3be9f 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,18 @@
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);
+ int ioType = 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;
}
}
@@ -514,7 +517,8 @@
@Transactional(rollbackFor = Exception.class)
public void checkStockOut(BasDevp staNo, TaskDto taskDto, Long userId) {
Date now = new Date();
- List<LocDto> locDtos = taskDto.getLocDtos();
+ List<LocDto> locDtos = taskDto.getLocDtos().stream().distinct().collect(Collectors.toList());
+// Map<String, List<LocDto>> collect = taskDto.getLocDtos().stream().collect(Collectors.groupingBy(LocDto::getLocNo));
for (LocDto locDto : locDtos) {
if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
throw new CoolException("璁㈠崟鍑哄簱寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -551,25 +555,24 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDto locDto : taskDto.getLocDtos()) {
+ for (LocDto locDto : locDtos) {
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
- List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>()
+ CheckOrderDetl checkOrderDetls = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
.eq("loc_no", locDto.getLocNo())
.eq("matnr", locDto.getMatnr())
- .eq("batch", locDto.getBatch())
- .eq("order_no", locDto.getOrderNo())
- );
+ .eq("supp_code", locDto.getSuppCode())
+ .eq("order_no", locDto.getOrderNo()));
- if (checkOrderDetls.size() > 1) {
+ if (Objects.isNull(checkOrderDetls)) {
throw new CoolException("鏁版嵁澶т簬1,璇锋鏌ユ暟鎹�");
}
WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(checkOrderDetls.get(0));
- wrkDetl.setOrderId(checkOrderDetls.get(0).getId());
+ wrkDetl.sync(checkOrderDetls);
+ wrkDetl.setOrderId(checkOrderDetls.getId());
wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetl.setIoTime(now);
wrkDetl.setWrkNo(workNo);
@@ -584,8 +587,8 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- checkOrderDetls.get(0).setStatus(2);
- if (!checkOrderDetlService.updateById(checkOrderDetls.get(0))){
+ checkOrderDetls.setStatus(2);
+ if (!checkOrderDetlService.updateById(checkOrderDetls)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
}
}
@@ -615,14 +618,14 @@
}
// 鑾峰彇搴撲綅
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", taskDto.getLocNo()));
- int ioType = (taskDto.isAll() ? 101 : 103);
+ int ioType = 103;
// 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ int workNo = commonService.getWorkNo(4);
Task task = new Task();
task.setWrkNo(workNo)
.setIoTime(new Date())
- .setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setWrkSts(301L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
.setIoType(ioType) // 鍏ュ嚭搴撶姸鎬�
.setTaskType("agv")
.setIoPri(10D)
@@ -687,7 +690,7 @@
locCache.setLocSts(ioType == 101 ? "R" : "P");
locCache.setModiUser(userId);
locCache.setModiTime(now);
- if (!locCacheService.updateById(locCache)) {
+ if (!locCacheService.update(locCache, new EntityWrapper<LocCache>().eq("loc_no", locCache.getLocNo()))) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + taskDto.getLocNo());
}
} else {
@@ -962,7 +965,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 +1282,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,8 +1388,7 @@
if (wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (!Cools.isEmpty(wrkDetls.get(0).getOrderNo())){
-
+ if (!Objects.isNull(wrkDetls) && !wrkDetls.isEmpty()) {
for (WrkDetl wrkDetl : wrkDetls) {
CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
.eq("loc_no", wrkMast.getSourceLocNo())
@@ -1394,17 +1396,21 @@
.eq("batch", wrkDetl.getBatch())
.eq("order_no", wrkDetl.getOrderNo())
);
- checkOrderDetl.setStatus(1);
- checkOrderDetlService.updateById(checkOrderDetl);
+ if (!Objects.isNull(checkOrderDetl)) {
+ checkOrderDetl.setStatus(1);
+ checkOrderDetlService.updateById(checkOrderDetl);
+ }
}
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);
}
-
-
+// if (!Cools.isEmpty(wrkDetls.get(0).getOrderNo())) {
+//
+//
+// }
}
// // 璁㈠崟鍏宠仈
@@ -1485,22 +1491,22 @@
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
}
// 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
- .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
+// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+// .eq("type_no", wrkMast.getIoType() - 50)
+// .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+// .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
+// StaDesc staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// }
Date now = new Date();
// 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
- Integer staNo = staDesc.getCrnStn();
+// Integer staNo = staDesc.getCrnStn();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
- wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
+// wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
@@ -1525,7 +1531,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 +1550,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 +1671,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