diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/LcToWmsController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/LcToWmsController.java index eaca218..f8ee39d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/LcToWmsController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/LcToWmsController.java @@ -35,7 +35,14 @@ public class LcToWmsController { @PostMapping("/taskDataQuery") @Log("出入库任务查询") @SaIgnore - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + public ResponseEntity taskDataQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(lcToWmsService.taskDataQuery(whereJson), HttpStatus.OK); } + + @PostMapping("/agvTaskQuery") + @Log("AGV任务数据接口") + @SaIgnore + public ResponseEntity agvTaskQuery(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(lcToWmsService.agvTaskQuery(whereJson), HttpStatus.OK); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/LcToWmsService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/LcToWmsService.java index 9a1594c..b961407 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/LcToWmsService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/LcToWmsService.java @@ -24,4 +24,16 @@ public interface LcToWmsService { * @return LcResponse */ LcResponse taskDataQuery(JSONObject whereJson); + + /** + * AGV任务数据接口 + * @param whereJson { + * task_status: 任务状态（7-未完成，4-执行中，5-已完成） + * start_time: 开始时间 + * end_time: 结束时间 + * task_code: 任务编码 + * } + * @return LcResponse + */ + LcResponse agvTaskQuery(JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/LcToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/LcToWmsServiceImpl.java index 27ad9f2..247ced5 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/LcToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/LcToWmsServiceImpl.java @@ -1,11 +1,28 @@ package org.nl.wms.ext.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; +import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; +import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; +import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; +import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.ext.service.LcToWmsService; import org.nl.wms.ext.service.util.LcResponse; +import org.nl.wms.sch_manage.service.dao.mapper.SchBaseTaskMapper; +import org.nl.wms.warehouse_management.enums.IOSConstant; +import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; +import org.nl.wms.warehouse_management.service.dao.GroupPlate; +import org.nl.wms.warehouse_management.service.dao.IOStorInvDis; +import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 浪潮调用WMS 实现类 @@ -18,8 +35,173 @@ import org.springframework.stereotype.Service; @Slf4j public class LcToWmsServiceImpl implements LcToWmsService { + /** + * 任务服务mapper + */ + @Autowired + private SchBaseTaskMapper schBaseTaskMapper; + + /** + * 物料服务 + */ + @Autowired + private IMdMeMaterialbaseService iMdMeMaterialbaseService; + + /** + * 出入库分配明细服务mapper + */ + @Autowired + private IOStorInvDisMapper ioStorInvDisMapper; + + /** + * 组盘服务 + */ + @Autowired + private IMdPbGroupplateService iMdPbGroupplateService; + + /** + * 供应商服务 + */ + @Autowired + private IMdCsSupplierbaseService iMdCsSupplierbaseService; + + /** + * 载具信息服务 + */ + @Autowired + private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; + @Override public LcResponse taskDataQuery(JSONObject whereJson) { - return null; + // ------- 查询任务 ------- + List jsonTaskList = schBaseTaskMapper.taskDataQueryLc(whereJson); + + for (JSONObject json : jsonTaskList) { + // ------- 物料信息 ------- + JSONObject material_info = new JSONObject(); + // 查询物料 + MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(json.getString("material_id")); + if (ObjectUtil.isNotEmpty(materDao)) { + material_info.put("material_code", materDao.getMaterial_code()); + material_info.put("material_name", materDao.getMaterial_name()); + material_info.put("material_spec", materDao.getMaterial_spec()); + material_info.put("material_model", materDao.getMaterial_model()); + material_info.put("execution_stand", materDao.getExecution_stand()); + } + // 查询分配明细信息 + IOStorInvDis disDao = ioStorInvDisMapper.selectOne( + new QueryWrapper().lambda() + .eq(IOStorInvDis::getTask_id, json.getString("task_id")) + ); + material_info.put("pcsn", disDao.getPcsn()); + material_info.put("qty", disDao.getPlan_qty()); + material_info.put("qty_unit_name", disDao.getQty_unit_name()); + + // 查询组盘信息 + GroupPlate lateDao = iMdPbGroupplateService.getOne( + new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, disDao.getStoragevehicle_code()) + .eq(GroupPlate::getPcsn, disDao.getPcsn()) + .eq(GroupPlate::getMaterial_id, disDao.getMaterial_id()) + ); + if (ObjectUtil.isNotEmpty(lateDao)) { + // 查询供应商 + MdCsSupplierbase suppDao = iMdCsSupplierbaseService.getOne( + new QueryWrapper().lambda() + .eq(MdCsSupplierbase::getSupp_code, lateDao.getSupp_code()) + ); + material_info.put("supp_code", suppDao.getSupp_code()); + material_info.put("supp_name", suppDao.getSupp_name()); + material_info.put("quality_time", lateDao.getQuality_time()); + material_info.put("produce_time", lateDao.getProduce_time()); + material_info.put("status", lateDao.getQuality_type()); + } + json.put("material_info", material_info); + } + return LcResponse.requestParamOk(jsonTaskList); + } + + @Override + public LcResponse agvTaskQuery(JSONObject whereJson) { + // ------- 查询任务 ------- + List jsonTaskList = schBaseTaskMapper.agvTaskQueryLc(whereJson); + + for (JSONObject json : jsonTaskList) { + // ------- 物料信息 ------- + JSONObject material_info = new JSONObject(); + // 查询物料 + MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(json.getString("material_id")); + if (ObjectUtil.isNotEmpty(materDao)) { + material_info.put("material_code", materDao.getMaterial_code()); + material_info.put("material_name", materDao.getMaterial_name()); + material_info.put("material_spec", materDao.getMaterial_spec()); + material_info.put("material_model", materDao.getMaterial_model()); + material_info.put("execution_stand", materDao.getExecution_stand()); + } + // 查询分配明细信息 + IOStorInvDis disDao = ioStorInvDisMapper.selectOne( + new QueryWrapper().lambda() + .eq(IOStorInvDis::getTask_id, json.getString("task_id")) + ); + + if (ObjectUtil.isNotEmpty(disDao)) { + material_info.put("pcsn", disDao.getPcsn()); + material_info.put("qty", disDao.getPlan_qty()); + material_info.put("qty_unit_name", disDao.getQty_unit_name()); + // 查询组盘信息 + GroupPlate lateDao = iMdPbGroupplateService.getOne( + new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, disDao.getStoragevehicle_code()) + .eq(GroupPlate::getPcsn, disDao.getPcsn()) + .eq(GroupPlate::getMaterial_id, disDao.getMaterial_id()) + ); + if (ObjectUtil.isNotEmpty(lateDao)) { + // 查询供应商 + MdCsSupplierbase suppDao = iMdCsSupplierbaseService.getOne( + new QueryWrapper().lambda() + .eq(MdCsSupplierbase::getSupp_code, lateDao.getSupp_code()) + ); + material_info.put("supp_code", suppDao.getSupp_code()); + material_info.put("supp_name", suppDao.getSupp_name()); + material_info.put("quality_time", lateDao.getQuality_time()); + material_info.put("produce_time", lateDao.getProduce_time()); + material_info.put("status", lateDao.getQuality_type()); + } + } + json.put("bear_status", bearStatus(json.getString("bear_box"))); + json.put("material_info", material_info); + } + return LcResponse.requestParamOk(jsonTaskList); + } + + /** + * 根据载具编码 判断承载状态 + * @param bear_box 载具编码 + * @return String + */ + private String bearStatus(String bear_box) { + String bear_status = IOSConstant.FOUR; + if (ObjectUtil.isNotEmpty(bear_box)) { + // 查询组盘信息：如果有组盘信息则是 有货 + List vehicleList = iMdPbGroupplateService.list( + new QueryWrapper().lambda() + .eq(GroupPlate::getStoragevehicle_code, bear_box) + ); + if (ObjectUtil.isNotEmpty(vehicleList)) { + bear_status = IOSConstant.TWO; + } + + // 判断是否有载具 + MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, bear_box) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + bear_status = IOSConstant.ONE; + } else { + bear_status = IOSConstant.THREE; + } + } + return bear_status; } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java index 27028e6..ad50dc6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java @@ -64,4 +64,27 @@ public interface SchBaseTaskMapper extends BaseMapper { */ IPage getPointtoPoint(Page page, @Param("param") Map whereJson); + /** + * 浪潮--出入库任务查询 + * @param whereJson { + * task_status: 任务状态（7-未完成，4-执行中，5-已完成） + * start_time: 开始时间 + * end_time: 结束时间 + * task_code: 任务编码 + * } + * @return List + */ + List taskDataQueryLc(@Param("param") JSONObject whereJson); + + /** + * 浪潮--AGV任务数据接口 + * @param whereJson { + * task_status: 任务状态（7-未完成，4-执行中，5-已完成） + * start_time: 开始时间 + * end_time: 结束时间 + * task_code: 任务编码 + * } + * @return List + */ + List agvTaskQueryLc(@Param("param") JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml index daad1c3..03247df 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml @@ -172,4 +172,85 @@ ORDER BY t.create_time DESC + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index a3ca54d..45ee891 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -170,6 +170,7 @@ public class BackInTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); rawAssistIStorService.taskFinish(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java index 0005d64..54a157d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java @@ -205,6 +205,7 @@ public class BackOutTask extends AbstractTask { ); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java index 5070463..b6536f8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java @@ -191,6 +191,7 @@ public class CheckBackMoveTask extends AbstractTask { // 完成任务 this.taskConfirm(taskObj.getTask_code()); // 更新任务状态 + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java index 77f045d..a93fc71 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java @@ -173,6 +173,7 @@ public class CheckMoveTask extends AbstractTask { // 完成任务 this.taskConfirm(taskObj.getTask_code()); // 更新任务状态 + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java index edcccaf..7d789dd 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxInTask.java @@ -196,6 +196,7 @@ public class CombinedBoxInTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); rawAssistIStorService.taskFinish(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java index 3aca906..10bb7ba 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CombinedBoxMoveTask.java @@ -190,6 +190,7 @@ public class CombinedBoxMoveTask extends AbstractTask { // 完成任务 this.taskConfirm(taskObj.getTask_code()); // 更新任务状态 + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java index f4d6e45..85c5f3f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java @@ -181,6 +181,7 @@ public class DetainInTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); rawAssistIStorService.taskFinish(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpOutMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpOutMoveTask.java index 7e56bb6..d8273a2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpOutMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpOutMoveTask.java @@ -186,6 +186,7 @@ public class EmpOutMoveTask extends AbstractTask { // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java index 9c43bd8..1335f47 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java @@ -212,6 +212,7 @@ public class EmpVehicleInTask extends AbstractTask { .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) ); // 更新任务 + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java index 5b38f3f..b26a598 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java @@ -193,6 +193,7 @@ public class EmpVehicleOutTask extends AbstractTask { ); // 更新任务 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java index 648ac44..7d9a1d0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java @@ -179,6 +179,7 @@ public class HandInTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); rawAssistIStorService.taskFinish(taskObj); // 更新起点 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java index a1b6735..536383c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java @@ -189,6 +189,7 @@ public class HandOutTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); this.taskConfirm(taskObj.getTask_code()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java index cfb294c..f14046d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HotOutTask.java @@ -197,6 +197,7 @@ public class HotOutTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); this.taskConfirm(taskObj.getTask_code()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideDtlMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideDtlMoveTask.java index cf1697d..3ea1a84 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideDtlMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideDtlMoveTask.java @@ -165,6 +165,7 @@ public class InsideDtlMoveTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java index 8ccab81..081a5c0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java @@ -176,6 +176,7 @@ public class InsideMoveTask extends AbstractTask { iStIvtMoveinvService.confirmTask(dtlDao); // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IosOutMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IosOutMoveTask.java index 311c025..de0e2cc 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IosOutMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IosOutMoveTask.java @@ -203,6 +203,7 @@ public class IosOutMoveTask extends AbstractTask { // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/KwzdInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/KwzdInTask.java index a091f53..a8e0121 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/KwzdInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/KwzdInTask.java @@ -173,6 +173,7 @@ public class KwzdInTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); // 更新起点 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveOutMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveOutMoveTask.java index 5e98a69..491def6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveOutMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveOutMoveTask.java @@ -210,6 +210,7 @@ public class MoveOutMoveTask extends AbstractTask { // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index dbd80ad..c72eb54 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -227,6 +227,7 @@ public class PdaPointTask extends AbstractTask { ); // 更新任务 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java index 053035d..e9a9c29 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxInTask.java @@ -203,6 +203,7 @@ public class PieceBoxInTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); // 更新起点 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java index 8f3951f..42792fc 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PieceBoxMoveTask.java @@ -194,6 +194,7 @@ public class PieceBoxMoveTask extends AbstractTask { this.taskConfirm(taskObj.getTask_code()); // 更新任务状态 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java index 37b89ca..17d315b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/QualityOutTask.java @@ -180,6 +180,7 @@ public class QualityOutTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); this.taskConfirm(taskObj.getTask_code()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java index caac587..85542fa 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java @@ -197,6 +197,7 @@ public class ReceiveOutTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); this.taskConfirm(taskObj.getTask_code()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java index 637f6ec..d7ccc81 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java @@ -204,6 +204,7 @@ public class SelectBackInTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); this.taskConfirm(taskObj.getTask_code()); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ThreePointTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ThreePointTask.java index 776c359..9a0ca13 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ThreePointTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ThreePointTask.java @@ -199,6 +199,7 @@ public class ThreePointTask extends AbstractTask { ); // 更新任务 taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskService.updateById(taskObj); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java index 2502d8c..5231ad7 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java @@ -37,6 +37,11 @@ public class IOSConstant { */ public final static String THREE = "3"; + /** + * 数字4 + */ + public final static String FOUR = "4"; + /** * 出入库 入库 */