排版

sd-business/src/main/java/com/sd/business/entity/in/emums/InDetailTypeEnum.java

@@ -13,7 +13,7 @@ public enum InDetailTypeEnum {
 
     PURCHASE(1, "采购入库"),
     PRODUCTION(2, "生产入库"),
-    RETURN_GOODS(3, "退货入库"),
+    RETURN_GOODS(3, "退料入库"),
     GIVE_BACK(4, "归还入库"),
     ALLOT(5, "调拨入库"),
     OTHER(6, "其他入库"),

sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java

@@ -637,7 +637,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         inOutStorageDto.setDetailType(OutDetailTypeEnum.PRODUCTION.getKey());
         inOutStorageDto.setClassifyType(1);
         inOutStorageDto.setWarehouseId(WarehouseConstant.SEMI_FINISHED_PRODUCT);
-        inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】原料出库");
+        inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】原料生产出库");
         List<InOutStorageBom> inOutStorageBomList = new ArrayList<>();
         inOutStorageDto.setInOutStorageBomList(inOutStorageBomList);
 
@@ -688,10 +688,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         if (!inOutStorageBomList.isEmpty()) {
             InOutStorageDto inOutStorageDto = new InOutStorageDto();
             inOutStorageDto.setType(InOutTypeEnum.IN.getKey());
-            inOutStorageDto.setDetailType(InDetailTypeEnum.GIVE_BACK.getKey());
+            inOutStorageDto.setDetailType(InDetailTypeEnum.RETURN_GOODS.getKey());
             inOutStorageDto.setClassifyType(1);
             inOutStorageDto.setWarehouseId(WarehouseConstant.SEMI_FINISHED_PRODUCT);
-            inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】余料入库");
+            inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】余料退料入库");
             inOutStorageDto.setInOutStorageBomList(inOutStorageBomList);
             inStorageService.add(inOutStorageDto);
         }
@@ -707,11 +707,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         inOutStorageDto.setDetailType(OutDetailTypeEnum.PRODUCTION.getKey());
         inOutStorageDto.setClassifyType(2);
         inOutStorageDto.setWarehouseId(WarehouseConstant.PACKAGING_MATERIAL);
-        inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】包材出库");
+        inOutStorageDto.setRemark("生产工单【" + workOrder.getCode() + "】包材生产出库");
 
         Map<Long, InOutStorageBom> map = new HashMap<>();
 
-
         // 通过工单找到订单sku包材配置
         List<Long> orderSkuIdList = list.stream().map(WorkOrderDetail::getOrderSkuId).collect(Collectors.toList());
         Map<Long, List<OrderSkuBom>> orderSkuMap = orderSkuBomService.mapKGroup(OrderSkuBom::getOrderSkuId,