From a65de2492435fe372382a3e0f718db75c5b979b9 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Tue, 6 Jan 2026 15:00:48 +0800 Subject: [PATCH] =?UTF-8?q?opt:1=E3=80=81=E8=87=AA=E5=8A=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=B2=A1=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=EF=BC=88=E5=85=A8=E9=80=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=81=E9=80=89=E6=8B=A9=E6=8F=90=E4=BA=A4=EF=BC=89=EF=BC=9B?= =?UTF-8?q?2=E3=80=81MES=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=85=81=E8=AE=B8MES=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E3=80=81=E5=8F=96=E6=B6=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesToWmsController.java | 16 ++++ .../dto/mes/MesBackMaterialRequestDto.java | 5 + .../dto/mes/MesCallMaterialRequestDto.java | 6 ++ .../ext_manage/dto/mes/MesUpdateTaskDto.java | 19 ++++ .../ext_manage/service/MesToWmsService.java | 16 ++++ .../service/impl/MesToWmsServiceImpl.java | 35 +++++++ .../controller/PdaIosInController.java | 11 +++ .../ios_manage/service/PdaIosInService.java | 6 ++ .../service/impl/PdaIosInServiceImpl.java | 96 +++++++++++++++++++ .../service/ISchBaseTaskService.java | 8 +- .../wms/sch_manage/service/dao/InCheck.java | 22 +++++ .../sch_manage/service/dao/SchBaseTask.java | 2 + .../service/dao/mapper/SchBasePointMapper.xml | 12 +-- .../service/impl/SchBaseTaskServiceImpl.java | 16 ++-- .../service/util/tasks/BackInTask.java | 1 + .../service/util/tasks/VehicleInTask.java | 1 + .../util/tasks/zw/DownEmptyUpFullTask.java | 1 + .../util/tasks/zw/SeparateMaterialTask.java | 1 + .../service/impl/InBillServiceImpl.java | 1 + .../service/impl/OutBillServiceImpl.java | 3 + 20 files changed, 265 insertions(+), 13 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesUpdateTaskDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/InCheck.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java index 9ced759..4aac563 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.dto.mes.MesBackMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesCallMaterialRequestDto; +import org.nl.wms.ext_manage.dto.mes.MesUpdateTaskDto; import org.nl.wms.ext_manage.service.MesToWmsService; import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService; import org.springframework.beans.factory.annotation.Autowired; @@ -56,4 +57,19 @@ public class MesToWmsController { public ResponseEntity getStructIvt(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(mesToWmsService.getStructivt(whereJson), HttpStatus.OK); } + + + @PostMapping("/updateTask") + @Log("修改任务") + @SaIgnore + public ResponseEntity updateTask(@RequestBody MesUpdateTaskDto dto) { + return new ResponseEntity<>(mesToWmsService.updateTask(dto), HttpStatus.OK); + } + + @PostMapping("/getTaskList") + @Log("获取任务列表") + @SaIgnore + public ResponseEntity getTaskList(@RequestBody MesUpdateTaskDto dto) { + return new ResponseEntity<>(mesToWmsService.getTaskList(dto), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java index cc63d31..865ce5f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java @@ -29,4 +29,9 @@ public class MesBackMaterialRequestDto { */ private Boolean isManual; + /** + * MES发起手工退料/退空桶，不需要下发acs + * + */ + private Boolean mes_is_manual; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesCallMaterialRequestDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesCallMaterialRequestDto.java index 7c27e46..73e9cbc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesCallMaterialRequestDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesCallMaterialRequestDto.java @@ -23,4 +23,10 @@ public class MesCallMaterialRequestDto { * */ private Boolean isManual; + + /** + * MES发起手工叫料，不需要下发acs + * + */ + private Boolean mes_is_manual; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesUpdateTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesUpdateTaskDto.java new file mode 100644 index 0000000..2e068e2 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesUpdateTaskDto.java @@ -0,0 +1,19 @@ +package org.nl.wms.ext_manage.dto.mes; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class MesUpdateTaskDto { + private String ext_task_code; + + private String task_code; + + private String vehicle_code; + + /** + * 操作 forceFinish cancel + */ + private String operation; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/MesToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/MesToWmsService.java index 77855dc..6554a31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/MesToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/MesToWmsService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import org.nl.wms.ext_manage.dto.mes.MesBackMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesCallMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesResponse; +import org.nl.wms.ext_manage.dto.mes.MesUpdateTaskDto; /** *

@@ -34,4 +35,19 @@ public interface MesToWmsService { * @return MesResponse */ MesResponse getStructivt(JSONObject whereJson); + + /** + * MES 更新任务 + * @param + * @return MesResponse + */ + MesResponse updateTask(MesUpdateTaskDto dto); + + /** + * MES 查询任务 + * @param + * @return MesResponse + */ + MesResponse getTaskList(MesUpdateTaskDto dto); + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index 8da07fb..b39d6f1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper import org.nl.wms.ext_manage.dto.mes.MesBackMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesCallMaterialRequestDto; import org.nl.wms.ext_manage.dto.mes.MesResponse; +import org.nl.wms.ext_manage.dto.mes.MesUpdateTaskDto; import org.nl.wms.ext_manage.service.MesToWmsService; import org.nl.wms.ext_manage.service.util.AcsResponse; import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService; @@ -49,6 +50,7 @@ import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.dao.GroupPlate; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; +import org.redisson.executor.TasksService; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -289,6 +291,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { // 创建任务 JSONObject taskParam = new JSONObject(); + taskParam.put("mes_is_manual",dto.getMes_is_manual()); taskParam.put("iostorinv_id", invId); taskParam.put("point_code", groupPlate.getStruct_code()); taskParam.put("point_code2", pointCode); @@ -413,6 +416,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { // 创建任务 JSONObject taskParam = new JSONObject(); + taskParam.put("mes_is_manual",dto.getMes_is_manual()); taskParam.put("iostorinv_id", invId); taskParam.put("point_code", groupPlate.getStruct_code()); taskParam.put("point_code2", sonSchBasePointList.get(0).getPoint_code()); @@ -506,6 +510,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { param.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生")); } + param.put("mes_is_manual",dto.getMes_is_manual()); param.put("ext_task_code", dto.getTask_code()); //退料 if ("1".equals(dto.getTask_type())) { @@ -574,6 +579,36 @@ public class MesToWmsServiceImpl implements MesToWmsService { return MesResponse.requestParamOk(mdPbStoragevehicleextMapper.queryAllIn(whereJson)); } + @Override + public MesResponse getTaskList(MesUpdateTaskDto dto) { + return MesResponse.requestParamOk(iSchBaseTaskService.list(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(dto.getExt_task_code()), SchBaseTask::getExt_task_code, dto.getExt_task_code()) + .like(StringUtils.isNotBlank(dto.getTask_code()), SchBaseTask::getTask_code, dto.getTask_code()) + .eq(SchBaseTask::getMes_is_manual, true) + .and(wp -> wp + .like(StringUtils.isNotBlank(dto.getVehicle_code()), SchBaseTask::getVehicle_code, dto.getVehicle_code()) + .or() + .like(StringUtils.isNotBlank(dto.getVehicle_code()), SchBaseTask::getVehicle_code2, dto.getVehicle_code())) + ) + ); + } + + @Override + public MesResponse updateTask(MesUpdateTaskDto dto) { + SchBaseTask schBaseTask = iSchBaseTaskService.getByExtCode(dto.getExt_task_code()); + if(schBaseTask!= null) { + Map map = new HashMap<>(); + map.put("config_code",schBaseTask.getConfig_code()); + map.put("method_name",dto.getOperation()); + map.put("task_code",schBaseTask.getTask_code()); + taskService.operation(map); + return MesResponse.requestOk(); + } + else { + throw new BadRequestException("不存在ext_task_code=【" + dto.getExt_task_code() + "】的任务，请核对!"); + } + } + /** * 组织入库插入数据 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java index 2c1f968..cc6104a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java @@ -270,4 +270,15 @@ public class PdaIosInController { return new ResponseEntity<>(pdaIosInService.getPointCodeByVehicleCode(whereJson), HttpStatus.OK); } + /** + * 获取来料入库所有 + * @return + */ + + @PostMapping("/getInBillList") + @Log("PDA来料入库校验点位和托盘码") + public ResponseEntity getInBillList() { + return new ResponseEntity<>(pdaIosInService.getInBillList(), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java index 3d4a5a7..3e974df 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java @@ -245,4 +245,10 @@ public interface PdaIosInService { * @return PdaResponse */ PdaResponse getPointCodeByVehicleCode(JSONObject whereJson); + + /** + * 手持获取来料入库数据 + * @return PdaResponse + */ + PdaResponse getInBillList(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 7ba708c..6f80b05 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -1342,6 +1342,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { Map jsonMst = new HashMap<>(); jsonMst.put("point_code", whereJson.getString("point_code")); jsonMst.put("ext_task_code", whereJson.getString("ext_task_code")); + jsonMst.put("mes_is_manual",whereJson.getString("mes_is_manual")); // 组织明细数据 IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne( new QueryWrapper().lambda() @@ -1536,5 +1537,100 @@ public class PdaIosInServiceImpl implements PdaIosInService { return PdaResponse.requestParamOk(outJson); } + @Override + public PdaResponse getInBillList() { + //查点位表 + List schBasePointList = iSchBasePointService.list(new LambdaQueryWrapper() + .eq(SchBasePoint::getPoint_status, "3") + .eq(SchBasePoint::getRegion_code,"YLXCQ") + .isNotNull(SchBasePoint::getVehicle_code)); + if(CollectionUtils.isEmpty(schBasePointList)){ + return PdaResponse.requestOk(); + } + + //判断点位和仓位是否有正在执行的任务 + List schBaseTaskList = iSchBaseTaskService.list(new LambdaQueryWrapper() + .eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO) + .le(SchBaseTask::getTask_status, TaskStatus.EXECUTING.getCode())); + + Set schBaseTaskListPoint = new HashSet<>(); + if(CollectionUtils.isNotEmpty(schBaseTaskList)) { + schBaseTaskListPoint.addAll(schBaseTaskList.stream().map(SchBaseTask::getPoint_code1).collect(Collectors.toSet())); + schBaseTaskListPoint.addAll(schBaseTaskList.stream().map(SchBaseTask::getPoint_code2).collect(Collectors.toSet())); + schBaseTaskListPoint.addAll(schBaseTaskList.stream().map(SchBaseTask::getPoint_code3).collect(Collectors.toSet())); + schBaseTaskListPoint.addAll(schBaseTaskList.stream().map(SchBaseTask::getPoint_code4).collect(Collectors.toSet())); + + schBasePointList = schBasePointList.stream().filter(a -> !schBaseTaskListPoint.contains(a.getPoint_code())).collect(Collectors.toList()); + } + + List zwConfirmCheckParamRespondDtos = new ArrayList<>(); + + + for(SchBasePoint schBasePoint : schBasePointList){ + JSONObject whereJson = new JSONObject(); + whereJson.put("vehicle_code", schBasePoint.getVehicle_code()); + whereJson.put("search", schBasePoint.getVehicle_code()); + + //起点 + whereJson.put("site_code", schBasePoint.getPoint_code()); + whereJson.put("noEmptyVehicle", "1"); + + String material_model = ""; + try { + material_model = getVehicleMaterial(whereJson).getString("material_model"); + if (StringUtils.isBlank(material_model)) { + continue; + } + } catch (Exception e){ + log.error(e.getMessage()); + continue; + } + + final String final_material_model = material_model; + + //判断每个物料是否都已经配置库区 + //查询字典表 + List dictList = sysDictMapper.selectList(new LambdaQueryWrapper() + .eq(Dict::getCode, "MATERIAL_MODEL_SECT")); + + List dicts = dictList.stream().filter(a -> final_material_model.equals(a.getPara1())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(dicts)) { + continue; + } + String sect_code = dicts.get(0).getValue(); + + //根据库区编码获取库区id sect_id + List sectattrList = sectattrMapper.selectList(new LambdaQueryWrapper() + .eq(Sectattr::getSect_code, sect_code)); + + if (CollectionUtils.isEmpty(sectattrList)) { + continue; + } + + whereJson.put("sect_id",sectattrList.get(0).getSect_id()); + + //通过载具查找组盘 + List groupPlates = iMdPbGroupplateService.list(new QueryWrapper() + .eq("storagevehicle_code", schBasePoint.getVehicle_code()) + .lt("status", IOSEnum.GROUP_PLATE_STATUS.code("出库"))); + + if(CollectionUtils.isEmpty(groupPlates)) { + continue; + } + MdMeMaterialbase mdMeMaterialbase = iMdMeMaterialbaseService.getByCode( groupPlates.get(0).getMaterial_id(),true); + ZwConfirmCheckParamRespondDto respDto = new ZwConfirmCheckParamRespondDto(); + respDto.setQty(String.valueOf(groupPlates.get(0).getQty())); + respDto.setMaterial_code(mdMeMaterialbase.getMaterial_code()); + respDto.setForm_data_code(groupPlates.get(0).getExt_code()); + respDto.setVehicle_code( schBasePoint.getVehicle_code()); + respDto.setSite_code( schBasePoint.getPoint_code()); + respDto.setPcsn(groupPlates.get(0).getPcsn()); + respDto.setMaterial_model(mdMeMaterialbase.getMaterial_model()); + + zwConfirmCheckParamRespondDtos.add(respDto); + } + + return PdaResponse.requestParamOk(zwConfirmCheckParamRespondDtos); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java index 2478723..f2a35e6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java @@ -71,6 +71,12 @@ public interface ISchBaseTaskService extends IService { */ SchBaseTask getByCode(String taskCode); - + /** + * 获取任务数据 + * + * @param extTaskCode 任务编码 + * @return / + */ + SchBaseTask getByExtCode(String extTaskCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/InCheck.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/InCheck.java new file mode 100644 index 0000000..be1bedd --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/InCheck.java @@ -0,0 +1,22 @@ +package org.nl.wms.sch_manage.service.dao; + +import lombok.Data; + +@Data +public class InCheck { + private String site_code; + private String vehicle_code; + private String material_code; + private String qty; + private String form_data_code; + /** + * 批次号 + */ + private String pcsn; + + + /** + * 物料类型 + */ + private String material_model; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBaseTask.java index 6d3b234..91e96f7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBaseTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBaseTask.java @@ -121,6 +121,8 @@ public class SchBaseTask implements Serializable { private String form_data_code; + private Boolean mes_is_manual; + private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml index 0903305..e91057e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml @@ -91,9 +91,9 @@ AND t.task_status '5' AND ( t.point_code1 = p.point_code - AND t.point_code2 = p.point_code - AND t.point_code3 = p.point_code - AND t.point_code4 = p.point_code + OR t.point_code2 = p.point_code + OR t.point_code3 = p.point_code + OR t.point_code4 = p.point_code )) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java index e735864..5b31aad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java @@ -153,7 +153,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl 0) { // 查询同一任务组中，顺序号小于当前任务的所有任务 LambdaQueryWrapper wrapper = new QueryWrapper().lambda(); @@ -161,14 +161,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl unfinishedTasks = this.list(wrapper); if (!unfinishedTasks.isEmpty()) { throw new BadRequestException("同一任务组中存在未完成的前置任务，不允许跳过完成"); } } } - + abstractTask.forceFinish(task_code); break; case "cancel": @@ -190,7 +190,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); + lam.eq(SchBaseTask::getExt_task_code, extTaskCode); + lam.eq(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); + return this.getOne(lam); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index a385552..dd297de 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -81,6 +81,7 @@ public class BackInTask extends AbstractTask { task.setVehicle_code(json.getString("vehicle_code")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); + task.setMes_is_manual(json.getBoolean("mes_is_manual")); task.setTask_group_id(IdUtil.getStringId()); task.setTask_group_seq(new BigDecimal(1)); task.setCreate_mode(json.getString("create_mode")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index 3c9f806..70f4177 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -90,6 +90,7 @@ public class VehicleInTask extends AbstractTask { task.setTask_group_id(taskGroupId); task.setCreate_mode(json.getString("create_mode")); task.setRequest_param(json.toString()); + task.setMes_is_manual(json.getBoolean("mes_is_manual")); task.setPriority(json.getString("Priority")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index 9694d7f..e9acf44 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -101,6 +101,7 @@ public class DownEmptyUpFullTask extends AbstractTask { task.setGroup_id(json.getString("group_id")); task.setRequest_param(json.toString()); task.setPriority("1"); + task.setMes_is_manual(json.getBoolean("mes_is_manual")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index 622ae2c..88997e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -98,6 +98,7 @@ public class SeparateMaterialTask extends AbstractTask { task.setCreate_mode(json.getString("create_mode")); task.setRequest_param(json.toString()); task.setPriority("1"); + task.setMes_is_manual(json.getBoolean("mes_is_manual")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index 27ee099..7d78feb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -826,6 +826,7 @@ public class InBillServiceImpl extends ServiceImpl i } String taskGroupId = IdUtil.getStringId(); JSONObject task = new JSONObject(); + task.put("mes_is_manual",whereJson.get("mes_is_manual")); task.put("config_code", IOSConstant.BACK_IN_TASK); task.put("group_id", groupPlate.getGroup_id()); task.put("priority", whereJson.get("priority")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 8708b93..6d7d4c6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -1015,6 +1015,7 @@ public class OutBillServiceImpl extends ServiceImpl i } JSONObject task_form = new JSONObject(); task_form.put("task_type", "SeparateMaterial"); + task_form.put("mes_is_manual",whereJson.get("mes_is_manual")); task_form.put("order_id", whereJson.getString("order_id")); task_form.put("task_code", whereJson.getString("task_code")); task_form.put("point_code1", ioStorInvDis.getStruct_code()); @@ -1042,6 +1043,7 @@ public class OutBillServiceImpl extends ServiceImpl i throw new BadRequestException("点位不存在"); } JSONObject task_form = new JSONObject(); + task_form.put("mes_is_manual",whereJson.get("mes_is_manual")); task_form.put("task_type", "DownEmptyUpFullTask"); task_form.put("order_id", whereJson.getString("order_id")); task_form.put("task_code", whereJson.getString("task_code")); @@ -1061,6 +1063,7 @@ public class OutBillServiceImpl extends ServiceImpl i JSONObject task_form2 = new JSONObject(); task_form2.put("task_type", "DownEmptyUpFullTask"); + task_form2.put("mes_is_manual",whereJson.get("mes_is_manual")); task_form2.put("order_id", whereJson.getString("order_id")); task_form2.put("task_code", whereJson.getString("task_code")); task_form2.put("point_code1", whereJson.getString("point_code2"));