root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: root:master
Branches Tags
root:master root:opt_250311 root:bf_master root:1220 root:bei_febei_fen备份
...
pull from: root:opt_250311
Branches Tags
root:master root:opt_250311 root:bf_master root:1220 root:bei_febei_fen备份

2 Commits
master ... opt_250311

Author SHA1 Message Date
gongbaoxiong
fc150c13a2 Merge remote-tracking branch 'origin/opt_250311' into opt_250311 
# Conflicts:
#	wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
 2025-03-13 23:39:24 +08:00
gongbaoxiong
de817ef511 opt:优化ERP同步锁，单据推送暂停问题 2025-03-12 13:09:31 +08:00
1 changed files with 0 additions and 5 deletions
Expand all files Collapse all files

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -161,11 +161,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
} }
if (StringUtils.isEmpty(vehicleMaterList.get(0).getProc_inst_id())) { if (StringUtils.isEmpty(vehicleMaterList.get(0).getProc_inst_id())) {
FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null); FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null);
if (ObjectUtil.isEmpty(vehicleMaterList)) {
throw new BadRequestException("任务完成失败，到载具物料信息: " + task.getVehicle_code());
}
if (StringUtils.isNotBlank(vehicleMaterList.get(0).getProc_inst_id())) {
FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null);
BussEventMulticaster.Publish(continueEvent); BussEventMulticaster.Publish(continueEvent);
} else { } else {
handleFinishTask(param, task); handleFinishTask(param, task);