From 16a2a75a40bef55c25cb2571550d3f4b432860b0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 10 Feb 2026 15:18:48 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MdPbStoragevehicleextMapper.xml | 4 +- .../nl/wms/ext/service/util/AcsResponse.java | 2 + .../service/impl/PdaCommonServiceImpl.java | 3 +- .../impl/PdaProductionServiceImpl.java | 67 ++++++++++++---- .../java/org/nl/wms/pda/util/PDAEnum.java | 5 +- .../service/util/tasks/CallMaterialTask.java | 2 +- .../service/util/tasks/CenterInTask.java | 5 +- .../service/util/tasks/CoatingUpTask.java | 9 ++- .../util/tasks/EmpStackPlatesTask.java | 4 +- .../util/tasks/EmptyDiskConveyTask.java | 4 + .../util/tasks/EmptyDiskEnterTask.java | 4 + .../util/tasks/IntermediateOutTask.java | 76 ++++++++++++++++--- .../service/util/tasks/MaterialBackTask.java | 7 +- .../service/util/tasks/PalletOutTask.java | 2 +- .../util/tasks/PalletizingAddTask.java | 4 + .../util/tasks/PalletizingDownTask.java | 4 + .../util/tasks/PreProcessingInTask.java | 22 +++++- .../service/util/tasks/ProduceInTask.java | 5 +- .../service/util/tasks/RawInTask.java | 5 +- .../service/util/tasks/TabletingInTask.java | 54 ++++++++++--- .../service/util/tasks/WrappingDownTask.java | 4 + .../service/util/tasks/WrappingUpTask.java | 6 +- .../dao/mapper/MdPbGroupplateMapper.xml | 2 +- .../views/wms/statement/structivt/index.vue | 8 +- 24 files changed, 249 insertions(+), 59 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index a73eacd..f4354a1 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -127,11 +127,13 @@ mater.material_id, mater.material_code, mater.material_name, - mater.material_spec + mater.material_spec, + class.class_name FROM md_pb_storagevehicleext ext INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id + LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id 1 = 1 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java index a3718e5..b6a1a09 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java @@ -19,6 +19,8 @@ public class AcsResponse extends BaseResponse { private JSONObject resultData = new JSONObject(); + private JSONObject parameters = new JSONObject(); + /** * 请求失败 * @param message 错误信息 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index a7e6a58..6a9e716 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -25,6 +25,7 @@ import org.nl.wms.pda.general_management.service.PdaCommonService; import org.nl.wms.pda.general_management.service.dto.AssemblyBagParam; import org.nl.wms.pda.general_management.service.dto.AssemblyBucketParam; import org.nl.wms.pda.general_management.service.dto.AssemblyPalletParam; +import org.nl.wms.pda.util.PDAEnum; import org.nl.wms.pda.util.PdaResponse; import org.nl.wms.pda.util.SectMaterialCheck; import org.nl.wms.sch_manage.enums.TaskStatus; @@ -157,7 +158,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { @Override public PdaResponse getSectList(JSONObject param) { - return PdaResponse.requestParamOk(IOSEnum.SECT_CODE.getDict()); + return PdaResponse.requestParamOk(PDAEnum.SECT_CODE.getDict()); } @Override diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaProductionServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaProductionServiceImpl.java index 364ac09..558a76b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaProductionServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaProductionServiceImpl.java @@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; @@ -41,6 +43,7 @@ import org.nl.wms.sch_manage.service.util.AbstractTask; import org.nl.wms.sch_manage.service.util.TaskFactory; import org.nl.wms.sch_manage.service.util.tasks.PalletOutTask; import org.nl.wms.sch_manage.service.util.tasks.PreProcessingInTask; +import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; import org.nl.wms.warehouse_management.service.IOutBillService; @@ -428,7 +431,7 @@ public class PdaProductionServiceImpl implements PdaProductionService { @Override public PdaResponse takeFinish(JSONObject param) { - // todo: 下发允许AGV通过 + // todo: 下发允许AGV取货完成可以离开 return PdaResponse.requestOk(); } @@ -453,6 +456,7 @@ public class PdaProductionServiceImpl implements PdaProductionService { */ @SneakyThrows @Override + @Transactional public PdaResponse productionLine(JSONObject param) { // point_code, vehicle_code， is_wait log.info("手持下料：{}", param); @@ -717,18 +721,33 @@ public class PdaProductionServiceImpl implements PdaProductionService { try { if (tryLock) { assertNotBlankJson(param, "当前点位不能为空！", "row", "current_point", "vehicle_code"); - JSONObject row = param.getJSONObject("row"); String currentPoint = param.getString("current_point"); String vehicleCode = param.getString("vehicle_code"); // ACS 获取的重量 String total = param.getString("weight"); - String taskId = row.getString("task_id"); - if (ObjectUtil.isNotEmpty(taskId)) { + // 查询是否有此终点、载具号未完成的任务 + SchBaseTask taskDao = taskService.getOne( + new QueryWrapper().lambda() + .eq(SchBaseTask::getPoint_code2, currentPoint) + .eq(SchBaseTask::getVehicle_code, vehicleCode) + .eq(SchBaseTask::getIs_delete, IOSConstant.ZERO) + .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) + ); + if (ObjectUtil.isNotEmpty(taskDao)) { // 有任务直接任务完成 - SchBaseTask baseTask = taskService.getById(taskId); - AbstractTask task = taskFactory.getTask(baseTask.getConfig_code()); - task.updateTaskStatus(baseTask.getTask_code(), TaskStatus.FINISHED); - return PdaResponse.requestOk(); + taskDao.setTask_status(TaskStatus.FINISHED.getCode()); + taskService.updateById(taskDao); + // 更新起点 + pointService.update( + new UpdateWrapper().lambda() + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) + .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) + .set(SchBasePoint::getUpdate_time, DateUtil.now()) + .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) + .set(SchBasePoint::getIng_task_code, "") + .eq(SchBasePoint::getPoint_code, taskDao.getPoint_code1()) + ); } SchBasePoint startPoint = pointService.getById(currentPoint); // 没任务，证明是人工放上去录进去的 @@ -783,14 +802,32 @@ public class PdaProductionServiceImpl implements PdaProductionService { if (result.isExceeded()) { throw new BadRequestException(result.toString()); } - // 判断是否有任务 - String taskId = row.getString("task_id"); - if (ObjectUtil.isNotEmpty(taskId)) { + // 查询是否有此终点、载具号未完成的任务 + SchBaseTask taskDao = taskService.getOne( + new QueryWrapper().lambda() + .eq(SchBaseTask::getPoint_code2, currentPoint) + .eq(SchBaseTask::getVehicle_code, vehicleCode) + .eq(SchBaseTask::getIs_delete, IOSConstant.ZERO) + .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) + ); + + if (ObjectUtil.isNotEmpty(taskDao)) { // 有任务直接任务完成 - SchBaseTask baseTask = taskService.getById(taskId); - AbstractTask task = taskFactory.getTask(baseTask.getConfig_code()); - task.updateTaskStatus(baseTask.getTask_code(), TaskStatus.FINISHED); - return PdaResponse.requestOk(); + taskDao.setTask_status(TaskStatus.FINISHED.getCode()); + taskService.updateById(taskDao); + // 更新起点 + pointService.update( + new UpdateWrapper().lambda() + .set(SchBasePoint::getVehicle_code, "") + .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) + .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) + .set(SchBasePoint::getUpdate_time, DateUtil.now()) + .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) + .set(SchBasePoint::getIng_task_code, "") + .eq(SchBasePoint::getPoint_code, taskDao.getPoint_code1()) + ); + // 完成单据 + outBillService.taskFinish(taskDao); } if (ObjectUtil.isEmpty(row.getString("station"))) { throw new BadRequestException("请设置产线目标站！"); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java index c88caed..4ee35ef 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java @@ -26,7 +26,10 @@ public enum PDAEnum { )), // 库区编码 - SECT_CODE(MapOf.of("合格区", "HG01", "待检区", "DJ01", "不合格区", "BHG01")), + SECT_CODE(MapOf.of("包材存放室(1)主存区", "NBC01", "批料待发室主存区", "PZC01", + "中间站（2）主存区", "ZZC01", "物料存放室辅料区", "WFL01", "物料存放室原料区", "WYL01", + "物料存放室原料待发区", "WYD01" + )), // 组盘品质类型 QUALITY_TYPE(MapOf.of("待检", "1", "合格", "2", "不合格", "3")), diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java index 03d199f..64795a8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java @@ -91,7 +91,7 @@ public class CallMaterialTask extends AbstractTask { taskService.save(task); // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java index 9ffb0f3..4cc0044 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java @@ -73,7 +73,7 @@ public class CenterInTask extends AbstractTask { } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -99,6 +99,7 @@ public class CenterInTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -162,6 +163,7 @@ public class CenterInTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -171,6 +173,7 @@ public class CenterInTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java index 2576619..2d6d42a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java @@ -25,6 +25,7 @@ import javax.annotation.Resource; /** * 包衣/内包装上料任务 + * * @author: lyd * @date: 2026/1/9 */ @@ -62,7 +63,7 @@ public class CoatingUpTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -88,6 +89,7 @@ public class CoatingUpTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -112,14 +114,13 @@ public class CoatingUpTask extends AbstractTask { } public void cancelTask(SchBaseTask taskObj) { - // 更新任务状态 taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setRemark("已取消"); taskService.updateById(taskObj); } - @Transactional(rollbackFor = Exception.class) + @Transactional public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); @@ -134,6 +135,7 @@ public class CoatingUpTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -143,6 +145,7 @@ public class CoatingUpTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java index e553c91..52193d7 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java @@ -148,7 +148,7 @@ public class EmpStackPlatesTask extends AbstractTask { } - @Transactional(rollbackFor = Exception.class) + @Transactional public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); @@ -187,7 +187,7 @@ public class EmpStackPlatesTask extends AbstractTask { } } - @Transactional(rollbackFor = Exception.class) + @Transactional public void cancelTask(SchBaseTask taskObj) { // 取消任务 taskService.update(new LambdaUpdateWrapper() diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java index 195748c..7f90a45 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java @@ -89,6 +89,7 @@ public class EmptyDiskConveyTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -112,6 +113,7 @@ public class EmptyDiskConveyTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -161,6 +163,7 @@ public class EmptyDiskConveyTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -170,6 +173,7 @@ public class EmptyDiskConveyTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java index 7a65312..c931f45 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java @@ -97,6 +97,7 @@ public class EmptyDiskEnterTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -120,6 +121,7 @@ public class EmptyDiskEnterTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -169,6 +171,7 @@ public class EmptyDiskEnterTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -178,6 +181,7 @@ public class EmptyDiskEnterTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java index e0eec62..449649e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java @@ -1,20 +1,26 @@ package org.nl.wms.sch_manage.service.util.tasks; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; +import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.dao.Param; import org.nl.wms.basedata_manage.enums.BaseDataEnum; +import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; +import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; +import org.nl.wms.ext.service.WmsToAcsService; +import org.nl.wms.ext.service.util.AcsResponse; +import org.nl.wms.pda.util.ThresholdChecker; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; -import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.util.ACSTaskTypeEnum; import org.nl.wms.sch_manage.service.util.AbstractTask; @@ -23,7 +29,6 @@ import org.nl.wms.sch_manage.service.util.TaskFactory; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IOutBillService; -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.GroupPlateMapper; import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper; @@ -32,9 +37,11 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; /** * 中间出库 + * * @author: lyd * @date: 2026/1/9 */ @@ -72,6 +79,24 @@ public class IntermediateOutTask extends AbstractTask { @Resource private GroupPlateMapper groupPlateMapper; + /** + * WMS调用ACS服务 + */ + @Resource + private WmsToAcsService wmsToAcsService; + + /** + * 桶记录服务 + */ + @Resource + private IMdPdGroupbucketService iMdPdGroupbucketService; + + /** + * 系统参数服务 + */ + @Resource + private ISysParamService paramService; + @Override public String create(JSONObject json) { SchBaseTask task = new SchBaseTask(); @@ -97,7 +122,7 @@ public class IntermediateOutTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -169,17 +194,50 @@ public class IntermediateOutTask extends AbstractTask { this.cancelTask(taskObj); } - @Transactional(rollbackFor = Exception.class) + @Transactional public void finishTask(SchBaseTask taskObj) { - // todo: 获取重量判断与记录的重量是否一样（判断上下幅度阈值，超过则不继续） + try { + // 获取入站时的桶 + MdPdGroupbucket buckDao = iMdPdGroupbucketService.getOne( + new QueryWrapper().lambda() + .eq(MdPdGroupbucket::getBucket_code, taskObj.getVehicle_code()) + ); + // 获取称重重量 + JSONObject jsonParam = new JSONObject(); + jsonParam.put("device_code", taskObj.getPoint_code2()); + jsonParam.put("bucket_code", taskObj.getVehicle_code()); + AcsResponse weighAcs = wmsToAcsService.getWeighAcs(jsonParam); + if (weighAcs.getStatus() != 200) { + throw new BadRequestException("获取重量失败:" + weighAcs.getMessage()); + } + JSONObject data = weighAcs.getParameters(); + // 毛重 + BigDecimal weigh = NumberUtil.round(data.getString("weigh"), 2); + // 净重 + BigDecimal qty = NumberUtil.sub(weigh, buckDao.getBucket_weight()); + // 获取系统参数 + Param threshold = paramService.findByCode("weighing_threshold"); + // 对比与组盘的重量是否大于阈值 + ThresholdChecker.ThresholdCheckResult result = ThresholdChecker.checkThresholdWithDetails( + qty, + buckDao.getQty(), + threshold.getValue() + ); + if (result.isExceeded()) { + throw new BadRequestException(result.toString()); + } + } catch (Exception e) { + taskObj.setRemark(e.getMessage()); + taskService.updateById(taskObj); + return; + } + // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); - if (true) { - return; - } + // 创建上料任务 JSONObject request = JSONObject.parseObject(taskObj.getRequest_param()); // "ext":{"iostorinv_id":"2009532623130595328","point_code":"ZJZCZ01","target":"YPDJW01"} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java index 8d1471a..193b5f9 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java @@ -75,7 +75,7 @@ public class MaterialBackTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -101,6 +101,7 @@ public class MaterialBackTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -124,7 +125,7 @@ public class MaterialBackTask extends AbstractTask { } } - @Transactional(rollbackFor = Exception.class) + @Transactional public void cancelTask(SchBaseTask taskObj) { // 取消任务 taskService.update(new LambdaUpdateWrapper() @@ -167,6 +168,7 @@ public class MaterialBackTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -176,6 +178,7 @@ public class MaterialBackTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java index 6442aa8..1d15146 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java @@ -107,7 +107,7 @@ public class PalletOutTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java index c460c7d..6ef7648 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java @@ -88,6 +88,7 @@ public class PalletizingAddTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -111,6 +112,7 @@ public class PalletizingAddTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -137,6 +139,7 @@ public class PalletizingAddTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -146,6 +149,7 @@ public class PalletizingAddTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java index 2f2b27c..567dc72 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java @@ -96,6 +96,7 @@ public class PalletizingDownTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -119,6 +120,7 @@ public class PalletizingDownTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -160,6 +162,7 @@ public class PalletizingDownTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -169,6 +172,7 @@ public class PalletizingDownTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java index 9341285..ab8d744 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java @@ -22,10 +22,14 @@ import org.nl.wms.sch_manage.service.util.AcsTaskDto; import org.nl.wms.sch_manage.service.util.TaskType; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; +import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; import org.nl.wms.warehouse_management.service.IRawAssistIStorService; +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.Component; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -42,6 +46,8 @@ public class PreProcessingInTask extends AbstractTask { private ISchBaseTaskService taskService; @Resource private ISchBasePointService pointService; + @Resource + private IMdPbGroupplateService iMdPbGroupplateService; @Override public String create(JSONObject json) { @@ -73,7 +79,7 @@ public class PreProcessingInTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -99,6 +105,7 @@ public class PreProcessingInTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -122,6 +129,7 @@ public class PreProcessingInTask extends AbstractTask { } } + @Transactional private void cancelTask(SchBaseTask taskObj) { // 取消任务 taskService.update(new LambdaUpdateWrapper() @@ -132,6 +140,7 @@ public class PreProcessingInTask extends AbstractTask { ); } + @Transactional private void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); @@ -145,7 +154,7 @@ public class PreProcessingInTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) .set(SchBasePoint::getIng_task_code, "") ); - // 更新起点 + // 更新终点 pointService.update( new UpdateWrapper().lambda() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) @@ -153,9 +162,17 @@ public class PreProcessingInTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) .set(SchBasePoint::getIng_task_code, "") ); + // 更新组盘信息 + iMdPbGroupplateService.update( + new UpdateWrapper().lambda() + .set(GroupPlate::getStatus, IOSConstant.UPDATE_IVT_TYPE_SUB_FROZEN_ADD_CANUSE) + .eq(GroupPlate::getVehicle_code, taskObj.getVehicle_code()) + ); + } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -165,6 +182,7 @@ public class PreProcessingInTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java index 17633b6..be45244 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java @@ -70,7 +70,7 @@ public class ProduceInTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -96,6 +96,7 @@ public class ProduceInTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -161,6 +162,7 @@ public class ProduceInTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -170,6 +172,7 @@ public class ProduceInTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java index a7e1a01..4e8b99e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java @@ -76,7 +76,7 @@ public class RawInTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -102,6 +102,7 @@ public class RawInTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -168,6 +169,7 @@ public class RawInTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -177,6 +179,7 @@ public class RawInTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java index 43954cd..a26f422 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java @@ -1,18 +1,19 @@ package org.nl.wms.sch_manage.service.util.tasks; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; -import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; import org.nl.wms.basedata_manage.service.ISectattrService; import org.nl.wms.basedata_manage.service.dao.Sectattr; +import org.nl.wms.ext.service.WmsToAcsService; +import org.nl.wms.ext.service.util.AcsResponse; import org.nl.wms.pda.general_management.service.PdaBuildParamService; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.enums.TaskStatus; @@ -27,7 +28,6 @@ import org.nl.wms.sch_manage.service.util.TaskType; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IRawAssistIStorService; -import org.nl.wms.warehouse_management.service.dao.IOStorInvDis; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +37,7 @@ import java.util.Map; /** * 压片/包衣入库 + * * @Author: lyd * @Date: 2025/12/4 */ @@ -58,6 +59,15 @@ public class TabletingInTask extends AbstractTask { private PdaBuildParamService defaultPdaBuildParam; @Resource private IRawAssistIStorService rawAssistIStorService; + @Resource + private WmsToAcsService wmsToAcsService; + + /** + * 桶记录服务 + */ + @Resource + private IMdPdGroupbucketService iMdPdGroupbucketService; + @Override public String create(JSONObject json) { //point_code, vehicle_code @@ -96,7 +106,7 @@ public class TabletingInTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -122,6 +132,7 @@ public class TabletingInTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -145,6 +156,7 @@ public class TabletingInTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -153,8 +165,30 @@ public class TabletingInTask extends AbstractTask { taskService.updateById(taskObj); } - @Transactional(rollbackFor = Exception.class) + @Transactional public void finishTask(SchBaseTask taskObj) { + String weigh; + try { + // 获取称重重量 + JSONObject jsonParam = new JSONObject(); + jsonParam.put("device_code", taskObj.getPoint_code2()); + jsonParam.put("bucket_code", taskObj.getVehicle_code()); + AcsResponse weighAcs = wmsToAcsService.getWeighAcs(jsonParam); + if (weighAcs.getStatus() != 200) { + throw new BadRequestException("获取重量失败:" + weighAcs.getMessage()); + } + JSONObject data = weighAcs.getParameters(); + if (ObjectUtil.isEmpty(data.getString("weigh")) || data.getDoubleValue("weigh") == 0) { + throw new BadRequestException("获取重量失败，重量为0或者为空!"); + } + // 毛重 + weigh = NumberUtil.round(data.getString("weigh"), 2).toString(); + } catch (Exception e) { + taskObj.setRemark(e.getMessage()); + taskService.updateById(taskObj); + return; + } + // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); @@ -174,11 +208,9 @@ public class TabletingInTask extends AbstractTask { if (ObjectUtil.isEmpty(startPoint.getIn_sect())) { throw new BadRequestException("入库库区设置不能为空！"); } - // todo: 获取重量 - if (true) { - return; - } - groupbucketService.upDateWeight("26.8", taskObj.getVehicle_code()); + + // 减去称重重量 + groupbucketService.upDateWeight(weigh, taskObj.getVehicle_code()); JSONObject param = new JSONObject(); // 创建入库任务 List infos = groupbucketService.getBucketInfoByBucket(taskObj.getVehicle_code()); @@ -197,6 +229,7 @@ public class TabletingInTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -206,6 +239,7 @@ public class TabletingInTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java index e602504..75852fb 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java @@ -102,6 +102,7 @@ public class WrappingDownTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -125,6 +126,7 @@ public class WrappingDownTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 taskObj.setTask_status(TaskStatus.CANCELED.getCode()); @@ -162,6 +164,7 @@ public class WrappingDownTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -171,6 +174,7 @@ public class WrappingDownTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java index 1d33368..b66a4d2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java @@ -78,7 +78,7 @@ public class WrappingUpTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -104,6 +104,7 @@ public class WrappingUpTask extends AbstractTask { } @Override + @Transactional protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -127,6 +128,7 @@ public class WrappingUpTask extends AbstractTask { } } + @Transactional public void cancelTask(SchBaseTask taskObj) { // 更新任务状态 @@ -164,6 +166,7 @@ public class WrappingUpTask extends AbstractTask { } @Override + @Transactional public void forceFinish(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { @@ -173,6 +176,7 @@ public class WrappingUpTask extends AbstractTask { } @Override + @Transactional public void cancel(String task_code) { SchBaseTask taskObj = taskService.getByCode(task_code); if (ObjectUtil.isEmpty(taskObj)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index 5c1c1c1..1970e9d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -102,7 +102,7 @@ FROM md_pb_groupplate late INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id - INNER JOIN md_cs_supplierbase supp ON supp.supp_code = late.supp_code + LEFT JOIN md_cs_supplierbase supp ON supp.supp_code = late.supp_code LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id late.status = '1' diff --git a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue index 7fd5ce7..5846bfc 100644 --- a/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue +++ b/wms/nladmin-ui/src/views/wms/statement/structivt/index.vue @@ -84,13 +84,9 @@ - + - - - +