From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index 984ff14..dd8259a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -255,7 +255,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public boolean generatePakIn(GeneratePakInParam param) {
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getBarcode()));
if (param.getTaskType() != 10 && waitPakins.isEmpty()) {
@@ -279,15 +279,20 @@
}
Task task = new Task();
- task.setTaskNo(this.generateTaskNo(taskType.getId()));//浠诲姟鍙�
- task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.鐢熸垚鍏ュ簱浠诲姟
- task.setTaskType(taskType.getId());//浠诲姟绫诲瀷
- task.setIoPri(this.generateIoPri(taskType.getId()));//浼樺厛绾�
+ //浠诲姟鍙�
+ task.setTaskNo(this.generateTaskNo(taskType.getId()));
+ //1.鐢熸垚鍏ュ簱浠诲姟
+ task.setTaskSts(TaskStsType.GENERATE_IN.id);
+ //浠诲姟绫诲瀷
+ task.setTaskType(taskType.getId());
+ //浼樺厛绾�
+ task.setIoPri(this.generateIoPri(taskType.getId()));
task.setOriginLoc(null);
task.setTargetLoc(loc.getLocNo());
task.setOriginSite(param.getOriginSite());
task.setTargetSite(null);
- task.setBarcode(param.getBarcode());//鎵樼洏鐮�
+ //鎵樼洏鐮�
+ task.setBarcode(param.getBarcode());
boolean taskSave = taskService.save(task);
if (!taskSave) {
throw new CoolException("浠诲姟鐢熸垚澶辫触");
@@ -298,9 +303,12 @@
TaskDetl taskDetl = new TaskDetl();
taskDetl.setTaskId(task.getId());
taskDetl.setTaskNo(task.getTaskNo());
- taskDetl.setAnfme(waitPakin.getAnfme());//鏁伴噺
- taskDetl.setStock(0D);//搴撳瓨
- taskDetl.setBatch(waitPakin.getDetl$().getBatch());//鎵瑰彿
+ //鏁伴噺
+ taskDetl.setAnfme(waitPakin.getAnfme());
+ //搴撳瓨
+ taskDetl.setStock(0D);
+ //鎵瑰彿
+ taskDetl.setBatch(waitPakin.getDetl$().getBatch());
taskDetl.setBarcode(waitPakin.getBarcode());
taskDetl.setOrderId(waitPakin.getOrderId());
taskDetl.setOrderNo(waitPakin.getOrderNo());
@@ -430,7 +438,7 @@
task.setTaskSts(TaskStsType.COMPLETE_IN.id);//99.鍏ュ簱瀹屾垚
}else {
//鍑哄簱
- TaskDetl taskDetl = taskDetls.get(0);
+ TaskDetl taskDetl = taskDetls.get(0); //TODO 鍑哄簱娴佺▼寰呯‘璁わ紝ESS鍙栬揣鍚庯紝杈撻�佺嚎娴佽浆鍒版壂鐮佸鐘舵��
if (taskDetl.getWaveId() == null) {
task.setTaskSts(TaskStsType.COMPLETE_OUT.id);//199.鍑哄簱瀹屾垚
}else {
@@ -622,6 +630,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean pickTask(Long taskId) {
Task task = taskService.getById(taskId);
if(task == null){
@@ -632,7 +641,7 @@
throw new CoolException("浠诲姟绫诲瀷涓嶅彲鎷ｆ枡");
}
- if (task.getTaskSts() != 200) {
+ if (task.getTaskSts() != 198) {
throw new CoolException("褰撳墠鐘舵�佷笉鍙嫞鏂�");
}
@@ -669,8 +678,8 @@
if(loc == null) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
-
- task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.鐢熸垚鍏ュ簱浠诲姟
+ //102鎷ｆ枡姝ゅ闇�淇敼涓篧CS_CONTAINER_RECEIVE,瀹氭椂浠诲姟鏌ヨ鍚庯紝鑷姩涓嬪彂鍏ュ簱浠诲姟鑷矱SS
+ task.setTaskSts(TaskStsType.WCS_CONTAINER_RECEIVE.id);//1.鐢熸垚鍏ュ簱浠诲姟
task.setTaskType(taskType);
task.setTargetLoc(loc.getLocNo());
task.setUpdateTime(new Date());
--
Gitblit v1.9.1