diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java index 7b5b50b7a..fe3de3611 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java @@ -100,7 +100,7 @@ public class PdmBiSubpackagerelationController { * * @param whereJson 查询条件 */ - @PostMapping ("/queryContainerNameBySaleOrder") + @PostMapping("/queryContainerNameBySaleOrder") @SaIgnore @Log("根据订单号查询子卷信息") public ResponseEntity queryContainerNameBySaleOrder(@RequestBody Map whereJson) { @@ -159,13 +159,14 @@ public class PdmBiSubpackagerelationController { } return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/zjInBound") @SaIgnore @Log("子卷装箱查询") //@SaCheckPermission("@el.check(updateEntityList)") public ResponseEntity zjInBound(@RequestBody JSONObject whereJson) { List list = pdmBiSubpackagerelationService.zjInBound(whereJson); - return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @@ -174,10 +175,10 @@ public class PdmBiSubpackagerelationController { @Log("子卷装箱入库") //@SaCheckPermission("@el.check(updateEntityList)") public ResponseEntity zjInBoundConfirm(@RequestBody JSONObject whereJson) { - RedissonUtils.lock(c->{ + RedissonUtils.lock(c -> { pdmBiSubpackagerelationService.zjInBoundConfirm(whereJson); - },"zjInBound",0,this,"装箱入库在操作,稍后再试"); - return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + }, "zjInBound", 0, this, "装箱入库在操作,稍后再试"); + return new ResponseEntity<>(TableDataInfo.build(), HttpStatus.OK); } @PostMapping("/boxReturn") @@ -185,14 +186,13 @@ public class PdmBiSubpackagerelationController { @Log("装箱位木箱回库") //@SaCheckPermission("@el.check(updateEntityList)") public ResponseEntity boxReturn(@RequestBody JSONObject whereJson) { - RedissonUtils.lock(c->{ + RedissonUtils.lock(c -> { pdmBiSubpackagerelationService.boxReturn(whereJson); - },"zjInBound",0,this,"装箱送回在操作,稍后再试"); - return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + }, "zjInBound", 0, this, "装箱送回在操作,稍后再试"); + return new ResponseEntity<>(TableDataInfo.build(), HttpStatus.OK); } - @PostMapping("/transferBoxPackageToMes") @Log("传输子卷包装关系至LMS") //@SaCheckPermission("@el.check(updateEntityList)") @@ -225,7 +225,6 @@ public class PdmBiSubpackagerelationController { } - @PostMapping("/schdule") @Log("定时调度") @SaIgnore @@ -242,22 +241,30 @@ public class PdmBiSubpackagerelationController { @SaIgnore public ResponseEntity ycgzd(@RequestBody JSONObject param) { String pointCode = param.getString("point_code"); - if (StringUtils.isEmpty(pointCode)){ + if (StringUtils.isEmpty(pointCode)) { throw new BadRequestException("人工管制点不能为空"); } - // "ZXQ_135" : "ZXQ_136"; + // "ZXQ_135" : "ZXQ_136"; JSONObject task = new JSONObject(); task.put("point_code1", pointCode); - autoSendVehicleToDjq.getPointCode(task,PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); + autoSendVehicleToDjq.getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/downloadData") @SaIgnore - public void downloadData(Integer day, HttpServletResponse response) { - RedissonUtils.lock(a->{ - pdmBiSubpackagerelationService.downloadData(3,(HttpServletResponse)a); + public void downloadData(Integer day, HttpServletResponse response) { + RedissonUtils.lock(a -> { + pdmBiSubpackagerelationService.downloadData(3, (HttpServletResponse) a); return null; - },"下载任务时间",response); + }, "下载任务时间", response); + } + + @PostMapping("/checkCode") + @Log("三码合一校验") + @SaIgnore + public ResponseEntity checkCode(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdmBiSubpackagerelationService.checkCode(whereJson), HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java index bbcab9764..328020cf5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java @@ -141,6 +141,7 @@ public interface IpdmBiSubpackagerelationService extends IService recordQuery(List pcsn) { - if (CollectionUtils.isEmpty(pcsn)){ + if (CollectionUtils.isEmpty(pcsn)) { return new ArrayList<>(); } return this.baseMapper.recordQuery(pcsn); } + + @Override + public JSONObject checkCode(JSONObject jo) { + //内标 + String nb_code = jo.getString("nb_code"); + //管标 + String gb_code = jo.getString("gb_code"); + //木箱码 + String box_code = jo.getString("box_code"); + //客户标签码 + String customer_code = jo.getString("customer_code"); + + if (!StrUtil.equals(nb_code, gb_code)) { + throw new BadRequestException("内标【" + nb_code + "】和管标【" + gb_code + "】子卷号不一致！"); + } + + if (!StrUtil.equals(box_code, customer_code)) { + throw new BadRequestException("木箱码【" + box_code + "】和客户标签码【" + customer_code + "】箱号不一致！"); + } + + PdmBiSubpackagerelation subDto = this.getOne(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getContainer_name, nb_code)); + if (ObjectUtil.isEmpty(subDto)) { + throw new BadRequestException("子卷号【" + nb_code + "】在LMS系统上为查询到包装关系！"); + } + if (StrUtil.isEmpty(subDto.getPackage_box_sn())) { + throw new BadRequestException("子卷号【" + nb_code + "】在LMS系统上包装关系的木箱号为空！"); + } + if (!StrUtil.equals(box_code, subDto.getPackage_box_sn())) { + throw new BadRequestException("子卷号绑定的木箱码【" + subDto.getPackage_box_sn() + "】和木箱码【" + box_code + "】箱号不一致！"); + } + JSONObject result = new JSONObject(); + result.put("message", "校验通过！"); + return result; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java index 48fe8d512..7a4207ca2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java @@ -55,6 +55,7 @@ public class SsxDjwTask extends AbstractAcsTask { @Override + @Transactional(rollbackFor = Exception.class) public List addTask() { ArrayList resultList = new ArrayList<>(); List taskList = taskService.list(new LambdaUpdateWrapper().eq(SchBaseTask::getHandle_class, THIS_CLASS) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java index 074e2e338..5bb2f3779 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java @@ -16,11 +16,14 @@ import org.nl.b_lms.sch.tasks.first_floor_area.SsxDjwTask; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.manage.TaskStatusEnum; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -33,7 +36,6 @@ import java.util.stream.Collectors; @Slf4j @Component -@RequiredArgsConstructor public class AutoExecuteWaitTask extends Prun{ private final String THIS_CLASS = AutoExecuteWaitTask.class.getName(); @@ -50,10 +52,10 @@ public class AutoExecuteWaitTask extends Prun{ private IbstIvtPackageinfoivtService packageinfoivtService; //自动执行等待的桁架任务 - @Autowired public void run() { try { - this.executeWaitTask(); + AutoExecuteWaitTask bean = SpringContextHolder.getBean(AutoExecuteWaitTask.class); + bean.executeWaitTask(); }catch (Exception ex){ log.error(ex.getMessage()); } @@ -64,6 +66,7 @@ public class AutoExecuteWaitTask extends Prun{ * 放满与取空桁架任务 */ @SneakyThrows + @Transactional public void executeWaitTask() { log.info(THIS_CLASS+"-放满与取空桁架定时任务开始执行扫描。"); RLock lock = redissonClient.getLock(THIS_CLASS); @@ -130,6 +133,10 @@ public class AutoExecuteWaitTask extends Prun{ task.setPoint_code1(kzjPointList.get(0).getPoint_code()); task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode()); taskService.updateById(task); + List test = taskService.list(new LambdaUpdateWrapper().eq(SchBaseTask::getHandle_class, THIS_CLASS) + .eq(SchBaseTask::getTask_status, TaskStatusEnum.START_AND_POINT.getCode()) + .eq(SchBaseTask::getIs_delete, 0) + ); ssxDjwTask.immediateNotifyAcs(null); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java index d3f9cc4e9..ecbcae62a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java @@ -44,6 +44,6 @@ public interface IStIvtIostorinvdisService extends IService { */ void confirmDisIn(String task_id); - List getDisStructSet(String iostorinvId); + List getDisStructSet(String iostorinvId, String iostorinvDtlId); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java index ad34266df..56496ad7b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java @@ -20,13 +20,14 @@ public interface StIvtIostorinvdisMapper extends BaseMapper { /** * 获取全部已分配未下发的分配明细 + * * @param whereJson :{ * iostorinvdtl_id： 明细标识 （自动取消时传） * box_no： 箱号 （自动取消时传） * iostorinv_id： 单据标识 * bill_status： 明细状态 * is_issued： 是否已下发 - * } + * } * @return List 分配明细实体类集合 */ List getDivIosDisAll(JSONObject whereJson); @@ -40,18 +41,15 @@ public interface StIvtIostorinvdisMapper extends BaseMapper { /** * 获取此单据下/此明细下 所有未生成的分配明细 + * * @param whereJson :{ * iostorinvdtl_id： 明细标识 * iostorinv_id： 单据标识 - * } + * } * @return List 分配明细实体类集合 */ List getNotCreateDis(JSONObject whereJson); - @Select("select st_ivt_structattr.sect_id,st_ivt_structattr.block_num,st_ivt_structattr.row_num,st_ivt_structattr.out_order_seq,st_ivt_structattr.struct_code,st_ivt_structattr.placement_type \n" + - "from st_ivt_iostorinvdis \n" + - "left join st_ivt_structattr on st_ivt_iostorinvdis.struct_code = st_ivt_structattr.struct_code\n" + - "where st_ivt_iostorinvdis.work_status = '00' and st_ivt_iostorinvdis.iostorinv_id = #{iostorinvId}") - List getDisStructSet(String iostorinvId); + List getDisStructSet(String iostorinvId,String iostorinvDtlId); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml index 472573f75..7e730c414 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml @@ -128,4 +128,20 @@ + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java index 7facde980..b41638a2a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java @@ -151,8 +151,8 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl getDisStructSet(String iostorinvId) { - List structSet = this.baseMapper.getDisStructSet(iostorinvId); + public List getDisStructSet(String iostorinvId ,String iostorinvDtlId) { + List structSet = this.baseMapper.getDisStructSet(iostorinvId, iostorinvDtlId); return structSet; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index afd2d522f..a9d28eab8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -142,7 +142,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl List permission = new LinkedList<>(); // 查看是否为管理员 permission.add("admin"); - permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("userId"))); + permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("user_id"))); return permission; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index da73620fa..3e1550a48 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -280,11 +280,14 @@ public class CheckOutBillController { @Log("出库单强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) { - iStIvtIostorinvOutService.confirm(whereJson); - } else { - checkOutBillService.confirmOrder(whereJson); - } + String iostorinv_id = whereJson.getString("iostorinv_id"); + RedissonUtils.lock(c -> { + if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) { + iStIvtIostorinvOutService.confirm(whereJson); + } else { + checkOutBillService.confirmOrder(whereJson); + } + }, iostorinv_id, 1, 120, null); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 37d4d6ffe..7da50c08c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -39,6 +39,7 @@ import org.nl.system.service.dept.dao.SysUserDept; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.OutTask; import org.nl.wms.st.inbill.service.CheckOutBillService; @@ -3253,7 +3254,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } } // 1.判断此条分配明细的 ‘仓位’在此主表下的分配明细是否有相同的 ‘仓位’ - List structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id")); + List structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id"),whereJson.getString("iostorinvdtl_id")); //同区同排排序：10302-04-01 //口口回口回口口口1 //口口回回口口口口2 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 98856c850..610490bcb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -264,7 +264,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("销售订单", json.getString("sale_order_name")); mp.put("行号", ""); } - mp.put("出库日期", json.getString("input_time")); + mp.put("出库日期", json.getString("confirm_time")); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品厚度", json.getString("thickness")); mp.put("单位面积", json.getString("mass_per_unit_area")); diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index c0b1acf3d..623261018 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -170,6 +170,7 @@ @click="doOperate(scope.row, 'a')" >完成 - - + +