From facf104ca0830f96fe11d54048d17f4b646032e0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 29 一月 2026 16:42:06 +0800
Subject: [PATCH] 库存明细查询去除库区信息
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 2d3edb0..7a52acd 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.service.impl.LocCacheServiceImpl;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +58,9 @@
private TaskDetlService taskDetlService;
@Autowired
private BasStationServiceImpl basStationService;
+
+ @Resource
+ private BasDevpMapper basDevpMapper;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -131,6 +136,11 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setMatnr(wrkDetl.getMatnr());
+ locDetl.setMaktx(wrkDetl.getMaktx());
+ locDetl.setSpecs(wrkDetl.getSpecs());
+ locDetl.setUnit(wrkDetl.getUnit());
+ locDetl.setZpallet(wrkDetl.getZpallet());
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -202,6 +212,11 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setMatnr(wrkDetl.getMatnr());
+ locDetl.setMaktx(wrkDetl.getMaktx());
+ locDetl.setSpecs(wrkDetl.getSpecs());
+ locDetl.setUnit(wrkDetl.getUnit());
+ locDetl.setZpallet(wrkDetl.getZpallet());
if (!locDetlService.insert(locDetl)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -308,6 +323,11 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setMatnr(wrkDetl.getMatnr());
+ locDetl.setMaktx(wrkDetl.getMaktx());
+ locDetl.setSpecs(wrkDetl.getSpecs());
+ locDetl.setUnit(wrkDetl.getUnit());
+ locDetl.setZpallet(wrkDetl.getZpallet());
if (!locDetlService.insert(locDetl)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -420,6 +440,11 @@
break;
default:
break;
+ }
+
+ // 鍑哄叆搴撲换鍔℃帶鍒� 鍏ュ簱鏆傚瓨-1
+ if(wrkMast.getSourceStaNo().equals("205")) {
+ basDevpMapper.updateInQty(Integer.parseInt(wrkMast.getSourceStaNo()),2);
}
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(5L);
@@ -570,6 +595,12 @@
return SUCCESS;
}
+ @Resource
+ private TaskLogService taskLogService;
+
+ @Resource
+ private TaskDetlLogService taskDetlLogService;
+
/**
* @author Ryan
* @date 2025/9/23
@@ -577,15 +608,19 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public ReturnT<String> AgvStart(Task task) {
- // 4.鍏ュ簱瀹屾垚
- if (task.getWrkSts() == 4) {
- return agvDoIn(task);
- // 14.鍑哄簱瀹屾垚
- } else if (task.getWrkSts() == 14) {
- return agvDoOut(task);
- }
- return SUCCESS;
+ public void AgvStart(Task task) {
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ taskLogService.save(task.getWrkNo());
+
+ // 鍒犻櫎宸ヤ綔涓绘。
+ taskService.deleteById(task.getId());
+
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ taskDetlLogService.save(task.getWrkNo());
+
+ // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
+ taskDetlService.delete(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
}
@@ -690,8 +725,8 @@
.setColor(pakin.getColor())
.setLocId(locCache.getId())
.setLocNo(locCache.getLocNo())
- .setAreaId(locCache.getAreaId())
- .setAreaName(locCache.getAreaName())
+// .setAreaId(locCache.getAreaId())
+// .setAreaName(locCache.getAreaName())
.setUnit(pakin.getUnit())
.setBatch(pakin.getBatch());
if (!locDetlService.insert(detl)) {
--
Gitblit v1.9.1