计划外出库导入问题修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java

@@ -179,17 +179,17 @@ public class UnplannedissueRequestMainController {
     }
 
     @GetMapping("/get-import-template")
-    @Operation(summary = "获得导入采购收货申请信息模板")
+    @Operation(summary = "获得计划外出库申请信息模板")
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo
         List<UnplannedissueRequestMainImportVO> list = new ArrayList<>();
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(7, uom);
+        mapDropDown.put(6, uom);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(8, inventoryStatus);
+        mapDropDown.put(7, inventoryStatus);
         // 输出
-        ExcelUtils.write(response, "采购收货申请信息导入模板.xlsx", "采购收货申请信息列表", UnplannedissueRequestMainImportVO.class, list, mapDropDown);
+        ExcelUtils.write(response, "计划外出库申请信息导入模板.xlsx", "计划外出库申请信息列表", UnplannedissueRequestMainImportVO.class, list, mapDropDown);
     }
 
     @PostMapping("/import")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainExcelVO.java

@@ -83,7 +83,6 @@ public class UnplannedissueRequestMainExcelVO {
     @ExcelProperty("直接生成记录")
     private String directCreateRecord;
 
-
     @ExcelProperty("包装号")
     private String packingNumber;
 
@@ -102,7 +101,6 @@ public class UnplannedissueRequestMainExcelVO {
     @ExcelProperty("原因")
     private String reason;
 
-
     @ExcelProperty("物品代码")
     private String itemCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainImportVO.java

@@ -25,16 +25,10 @@ import java.time.LocalDateTime;
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class UnplannedissueRequestMainImportVO {
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("截止时间")
-    private LocalDateTime dueTime;
+    private String dueTime;
-
-
-    //主表数据
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("零件号")
     private String itemCode;
 
     @ExcelProperty("包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/unplannedissueRequest/UnplannedissueRequestMainConvert.java

@@ -26,7 +26,6 @@ public interface UnplannedissueRequestMainConvert {
 
     UnplannedissueRequestMainConvert INSTANCE = Mappers.getMapper(UnplannedissueRequestMainConvert.class);
 
-
     UnplannedissueRequestMainDO convert(UnplannedissueRequestMainBaseVO bean);
 
     UnplannedissueRequestMainDO convert(UnplannedissueRequestMainCreateReqVO bean);
@@ -35,9 +34,6 @@ public interface UnplannedissueRequestMainConvert {
 
     UnplannedissueRequestMainRespVO convert(UnplannedissueRequestMainDO bean);
 
-    @Mappings({
-            @Mapping(source = "mainVo.number", target = "number"),
-    })
     UnplannedissueRequestMainImportErrorVO convert(UnplannedissueRequestMainCreateReqVO mainVo, UnplannedissueRequestDetailDO detailDo);
 
     List<UnplannedissueRequestMainRespVO> convertList(List<UnplannedissueRequestMainDO> list);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java

@@ -519,6 +519,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
         } catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
+        mainDo.setDepartmentCode(String.valueOf(userApi.getUser(getLoginUserId()).getDeptId()));
 
         return message.toString();
 
@@ -538,33 +539,38 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
         StringBuilder message = new StringBuilder();
         detailDo.setCreateTime(LocalDateTime.now());
         try{
-            LocationDO  locationDO =  validatorLocation(detailDo.getFromLocationCode());
+            // BQ-----QL 校验来源库位基础信息
+            LocationDO locationDO = validatorLocation(detailDo.getFromLocationCode());
             mainDo.setFromAreaCodes(locationDO.getAreaCode());
             mainDo.setFromLocationTypes(locationDO.getCode());
         }catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
         try{
+            // BQ——>QI 校验物品基础信息
             ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode());
-            detailDo.setItemDesc1(itembasicDO.getDesc1());
+            detailDo.setItemDesc1(itembasicDO.getDesc1()); // 物品描述1
-            detailDo.setItemDesc2(itembasicDO.getDesc2());
+            detailDo.setItemDesc2(itembasicDO.getDesc2()); // 物品描述2
-            detailDo.setItemName(itembasicDO.getName());
+            detailDo.setItemName(itembasicDO.getName()); // 物品名称
-            detailDo.setProjectCode(itembasicDO.getProject());
+            detailDo.setUom(itembasicDO.getUom());    // 计量单位
-            detailDo.setUom(itembasicDO.getUom());
+            detailDo.setProjectCode(itembasicDO.getProject()); // 项目代码
         }catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
         try{
+            // DBT——>DBT2——>LO
             jobUtils.ifInToLocationType(detailDo.getFromLocationCode(), businesstypeDO );
         }catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
         try{
+            // DBT——>DBT2——>SO
             jobUtils.ifOutInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO );
         }catch (Exception ex) {
             message.append(ex.getMessage()).append(",");
         }
         try {
+            // TB——>TB1
             String INVENTORY = detailDo.getInventoryStatus();
             String[]  inventory = INVENTORY.split(",");
             List<String> inventorystatus = Arrays.asList(inventory);
@@ -587,7 +593,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
         List<UnplannedissueRequestMainImportErrorVO> errorList = new ArrayList<>();
         datas.forEach(createReqVO -> {
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("UnplannedDeliverRequest");
-            UnplannedissueRequestMainDO mainDo =   UnplannedissueRequestMainConvert.INSTANCE.convert(createReqVO);
+            UnplannedissueRequestMainDO mainDo = UnplannedissueRequestMainConvert.INSTANCE.convert(createReqVO);
             String messageMain = this.validateUnplannedissueRequestMainImport(mainDo, businesstypeDO);
             List<UnplannedissueRequestDetailCreateReqVO> subList = createReqVO.getSubList();
             List<UnplannedissueRequestDetailDO> subDOList = UnplannedissueRequestDetailConvert.INSTANCE.convertList03(subList);
@@ -606,7 +612,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
             }
             //写入数据
             if (flag) {
-                String number = serialNumberApi.generateCode(RuleCodeEnum.PRODUCT_PUTAWAY_REQUEST.getCode());
+                String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_DELIVER_REQUEST.getCode());
                 mainDo.setNumber(number);
                 RequestStatusState requestStatusState = new RequestStatusState();
                 requestStatusState.newObject(mainDo.getAutoCommit(), mainDo.getAutoAgree(), mainDo.getAutoExecute());