rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -136,7 +136,7 @@ @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") @ApiOperation("获取订单物料明细") @PostMapping("/asnOrderItem/trackCode") public R getItemByTrackCode(@RequestBody Map<String, Object> params) { public R getItemByTrackCode(@RequestBody Map<String, String> params) { if (Objects.isNull(params)) { throw new CoolException("参数不能为空！！"); } rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -39,7 +39,7 @@ List<Fields> getDynamicFields(); R getDeltByCode(Map<String, Object> params); R getDeltByCode(Map<String, String> params); WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
@@ -536,29 +536,30 @@ * @time 2025/4/7 16:58 */ @Override public R getDeltByCode(Map<String, Object> params) { Object code = params.get("code"); Object matnrCode = params.get("matnrCode"); Object asnCode = params.get("asnCode"); Object crushNo = params.get("fieldsIndex"); Object batch = params.get("batch"); public R getDeltByCode(Map<String, String> params) { String code = params.get("code"); String matnrCode = params.get("matnrCode"); String asnCode = params.get("asnCode"); String crushNo = params.get("fieldsIndex"); String batch = params.get("batch"); // String barcode = params.get("barcode"); if (Objects.isNull(crushNo)) { throw new CoolException("票号不能为空！！"); } if (Objects.isNull(code)) { throw new CoolException("容器号不能为空！！"); } BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, code.toString())); if (Objects.isNull(container)) { throw new CoolException("容器不存在！！"); } if (!Objects.isNull(params.get("isHalf")) && !params.get("isHalf").equals("0")) { container.setIsHalf(1); if (!basContainerService.updateById(container)) { throw new CoolException("容器状态修改失败！！"); } } // if (Objects.isNull(code)) { // throw new CoolException("容器号不能为空！！"); // } // BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, barcode)); // if (Objects.isNull(container)) { // throw new CoolException("容器不存在！！"); // } // if (!Objects.isNull(params.get("isHalf")) && !params.get("isHalf").equals("0")) { // container.setIsHalf(1); // if (!basContainerService.updateById(container)) { // throw new CoolException("容器状态修改失败！！"); // } // } String fieldIndex = null; if (!Objects.isNull(crushNo)) { rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -485,14 +485,11 @@ @Override public void reportOrderItem(WkOrderItem orderItem) { ReportParams params = new ReportParams(); WkOrder order = asnOrderService.getById(orderItem.getOrderId()); if (Objects.isNull(order)) { throw new RuntimeException("单据不存在或已完成！！"); } List<ReportDataParam> reportData = new ArrayList<>(); ReportDataParam param = new ReportDataParam(); User user = userService.getById(orderItem.getUpdateBy()); String nickName = null; @@ -541,7 +538,7 @@ } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) { //调拔入库单 params.setOrderType("Mv_Instock").setAction("Update"); param.setInQty(orderItem.getQty()); } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) { //生产入库单 // params.setOrderType("WO_Outstock").setAction("Update"); rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -598,8 +598,34 @@ /**入库单明细上报*/ reportMsgService.reportOrderItem(wkOrderItem); } } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) { } else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) { /**判断单据是否完成**/ Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet()); List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>() .in(WaveOrderRela::getWaveId, longSet)); if (Cools.isEmpty(waveOrderRelas)) { throw new CoolException("波次对应关联单未找到"); } Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet()); List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds); if (wkOrders.isEmpty()) { throw new CoolException("单据不存在！！"); } wkOrders.forEach(order -> { //检查单据是否完成 if (order.getAnfme().compareTo(order.getQty()) == 0) { order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val); // if (order.getType().equals(OrderType.ORDER_IN)) { // order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val); // } else { // order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val); // } if (!asnOrderService.updateById(order)) { throw new CoolException("出库单更新状态失败"); } } }); //出库单上报RCS修改库位状态 try { reportStationStatus(task); @@ -607,32 +633,6 @@ throw new CoolException(e.getMessage()); } } /**判断单据是否完成**/ Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet()); List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>() .in(WaveOrderRela::getWaveId, longSet)); if (Cools.isEmpty(waveOrderRelas)) { throw new CoolException("波次对应关联单未找到"); } Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet()); List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds); if (wkOrders.isEmpty()) { throw new CoolException("单据不存在！！"); } wkOrders.forEach(order -> { //检查单据是否完成 if (order.getAnfme().compareTo(order.getQty()) == 0) { if (order.getType().equals(OrderType.ORDER_IN)) { order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val); } else { order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val); } if (!asnOrderService.updateById(order)) { throw new CoolException("出库单更新状态失败"); } } }); List<TaskItemLog> itemLogs = new ArrayList<>(); for (TaskItem item : taskItems) { rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -1064,22 +1064,22 @@ throw new CoolException("目标库位不存在！！"); } // List<LocItemWorking> workings = new ArrayList<>(); // List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId())); // items.forEach(taskItem -> { // if (taskItem.getAnfme() > 0) { // LocItemWorking itemWorking = new LocItemWorking(); // BeanUtils.copyProperties(taskItem, itemWorking); // itemWorking.setTaskId(task.getId()) // .setLocId(loc1.getId()) // .setLocCode(loc1.getCode()); // workings.add(itemWorking); // } // }); // // if (!locItemWorkingService.saveBatch(workings)) { // throw new CoolException("临时库存更新失败！！"); // } List<LocItemWorking> workings = new ArrayList<>(); List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId())); items.forEach(taskItem -> { if (taskItem.getAnfme() > 0) { LocItemWorking itemWorking = new LocItemWorking(); BeanUtils.copyProperties(taskItem, itemWorking); itemWorking.setTaskId(task.getId()) .setLocId(loc1.getId()) .setLocCode(loc1.getCode()); workings.add(itemWorking); } }); if (!locItemWorkingService.saveBatch(workings)) { throw new CoolException("临时库存更新失败！！"); } loc1.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
