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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2025-11-01 11:54:57 +08:00
parent 1f095cd085 e221a8004c
commit f4bd2c995b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java
View File

@@ -268,6 +268,11 @@ public class DownEmptyUpFullTask extends AbstractTask {
// //删除 // //删除
// iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id()));
iMdPbGroupplateService.update(new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
.eq(GroupPlate::getStoragevehicle_code,taskObj.getVehicle_code()));
//反馈到MES系统 //反馈到MES系统
if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java
View File

@@ -194,6 +194,10 @@ public class SeparateMaterialTask extends AbstractTask {
.set(Structattr::getUpdate_time, DateUtil.now()) .set(Structattr::getUpdate_time, DateUtil.now())
.eq(Structattr::getStruct_code, taskObj.getPoint_code1())); .eq(Structattr::getStruct_code, taskObj.getPoint_code1()));
iMdPbGroupplateService.update(new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
.eq(GroupPlate::getStoragevehicle_code,taskObj.getVehicle_code()));
// //删除 // //删除
// iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id()));