rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -81,7 +81,8 @@ result.setData(dto); return result; } else { throw new CoolException("查询失败!!"); return result; // throw new CoolException("查询失败!!"); } } catch (JsonProcessingException e) { throw new CoolException(e.getMessage()); rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -68,6 +68,8 @@ @Autowired private AsnOrderService asnOrderService; @Autowired private AsnOrderLogService asnOrderLogService; @Autowired private AsnOrderItemService asnOrderItemService; @Autowired private DeliveryService deliveryService; @@ -227,8 +229,18 @@ WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() .eq(WkOrder::getPoCode, queryParams.getOrderNo())); if (Objects.isNull(wkOrders)) { throw new CoolException("单据不存在!!"); Map<String, Object> map = new HashMap<>(); map.put("exceStatus", "-1"); return R.ok("单据不存在 !!").add(map); } AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo())); if (!Objects.isNull(orderLog)) { Map<String, Object> map = new HashMap<>(); map.put("exceStatus", "4"); return R.ok("单据已完成 !!").add(map); } List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId())); WkOrderDto wkorderDto = new WkOrderDto(); rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
@@ -19,6 +19,7 @@ ORDER_WORK_TYPE_SUPPLIER("11", "销售出库单"), ORDER_WORK_TYPE_RETURN_ORDER("12", "领料出库单"), ORDER_WORK_TYPE_PROD_ADDITION("18", "生产补料"), ORDER_WORK_TYPE_FIX_OUT("19", "外发加工"), ORDER_WORK_TYPE_PURCHASE_RETURN("13", "采购退回出库单"), ORDER_WORK_TYPE_STOCK_OUT("15", "库存出库"), ORDER_WORK_TYPE_STOCK_CHECK("16", "盘点出库"), rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -168,8 +168,10 @@ //生产补料 params.setOrderType("WR_Instock_BL").setAction("Update"); param.setOutQty(orderItem.getQty()); } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) { }else if ( order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) { params.setOrderType("WR_Instock_BL").setAction("Update"); param.setOutQty(orderItem.getQty()); }else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) { //其它入库单/手动入库单 params.setOrderType("In_Instock").setAction("Update"); param.setInQty(orderItem.getQty());