From b84b7c38d8cd7bdaeb171b4c6b6ca67ba65d9f61 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 20 三月 2026 20:15:53 +0800
Subject: [PATCH] 1.修复历史档没有源站点和目标站点 2.修复库存明细搜索栏 3.修复手动入库给出库完成任务标记
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 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 6298d71..731c99c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -350,6 +347,7 @@
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+ wrkMast.setOveMk(staDesc.getStnNo()==1076? "Y":"N");
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -458,7 +456,8 @@
.eq("dev_no", basDevice.getType()).orderBy("order_no"));
if (Objects.isNull(binds)) {
- throw new CoolException("鏈哄彴鏈缃粯璁ゅ伐浣滀綅锛侊紒");
+ log.error(deviceNo+"---"+basDevice.getType()+"--娌℃湁鍙敤鏈哄彴");
+ return;
}
//
// Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
@@ -723,6 +722,8 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setOveMk("Y");
+ wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
@@ -950,6 +951,12 @@
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()).eq("wrk_sts",15L));
+ if (!Cools.isEmpty(wrkMast)) {
+ mast.setOveMk("Y");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(mast);
+ }
// 鍑哄簱
} else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
@@ -1441,13 +1448,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void backLocOperation(String workNo, Long userId) {
+ public R backLocOperation(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)) {
- throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
+ return R.error(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
if (wrkMast.getWrkSts() != 15) {
- throw new CoolException("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
+ return R.error("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
}
Integer ioType = wrkMast.getIoType() - 50;
@@ -1459,7 +1466,7 @@
// ioType = 10;
// }
if (Objects.isNull(wrkMast.getIsSuplus())) {
- throw new CoolException("鍥炲簱绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍥炲簱绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
if (wrkMast.getIsSuplus() == 0) {
@@ -1477,12 +1484,12 @@
.eq("crn_no", locMast1.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ return R.error("鍏ュ簱璺緞涓嶅瓨鍦�");
}
int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()));
if (count >= 2) {
- throw new CoolException("浠诲姟妗ｅ凡鐢熸垚锛屼笉鍙互閲嶅鐢熸垚鐩稿悓鐨勫瓙浠诲姟锛侊紒");
+ return R.error("浠诲姟妗ｅ凡鐢熸垚锛屼笉鍙互閲嶅鐢熸垚鐩稿悓鐨勫瓙浠诲姟锛侊紒");
}
WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -1512,11 +1519,11 @@
mast.setModiTime(now);
mast.setModiUser(userId);
if (!wrkMastService.insert(mast)) {
- throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ return R.error("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (Cools.isEmpty(wrkDetls)) {
- throw new CoolException("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
+ return R.error("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
@@ -1525,14 +1532,14 @@
inLoc.setModiTime(now);
inLoc.setModiUser(userId);
if (!locMastService.updateById(inLoc)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ return R.error("淇敼搴撲綅鐘舵�佸け璐�");
}
LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", mast.getSourceLocNo()));
if (!Objects.isNull(aroundBind)) {
aroundBind.setLocType(LocStsType.LOC_STS_TYPE_R.type);
if (!locAroundBindService.updateById(aroundBind)) {
- throw new CoolException("宸ヤ綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ return R.error("宸ヤ綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -1555,7 +1562,7 @@
locMast.setModiTime(now);
locMast.setModiUser(userId);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ return R.error("淇敼搴撲綅鐘舵�佸け璐�");
}
// wrkMast.setWrkCode(null);
@@ -1563,6 +1570,10 @@
// if (!wrkMastService.updateById(wrkMast)) {
// throw new CoolException("浠诲姟妗ｆ洿鏂板け璐ワ紒锛�");
// }
+ if (Cools.isEmpty(mast)) {
+ return R.error("娌℃湁鐢熸垚浠诲姟");
+ }
+ return R.ok("鐢熸垚鍥炲簱浠诲姟鎴愬姛锛侊紒");
}
--
Gitblit v1.9.1