Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java

@@ -3,6 +3,7 @@ package com.win.module.wms.controller.inventorymoveJob;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -88,7 +89,12 @@ public class InventorymoveJobDetailController {
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')")
     public CommonResult<PageResult<InventorymoveJobDetailRespVO>> getInventorymoveJobDetailPage(@Valid InventorymoveJobDetailPageReqVO pageVO) {
         PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO);
-        return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<InventorymoveJobDetailRespVO> result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveJobDetailRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+        }
+        return success(result);
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得库存转移任务子分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@@ -107,9 +107,9 @@ public class InventorymoveJobMainController {
         PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveJobMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
-            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
         }
         return success(result);
     }
@@ -122,9 +122,9 @@ public class InventorymoveJobMainController {
         PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveJobMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
-            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
         }
         return success(result);
     }
@@ -154,16 +154,17 @@ public class InventorymoveJobMainController {
     }
 
     private List<InventorymoveJobMainExcelVO> getExcelVo(List<InventorymoveJobMainDO> list, Map<Integer, String[]> mapDropDown) {
-        String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
+        String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(8, requestStatus);
+        mapDropDown.put(2, trueFalse);
+        String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STATUS);
+        mapDropDown.put(6, requestStatus);
         String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
-        mapDropDown.put(12, locationType);
+        mapDropDown.put(17, locationType);
-        mapDropDown.put(15, locationType);
+        mapDropDown.put(18, locationType);
-        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(27, inventoryStatus);
-        mapDropDown.put(33, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
         mapDropDown.put(42, uom);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(49, inventoryStatus);
         List<InventorymoveJobMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(InventorymoveJobMainDO mainDO : list) {
@@ -172,8 +173,13 @@ public class InventorymoveJobMainController {
                 InventorymoveJobMainExcelVO vo = InventorymoveJobMainConvert.INSTANCE.convert(mainDO, detailDO);
                 vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
                 vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname());
-                vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname());
+                if(!"".equals(mainDO.getAcceptUserId()) && mainDO.getAcceptUserId() != null){
-                vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname());
+                    vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname());
+
+                }
+                if(!"".equals(mainDO.getCompleteUserId()) && mainDO.getCompleteUserId() != null){
+                    vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname());
+                }
                 vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
                 resultList.add(vo);
             }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java

@@ -48,7 +48,7 @@ public class InventorymoveJobDetailExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
-    private LocalDateTime createtime;
+    private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")
     private String creator;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java

@@ -28,6 +28,9 @@ import com.win.framework.excel.core.convert.DictConvert;
 public class InventorymoveJobMainExcelVO {
 
     //主表数据
+    @ExcelProperty("单据号")
+    private String number;
+
     @ExcelProperty("申请单号")
     private String requestNumber;
 
@@ -61,9 +64,10 @@ public class InventorymoveJobMainExcelVO {
     @ExcelProperty("最后更新者Id")
     private String updater;
 
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    //TODO 该字段为弃用字段后续再进行整体清理
-    @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+//    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    private String jobStageStatus;
+//    @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+//    private String jobStageStatus;
 
     @ExcelProperty("优先级")
     private Integer priority;
@@ -96,9 +100,6 @@ public class InventorymoveJobMainExcelVO {
     @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String toLocationTypes;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
@@ -111,9 +112,9 @@ public class InventorymoveJobMainExcelVO {
 
     @ExcelProperty("创建者id")
     private String creator;
-
+    //TODO 该字段为弃用字段后续再进行整体清理
-    @ExcelProperty("创建者用户名")
+//    @ExcelProperty("创建者用户名")
-    private String creatorName;
+//    private String creatorName;
 
     @ExcelProperty("到仓库代码")
     private String toWarehouseCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java

@@ -91,7 +91,13 @@ public class InventorymoveRecordDetailController {
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')")
     public CommonResult<PageResult<InventorymoveRecordDetailRespVO>> getInventorymoveRecordDetailPage(@Valid InventorymoveRecordDetailPageReqVO pageVO) {
         PageResult<InventorymoveRecordDetailDO> pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailPage(pageVO);
-        return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult));
+        PageResult<InventorymoveRecordDetailRespVO> result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java

@@ -107,8 +107,8 @@ public class InventorymoveRecordMainController {
         PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveRecordMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
         }
         return success(result);
     }
@@ -121,8 +121,8 @@ public class InventorymoveRecordMainController {
         PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveRecordMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
         }
         return success(result);
     }
@@ -134,17 +134,14 @@ public class InventorymoveRecordMainController {
               HttpServletResponse response) throws IOException {
         List<InventorymoveRecordMainDO> list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO);
         // 导出 Excel
-        List<InventorymoveRecordMainExcelVO> datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list);
+        //组装vo
-        for(InventorymoveRecordMainExcelVO vo : datas) {
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+        List<InventorymoveRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-            //后端创建个字段作为前端展示的虚拟字段
+        ExcelUtils.write(response, "库存转移申请.xlsx", "库存转移申请数据", InventorymoveRecordMainExcelVO.class, resultList, mapDropDown);
-            vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas);
     }
 
     @GetMapping("/export-excel-senior")
-    @Operation(summary = "导出库存转移申请 Excel")
+    @Operation(summary = "导出库存转移记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')")
     @OperateLog(type = EXPORT)
     public void exportInventorymoveRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
@@ -158,27 +155,27 @@ public class InventorymoveRecordMainController {
     private List<InventorymoveRecordMainExcelVO> getExcelVo(List<InventorymoveRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
         String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(3, trueFalse);
-        mapDropDown.put(23, trueFalse);
+        mapDropDown.put(22, trueFalse);
         String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
         mapDropDown.put(11, interfaceType);
-        mapDropDown.put(48, interfaceType);
+        mapDropDown.put(46, interfaceType);
         String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
-        mapDropDown.put(18, locationType);
+        mapDropDown.put(17, locationType);
-        mapDropDown.put(21, locationType);
+        mapDropDown.put(20, locationType);
         String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
-        mapDropDown.put(32, inventoryStatus);
+        mapDropDown.put(31, inventoryStatus);
-        mapDropDown.put(40, inventoryStatus);
+        mapDropDown.put(39, inventoryStatus);
         String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
-        mapDropDown.put(46, uom);
+        mapDropDown.put(45, uom);
         List<InventorymoveRecordMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(InventorymoveRecordMainDO mainDO : list) {
             List<InventorymoveRecordDetailDO> subList = inventorymoveRecordDetailService.selectList(mainDO.getId());
             for(InventorymoveRecordDetailDO detailDO : subList) {
                 InventorymoveRecordMainExcelVO vo = InventorymoveRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
+                vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
                 vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
                 vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
-                vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
                 resultList.add(vo);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java

@@ -90,9 +90,9 @@ public class InventorymoveRecordDetailExcelVO {
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String uom;
-
+    //TODO 弃用字段后续统一清理
-    @ExcelProperty("代码")
+//    @ExcelProperty("代码")
-    private String code;
+//    private String code;
 
     @ExcelProperty(value = "接口类型", converter = DictConvert.class)
     @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java

@@ -109,4 +109,6 @@ public class InventorymoveRecordDetailExportReqVO {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主表ID")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java

@@ -111,4 +111,6 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主表ID")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java

@@ -66,9 +66,9 @@ public class InventorymoveRecordMainExcelVO {
     @ExcelProperty(value = "接口类型", converter = DictConvert.class)
     @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String interfaceType;
-
+//TODO 弃用字段后续统一清理
-    @ExcelProperty("代码")
+//    @ExcelProperty("代码")
-    private String code;
+//    private String code;
 
     @ExcelProperty("业务类型")
     private String businessType;
@@ -178,9 +178,9 @@ public class InventorymoveRecordMainExcelVO {
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String uom;
-
+//TODO 弃用字段后续统一清理
-    @ExcelProperty("代码")
+//    @ExcelProperty("代码")
-    private String codeDetail;
+//    private String codeDetail;
 
     @ExcelProperty(value = "接口类型", converter = DictConvert.class)
     @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java

@@ -102,9 +102,9 @@ public class InventorymoveRequestMainController {
         PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveRequestMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
-            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
         }
         return success(result);
     }
@@ -117,9 +117,9 @@ public class InventorymoveRequestMainController {
         PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
         for(InventorymoveRequestMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
             vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
-            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
         }
         return success(result);
     }
@@ -165,11 +165,11 @@ public class InventorymoveRequestMainController {
             List<InventorymoveRequestDetailDO> subList = inventorymoveRequestDetailService.selectList(mainDO.getId());
             for(InventorymoveRequestDetailDO detailDO : subList) {
                 InventorymoveRequestMainExcelVO vo = InventorymoveRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
+                vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
                 vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
                 vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname());
                 vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
                 vo.setUpdaterDetail(userApi.getUser(Long.valueOf(detailDO.getUpdater())).getNickname());
-                vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
                 resultList.add(vo);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java

@@ -91,4 +91,7 @@ public class ProductscrapRecordDetailExportReqVO {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主键ID")
+    private Long masterID;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java

@@ -93,4 +93,7 @@ public class ProductscrapRecordDetailPageReqVO extends PageParam {
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
+    @Schema(description = "主键ID")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java

@@ -9,6 +9,7 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO;
 import com.win.module.wms.controller.productscrapRequest.vo.*;
 import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestMainConvert;
 import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
@@ -225,4 +226,13 @@ public class ProductscrapRequestMainController {
         return success(pageResult);
     }
 
+    @PostMapping("/updateBom")
+    @Operation(summary = "更新制品报废申请二级子表")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:update')")
+    public CommonResult<Boolean> updateProductscrapDetailRequestBom(@RequestParam("id") Long id, @RequestBody List<RawscrapRequestDetailUpdateReqVO> updateReqVOList) {
+        productscrapRequestMainService.updateProductscrapDetailRequestBom(id, updateReqVOList);
+        return success(true);
+    }
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java

@@ -25,22 +25,18 @@ public class ProductscrapRequestDetailBaseVO {
     private String fromOwnerCode;
 
     @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "包装号不能为空")
     private String packingNumber;
 
     @Schema(description = "器具号")
     private String containerNumber;
 
     @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "批次不能为空")
     private String batch;
 
     @Schema(description = "从库位代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从库位代码不能为空")
     private String fromLocationCode;
 
     @Schema(description = "库存状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "库存状态不能为空")
     private String inventoryStatus;
 
     @Schema(description = "原因")
@@ -57,7 +53,6 @@ public class ProductscrapRequestDetailBaseVO {
     private String remark;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
@@ -97,4 +92,7 @@ public class ProductscrapRequestDetailBaseVO {
 
     @Schema(description = "工序代码")
     private String processCode;
+
+    @Schema(description = "主键ID")
+    private Long masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java

@@ -94,4 +94,7 @@ public class ProductscrapRequestMainBaseVO {
     @Schema(description = "班次", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "班次不能为空")
     private String shift;
+
+    @Schema(description = "主键ID")
+    private Long masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainExportReqVO.java

@@ -71,4 +71,12 @@ public class ProductscrapRequestMainExportReqVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainPageReqVO.java

@@ -73,4 +73,13 @@ public class ProductscrapRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java

@@ -44,10 +44,10 @@ public interface InventorymoveJobMainConvert {
             @Mapping(source = "mainDO.remark", target = "remark"),
             @Mapping(source = "mainDO.createTime", target = "createTime"),
             @Mapping(source = "mainDO.creator", target = "creator"),
-            @Mapping(source = "mainDO.creatorName", target = "creatorName"),
             @Mapping(source = "mainDO.updateTime", target = "updateTime"),
             @Mapping(source = "mainDO.updater", target = "updater"),
             @Mapping(source = "detailDO.creator", target = "creatorDetail"),
+            @Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
     })
     InventorymoveJobMainExcelVO convert(InventorymoveJobMainDO mainDO, InventorymoveJobDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java

@@ -42,7 +42,8 @@ public interface InventorymoveRecordMainConvert {
             @Mapping(source = "mainDO.createTime", target = "createTime"),
             @Mapping(source = "mainDO.creator", target = "creator"),
             @Mapping(source = "mainDO.interfaceType", target = "interfaceType"),
-            @Mapping(source = "mainDO.code", target = "code"),
+            @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"),
+            @Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
     })
     InventorymoveRecordMainExcelVO convert(InventorymoveRecordMainDO mainDO, InventorymoveRecordDetailDO detailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.inventorymoveJob;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.inventorymoveRecord;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java

@@ -146,9 +146,4 @@ public class InventorymoveRecordMainDO extends BaseDO {
      * 是否可用
      */
     private String available;
-    /**
-     * 主表id
-     */
-    private String masterId;
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java

@@ -115,7 +115,7 @@ public class ProductscrapRecordDetailDO extends BaseDO {
     /**
      * 主表ID
      */
-    private String masterId;
+    private Long masterId;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java

@@ -23,6 +23,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX<Inventorymo
 
     default PageResult<InventorymoveRecordDetailDO> selectPage(InventorymoveRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InventorymoveRecordDetailDO>()
+                .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())
                 .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
@@ -61,6 +62,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX<Inventorymo
     }
     default List<InventorymoveRecordDetailDO> selectList(InventorymoveRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRecordDetailDO>()
+                .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())
                 .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java

@@ -10,7 +10,6 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO;
 import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
-import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -24,7 +23,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX<Inventorymove
     default PageResult<InventorymoveRecordMainDO> selectPage(InventorymoveRecordMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InventorymoveRecordMainDO>()
                 .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
-                .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())
                 .eqIfPresent(InventorymoveRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
@@ -55,7 +53,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX<Inventorymove
     }
     default List<InventorymoveRecordMainDO> selectList(InventorymoveRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRecordMainDO>()
-                .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber())
                 .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java

@@ -47,6 +47,7 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX<Productscrap
                 .betweenIfPresent(ProductscrapRecordDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ProductscrapRecordDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(ProductscrapRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
+                .eqIfPresent(ProductscrapRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .orderByDesc(ProductscrapRecordDetailDO::getId));
     }
     default PageResult<ProductscrapRecordDetailDO> selectSenior(CustomConditions conditions) {
@@ -79,6 +80,7 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX<Productscrap
                 .betweenIfPresent(ProductscrapRecordDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ProductscrapRecordDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(ProductscrapRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
+                .eqIfPresent(ProductscrapRecordDetailDO::getMasterId, reqVO.getMasterID())
                 .orderByDesc(ProductscrapRecordDetailDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java

@@ -1,18 +1,17 @@
 package com.win.module.wms.dal.mysql.productscrapRequest;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainExportReqVO;
 import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
-import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品报废申请主 Mapper
  *
@@ -41,6 +40,9 @@ public interface ProductscrapRequestMainMapper extends BaseMapperX<ProductscrapR
                 .eqIfPresent(ProductscrapRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(ProductscrapRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(ProductscrapRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(ProductscrapRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapRequestMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapRequestMainDO::getShift, reqVO.getShift())
                 .orderByDesc(ProductscrapRequestMainDO::getId));
     }
 
@@ -68,6 +70,9 @@ public interface ProductscrapRequestMainMapper extends BaseMapperX<ProductscrapR
                 .eqIfPresent(ProductscrapRequestMainDO::getAutoAgree, reqVO.getAutoAgree())
                 .eqIfPresent(ProductscrapRequestMainDO::getAutoExecute, reqVO.getAutoExecute())
                 .eqIfPresent(ProductscrapRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
+                .eqIfPresent(ProductscrapRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode())
+                .eqIfPresent(ProductscrapRequestMainDO::getTeam, reqVO.getTeam())
+                .eqIfPresent(ProductscrapRequestMainDO::getShift, reqVO.getShift())
                 .orderByDesc(ProductscrapRequestMainDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@@ -195,11 +195,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
         //增加业务类型
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
         countRecordMainDO.setBusinessType(businesstypeDO.getCode());
-        countRecordMainDO.setId(null);
+        countRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        countRecordMainDO.setCreator(null);
-        countRecordMainDO.setCreateTime(null);
-        countRecordMainDO.setUpdater(null);
-        countRecordMainDO.setUpdateTime(null);
         countRecordMainMapper.insert(countRecordMainDO);
         CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectByNumber(countJobMainDO.getRequestNumber());
         List<CountJobDetailUpdateReqVO> countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList();
@@ -215,11 +211,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
             countRecordDetailDO.setMasterId(countRecordMainDO.getId());
             countRecordDetailDO.setNumber(number);
             countRecordDetailDO.setJobDetailId(String.valueOf(countJobDetailUpdateReqVO.getId()));
-            countRecordDetailDO.setId(null);
+            countRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            countRecordDetailDO.setCreator(null);
-            countRecordDetailDO.setCreateTime(null);
-            countRecordDetailDO.setUpdater(null);
-            countRecordDetailDO.setUpdateTime(null);
             countRecordDetailDOList.add(countRecordDetailDO);
             //新增任务子数据，回写到申请子表中
             if(countJobDetailUpdateReqVO.getId() == 0) {
@@ -227,11 +219,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
                 BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRequestDetailDO);
                 countRequestDetailDO.setMasterId(countRequestMainDO.getId());
                 countRequestDetailDO.setNumber(countRequestMainDO.getNumber());
-                countRequestDetailDO.setId(null);
+                countRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                countRequestDetailDO.setCreator(null);
-                countRequestDetailDO.setCreateTime(null);
-                countRequestDetailDO.setUpdater(null);
-                countRequestDetailDO.setUpdateTime(null);
                 countRequestDetailDOList.add(countRequestDetailDO);
             }
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -418,11 +418,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
             countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
             countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
-            countJobMainDO.setId(null);
+            countJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            countJobMainDO.setCreateTime(null);
-            countJobMainDO.setCreator(null);
-            countJobMainDO.setUpdateTime(null);
-            countJobMainDO.setUpdater(null);
             String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode());
             countJobMainDO.setNumber(number);
             countJobMainMapper.insert(countJobMainDO);
@@ -434,11 +430,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
                     CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO);
                     countJobDetailDO.setNumber(number);
                     countJobDetailDO.setMasterId(countJobMainDO.getId());
-                    countJobDetailDO.setId(null);
+                    countJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                    countJobDetailDO.setCreateTime(null);
-                    countJobDetailDO.setCreator(null);
-                    countJobDetailDO.setUpdateTime(null);
-                    countJobDetailDO.setUpdater(null);
                     countJobDetailDOList.add(countJobDetailDO);
                 }
             }
@@ -453,7 +445,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
     @Transactional
     public int generateCountadjustRequest(Long countRecordMainId) {
         CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectById(countRecordMainId);
-        if("2".equals(countRequestMainDO.getCountAdjustStatus())) {
+        if(!"2".equals(countRequestMainDO.getCountAdjustStatus())) {
             throw new ServiceException(COUNTADJUST_REQUEST_EXISTS);
         }
         List<CountRecordDetailDO> countRecordDetailDOList = countRecordDetailMapper.getDifferenceList(countRequestMainDO.getNumber());
@@ -467,11 +459,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty()));
             //调整数量的绝对值
             countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs());
-            countadjustRequestDetailDO.setId(null);
+            countadjustRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            countadjustRequestDetailDO.setCreator(null);
-            countadjustRequestDetailDO.setCreateTime(null);
-            countadjustRequestDetailDO.setUpdater(null);
-            countadjustRequestDetailDO.setUpdateTime(null);
             countadjustRequestDetailDOList.add(countadjustRequestDetailDO);
         }
         int result = 0;
@@ -490,17 +478,15 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countadjustRequestMainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
             countadjustRequestMainDO.setCountRequestNumber(countRequestMainDO.getNumber());
             countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
-            countadjustRequestMainDO.setId(null);
+            countadjustRequestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            countadjustRequestMainDO.setCreator(null);
-            countadjustRequestMainDO.setCreateTime(null);
-            countadjustRequestMainDO.setUpdater(null);
-            countadjustRequestMainDO.setUpdateTime(null);
             result = countadjustRequestMainMapper.insert(countadjustRequestMainDO);
             for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) {
                 countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId());
                 countadjustRequestDetailDO.setNumber(adjustNumber);
             }
             countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList);
+            countRequestMainDO.setCountAdjustStatus("3");
+            countRequestMainMapper.updateById(countRequestMainDO);
             trendsApi.createTrends(countadjustRequestMainDO.getId(), "countadjustRequest", "生成了盘点调整申请", TrendsTypeEnum.CREATE);
         }
         return result;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -224,11 +224,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         inspectRecordMainDO.setNumber(number);
         inspectRecordMainDO.setJobNumber(inspectJobMainDO.getNumber());
         inspectRecordMainDO.setFromWarehouseCode(inspectJobMainDO.getWarehouseCode());
-        inspectRecordMainDO.setId(null);
+        inspectRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        inspectRecordMainDO.setCreator(null);
-        inspectRecordMainDO.setCreateTime(null);
-        inspectRecordMainDO.setUpdater(null);
-        inspectRecordMainDO.setUpdateTime(null);
         inspectRecordMainMapper.insert(inspectRecordMainDO);
         BigDecimal goodQty = BigDecimal.ZERO;
         BigDecimal failedQty = BigDecimal.ZERO;
@@ -250,11 +246,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId());
             inspectRecordDetailDO.setNumber(number);
             inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId()));
-            inspectRecordDetailDO.setId(null);
+            inspectRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            inspectRecordDetailDO.setCreator(null);
-            inspectRecordDetailDO.setCreateTime(null);
-            inspectRecordDetailDO.setUpdater(null);
-            inspectRecordDetailDO.setUpdateTime(null);
             inspectRecordDetailDOList.add(inspectRecordDetailDO);
             //查询库存余额
             BalanceDO balanceDO = balanceMapper.getBalanceQty(inspectJobDetailUpdateReqVO.getPackingNumber(), inspectJobMainUpdateReqVO.getItemCode(), inspectJobMainUpdateReqVO.getBatch(), inspectJobDetailUpdateReqVO.getInventoryStatus(), inspectJobDetailUpdateReqVO.getFromLocationCode());
@@ -357,18 +349,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             requestMainDO.setInspectType("FULL");
             requestMainDO.setSampleMethod("QTY");
             requestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
-            requestMainDO.setId(null);
+            requestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            requestMainDO.setCreator(null);
-            requestMainDO.setCreateTime(null);
-            requestMainDO.setUpdater(null);
-            requestMainDO.setUpdateTime(null);
             inspectRequestMainMapper.insert(requestMainDO);
             for(InspectRequestDetailDO inspectRequestDetailDO : requestDetailDOList) {
-                inspectRequestDetailDO.setId(null);
+                inspectRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                inspectRequestDetailDO.setCreator(null);
-                inspectRequestDetailDO.setCreateTime(null);
-                inspectRequestDetailDO.setUpdater(null);
-                inspectRequestDetailDO.setUpdateTime(null);
                 inspectRequestDetailDO.setMasterId(requestMainDO.getId());
                 inspectRequestDetailDO.setNumber(requestNumber);
             }
@@ -394,25 +378,18 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 }
                 PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO();
                 BeanUtils.copyProperties(inspectJobDetailUpdateReqVO, putawayRequestDetailCreateReqVO);
+                putawayRequestDetailCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getGoodQty());
                 putawayRequestDetailCreateReqVO.setBatch(inspectRecordMainDO.getBatch());
                 putawayRequestDetailCreateReqVO.setPoNumber(inspectRecordMainDO.getPoNumber());
                 putawayRequestDetailCreateReqVO.setPoLine(inspectRecordMainDO.getPoLine());
                 putawayRequestDetailCreateReqVO.setItemCode(inspectRecordMainDO.getItemCode());
                 putawayRequestDetailCreateReqVO.setItemName(inspectRecordMainDO.getItemCode());
                 putawayRequestDetailCreateReqVO.setInventoryStatus("OK");
-                putawayRequestDetailCreateReqVO.setId(null);
+                putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                putawayRequestDetailCreateReqVO.setCreateTime(null);
-                putawayRequestDetailCreateReqVO.setCreator(null);
-                putawayRequestDetailCreateReqVO.setUpdateTime(null);
-                putawayRequestDetailCreateReqVO.setUpdater(null);
                 putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO);
             }
             putawayRequestMainCreateReqVO.setToWarehouseCode(inspectRecordMainDO.getFromWarehouseCode());
-            putawayRequestMainCreateReqVO.setId(null);
+            putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            putawayRequestMainCreateReqVO.setCreateTime(null);
-            putawayRequestMainCreateReqVO.setCreator(null);
-            putawayRequestMainCreateReqVO.setUpdateTime(null);
-            putawayRequestMainCreateReqVO.setUpdater(null);
             putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList);
             if(!putawayRequestDetailCreateReqVOList.isEmpty()) {
                 putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -403,11 +403,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         inspectJobMainDO.setRequestNumber(mainDO.getNumber());
         inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode());
-        inspectJobMainDO.setId(null);
+        inspectJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        inspectJobMainDO.setCreator(null);
-        inspectJobMainDO.setCreateTime(null);
-        inspectJobMainDO.setUpdater(null);
-        inspectJobMainDO.setUpdateTime(null);
         String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode());
         inspectJobMainDO.setNumber(number);
         //增加业务类型
@@ -422,11 +418,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO);
             inspectJobDetailDO.setNumber(number);
             inspectJobDetailDO.setMasterId(inspectJobMainDO.getId());
-            inspectJobDetailDO.setId(null);
+            inspectJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            inspectJobDetailDO.setCreator(null);
-            inspectJobDetailDO.setCreateTime(null);
-            inspectJobDetailDO.setUpdater(null);
-            inspectJobDetailDO.setUpdateTime(null);
             inspectJobDetailDOList.add(inspectJobDetailDO);
             //预计出
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java

@@ -18,6 +18,7 @@ import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetail
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO;
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
 import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper;
@@ -27,6 +28,7 @@ import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.job.JobStatusState;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
+import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
@@ -87,6 +89,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
     private ExpectinService expectinService;
     @Resource
     private TransactionService transactionService;
+    @Resource
+    private LocationService locationService;
 
     @Override
     public Long createInventorymoveJobMain(InventorymoveJobMainCreateReqVO createReqVO) {
@@ -244,12 +248,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
         inventorymoveJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId()));
         inventorymoveJobMainDO.setCompleteUserName(userRespDTO.getNickname());
         //更新任务表状态
-        int result = inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO);
+        inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO);
         //创建客户收货记录主表
         InventorymoveRecordMainDO inventorymoveRecordMainDO = new InventorymoveRecordMainDO();
         BeanUtils.copyProperties(inventorymoveJobMainDO, inventorymoveRecordMainDO);
         inventorymoveRecordMainDO.setJobNumber(inventorymoveJobMainDO.getNumber());
         inventorymoveRecordMainDO.setId(null);
+        inventorymoveRecordMainDO.setCreateTime(null);
         inventorymoveRecordMainDO.setAvailable("TRUE");
         inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now());
         inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now());
@@ -295,7 +300,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
                         inventorymoveRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString());
                         inventorymoveRecordDetailDO.setId(null);
                         inventorymoveRecordDetailDO.setCreator(null);
-                        inventorymoveRecordDetailDO.setCreateTime(null);
+                        inventorymoveRecordDetailDO.setCreateTime(LocalDateTime.now());
                         inventorymoveRecordDetailDO.setUpdater(null);
                         inventorymoveRecordDetailDO.setUpdateTime(null);
                         inventorymoveRecordDetailDO.setNumber(inventorymoveRecordMainDO.getNumber());
@@ -306,12 +311,19 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
                         inventorymoveRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber"));
                         inventorymoveRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch"));
                         inventorymoveRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode"));
+                        LocationDO toLocationDO = locationService.selectLocation(recordLstItem.get("toLocationCode"));
+                        inventorymoveRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode());
+                        inventorymoveRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode());
+                        LocationDO fromLocationDO = locationService.selectLocation(inventorymoveRecordDetailDO.getFromLocationCode());
+                        inventorymoveRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode());
+                        inventorymoveRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode());
                         inventorymoveRecordDetailDO.setToInventoryStatus(recordLstItem.get("toInventoryStatus"));
                         inventorymoveRecordDetailDO.setFromPackingNumber(DetailUpdateItem.getPackingNumber());
                         inventorymoveRecordDetailDO.setFromContainerNumber(DetailUpdateItem.getContainerNumber());
                         inventorymoveRecordDetailDO.setFromAreaCode(inventorymoveJobMainDO.getFromAreaCodes());
                         inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes());
                         inventorymoveRecordDetailDO.setFromBatch(DetailUpdateItem.getBatch());
+                        inventorymoveRecordDetailDO.setInterfaceType(inventorymoveRecordMainDO.getInterfaceType());
                         inventorymoveRecordDetailDO.setFromInventoryStatus(DetailUpdateItem.getInventoryStatus());
                         inventorymoveRecordDetailDOList.add(inventorymoveRecordDetailDO);
                         //添加库存事务list

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java

@@ -87,7 +87,6 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
     private InventorymoveJobDetailMapper inventorymoveJobDetailMapper;
     @Resource
     private Validator validator;
-
     @Resource
     private ItembasicService itembasicService;
     @Resource

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java

@@ -4,12 +4,11 @@ import java.util.*;
 import javax.validation.*;
 
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO;
+import com.win.module.wms.controller.productscrapRequest.vo.*;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO;
+import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO;
 import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
 
 /**
  * 制品报废申请子 Service 接口
@@ -80,4 +79,12 @@ public interface ProductscrapRequestDetailService {
      */
     List<ProductscrapRequestDetailDO> getProductscrapRequestDetailList(ProductscrapRequestDetailExportReqVO exportReqVO);
 
+    /**
+     * 校验子表数据
+     * @param detailCreateReqVO
+     * @param businesstypeDO
+     * @param productscrapRequestMainDO
+     */
+    void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java

@@ -1,10 +1,22 @@
 package com.win.module.wms.service.productscrapRequest;
 
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO;
+import com.win.module.wms.controller.productscrapRequest.vo.*;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO;
+import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConvert;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
-import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO;
+import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
+import com.win.module.wms.dal.dataobject.workstation.WorkstationDO;
+import com.win.module.wms.dal.mysql.productscrapRequest.ProductscrapRequestMainMapper;
+import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.service.productionline.ProductionlineService;
+import com.win.module.wms.service.requestsetting.RequestsettingService;
+import com.win.module.wms.service.workstation.WorkstationService;
+import com.win.module.wms.util.JobUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -31,11 +43,28 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest
 
     @Resource
     private ProductscrapRequestDetailMapper productscrapRequestDetailMapper;
+    @Resource
+    private ProductscrapRequestMainMapper productscrapRequestMainMapper;
+    @Resource
+    private ProductionlineService productionlineService;
+    @Resource
+    private ItembasicService itembasicService;
+    @Resource
+    private WorkstationService workstationService;
+    @Resource
+    private JobUtils jobUtils;
+    @Resource
+    private RequestsettingService requestsettingService;
 
     @Override
     public Long createProductscrapRequestDetail(ProductscrapRequestDetailCreateReqVO createReqVO) {
-        // 插入
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductScrapRequest");
+        ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(createReqVO.getMasterId());
+        // 校验数据
+        this.validateDetailMethod(createReqVO,businesstypeDO,productscrapRequestMainDO);
         ProductscrapRequestDetailDO productscrapRequestDetail = ProductscrapRequestDetailConvert.INSTANCE.convert(createReqVO);
+        productscrapRequestDetail.setMasterId(createReqVO.getMasterId());
+        productscrapRequestDetail.setNumber(productscrapRequestMainDO.getNumber());
         productscrapRequestDetailMapper.insert(productscrapRequestDetail);
         // 返回
         return productscrapRequestDetail.getId();
@@ -45,8 +74,14 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest
     public void updateProductscrapRequestDetail(ProductscrapRequestDetailUpdateReqVO updateReqVO) {
         // 校验存在
         validateProductscrapRequestDetailExists(updateReqVO.getId());
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductScrapRequest");
+        ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(updateReqVO.getMasterId());
+        // 校验数据
+        this.validateDetailMethod(updateReqVO,businesstypeDO,productscrapRequestMainDO);
         // 更新
         ProductscrapRequestDetailDO updateObj = ProductscrapRequestDetailConvert.INSTANCE.convert(updateReqVO);
+        updateObj.setMasterId(updateReqVO.getMasterId());
+        updateObj.setNumber(productscrapRequestMainDO.getNumber());
         productscrapRequestDetailMapper.updateById(updateObj);
     }
 
@@ -57,10 +92,12 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest
         // 删除
         productscrapRequestDetailMapper.deleteById(id);
     }
+
     @Override
     public PageResult<ProductscrapRequestDetailDO> getProductscrapRequestDetailSenior(CustomConditions conditions) {
         return productscrapRequestDetailMapper.selectSenior(conditions);
     }
+
     private void validateProductscrapRequestDetailExists(Long id) {
         if (productscrapRequestDetailMapper.selectById(id) == null) {
             throw exception(PRODUCTSCRAP_REQUEST_DETAIL_NOT_EXISTS);
@@ -87,4 +124,44 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest
         return productscrapRequestDetailMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO) {
+        // 校验--生产线基本信息
+        ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailCreateReqVO.getProductionLineCode());
+        detailCreateReqVO.setFromLocationCode(productionlineDO.getRawLocationCode());
+        // 校验--物品基本信息 BQ——>QI
+        ItembasicDO itembasic = validatorItembasic(detailCreateReqVO.getItemCode());
+        detailCreateReqVO.setItemDesc1(itembasic.getDesc1());
+        detailCreateReqVO.setItemDesc2(itembasic.getDesc2());
+        detailCreateReqVO.setItemName(itembasic.getName());
+        detailCreateReqVO.setProjectCode(itembasic.getProject());
+        detailCreateReqVO.setUom(itembasic.getUom());
+        // 校验--工位基础信息
+        if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){
+            WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode());
+            detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode());
+        }
+        // 校验--uom
+        // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom());
+        // 校验--物品类型 DBT---DBT2---IT1
+        jobUtils.ifInType(itembasic.getType(), businesstypeDO);
+        // 校验--来源库位 DBT——>DBT2——>LO
+        jobUtils.ifInToLocationType(detailCreateReqVO.getFromLocationCode(), businesstypeDO);
+        // 校验--库存状态 DBT——>DBT2——>ISO
+        // jobUtils.ifOutInventoryStatuses(detailCreateReqVO.getInventoryStatus(), businesstypeDO);
+        // 校验--库存余额 TB——>TB1
+//        List<String> business = validatorbusinessbasic(detailCreateReqVO.getInventoryStatus());
+//        List<BalanceDO> balance = validatorbalance(detailCreateReqVO.getItemCode(), detailCreateReqVO.getPackingNumber(),detailCreateReqVO.getBatch(), detailCreateReqVO.getFromLocationCode(), business);
+//        BalanceDO balanceDO = balance.get(0);
+//        productscrapRequestMainDO.setFromWarehouseCode(balanceDO.getWarehouseCode());
+//        productscrapRequestMainDO.setDueTime(balanceDO.getExpireDate());
+//        detailCreateReqVO.setFromLocationCode(balanceDO.getLocationCode());
+//        // 校验 报废数量【qty】不能大于库存数量【banlance.qty】
+//        validatorQty(detailCreateReqVO.getQty(), balanceDO.getQty());
+    }
+
+    private ItembasicDO validatorItembasic(String itemCode) {
+        return itembasicService.selectItembasic(itemCode);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java

@@ -136,4 +136,11 @@ public interface ProductscrapRequestMainService {
      * @return 分页列表数据
      */
     PageResult<ProductscrapRequestBomRespVO> getBomInfoPage(ProductscrapRequestDetailPageReqVO pageVO);
+
+    /**
+     * 更新BOM拆解二级子表数据
+     * @param id 一级子表的ID
+     * @param updateReqVOList 二级子表列表数据
+     */
+    void updateProductscrapDetailRequestBom(Long id, List<RawscrapRequestDetailUpdateReqVO> updateReqVOList);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.service.productscrapRequest;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.annotations.VisibleForTesting;
 import com.win.framework.common.exception.ServiceException;
@@ -28,7 +29,6 @@ import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConve
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
-import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
 import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordDetailDO;
 import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordMainDO;
 import com.win.module.wms.dal.dataobject.productscrapRecord.RawscrapRecordDetailDO;
@@ -39,7 +39,6 @@ import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.dataobject.shift.ShiftDO;
 import com.win.module.wms.dal.dataobject.team.TeamDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
-import com.win.module.wms.dal.dataobject.workstation.WorkstationDO;
 import com.win.module.wms.dal.mysql.productscrapRecord.ProductscrapRecordDetailMapper;
 import com.win.module.wms.dal.mysql.productscrapRecord.ProductscrapRecordMainMapper;
 import com.win.module.wms.dal.mysql.productscrapRecord.RawscrapRecordDetailMapper;
@@ -49,14 +48,12 @@ import com.win.module.wms.dal.mysql.productscrapRequest.RawscrapRequestDetailMap
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.itembasic.ItembasicService;
-import com.win.module.wms.service.productionline.ProductionlineService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.shift.ShiftService;
 import com.win.module.wms.service.team.TeamService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.service.workshop.WorkshopService;
-import com.win.module.wms.service.workstation.WorkstationService;
 import com.win.module.wms.util.JobUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -123,9 +120,9 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
     @Resource
     private ShiftService shiftService;
     @Resource
-    private ProductionlineService productionlineService;
+    private ProductscrapRequestDetailService productscrapRequestDetailService;
     @Resource
-    private WorkstationService workstationService;
+    private RawscrapRequestDetailService rawscrapRequestDetailService;
 
     @Override
     public Long createProductscrapRequestMain(ProductscrapRequestMainCreateReqVO createReqVO) {
@@ -216,7 +213,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
         // 子表校验
         List<ProductscrapRequestDetailCreateReqVO> subList = createReqVO.getSubList();
         for(ProductscrapRequestDetailCreateReqVO detailCreateReqVO:subList){
-            validateDetailMethod(detailCreateReqVO, businesstypeDO,mainBo);
+            // 子表数据校验
+            productscrapRequestDetailService.validateDetailMethod(detailCreateReqVO, businesstypeDO,mainBo);
         }
         String number = serialNumberApi.generateCode(RuleCodeEnum.PRODUCT_SCRAP_REQUEST.getCode());
         mainBo.setNumber(number);
@@ -233,7 +231,7 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
                 rawscrapRequestDetailDO.setMasterId(detailDO.getId());
                 rawscrapRequestDetailDO.setNumber(detailDO.getNumber());
                 // 校验--二级子表数据
-                validateDetailbBom(rawscrapRequestDetailDO,detailDO,mainBo);
+                rawscrapRequestDetailService.validateDetailbBom(rawscrapRequestDetailDO,detailDO,mainBo);
                 rawscrapRequestDetailDO.setId(null);
                 childList.add(rawscrapRequestDetailDO);
             }
@@ -242,62 +240,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
         return mainBo;
     }
 
-    private void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo) {
-        // 校验--物品基本信息
-        ItembasicDO itembasicDO = itembasicService.selectItembasic(rawscrapRequestDetailDO.getItemCode());
-        // 赋值物品Item相关信息
-        rawscrapRequestDetailDO.setItemDesc1(itembasicDO.getDesc1());
-        rawscrapRequestDetailDO.setItemDesc2(itembasicDO.getDesc2());
-        rawscrapRequestDetailDO.setItemName(itembasicDO.getName());
-        rawscrapRequestDetailDO.setProjectCode(itembasicDO.getProject());
-        // 校验库存余额
-        List<String> inventoryStatus = new ArrayList<>();
-        inventoryStatus.add("OK");  // 查询合格的边料库存余额
-        List<BalanceDO> list = jobUtils.selectlocationReturnManagementAccuracy(rawscrapRequestDetailDO.getItemCode(),null,null,detailDO.getFromLocationCode(),inventoryStatus);
-        BalanceDO balanceDO = list.get(0); // 去第一条库存余额
-        rawscrapRequestDetailDO.setInventoryStatus(balanceDO.getInventoryStatus());
-        rawscrapRequestDetailDO.setBatch(balanceDO.getBatch());
-        rawscrapRequestDetailDO.setPackingNumber(balanceDO.getPackingNumber());
-        rawscrapRequestDetailDO.setFromLocationCode(balanceDO.getLocationCode());
-        rawscrapRequestDetailDO.setCreateTime(LocalDateTime.now());
-        rawscrapRequestDetailDO.setCreator(null);
-    }
-
-    private void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO) {
-        // 校验--生产线基本信息
-        ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailCreateReqVO.getProductionLineCode());
-        detailCreateReqVO.setFromLocationCode(productionlineDO.getRawLocationCode());
-        // 校验--物品基本信息 BQ——>QI
-        ItembasicDO itembasic = validatorItembasic(detailCreateReqVO.getItemCode());
-        detailCreateReqVO.setItemDesc1(itembasic.getDesc1());
-        detailCreateReqVO.setItemDesc2(itembasic.getDesc2());
-        detailCreateReqVO.setItemName(itembasic.getName());
-        detailCreateReqVO.setProjectCode(itembasic.getProject());
-        detailCreateReqVO.setUom(itembasic.getUom());
-        // 校验--工位基础信息
-        if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){
-            WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode());
-            detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode());
-        }
-        // 校验--uom
-        // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom());
-        // 校验--物品类型 DBT---DBT2---IT1
-        jobUtils.ifInType(itembasic.getType(), businesstypeDO);
-        // 校验--来源库位 DBT——>DBT2——>LO
-        jobUtils.ifInToLocationType(detailCreateReqVO.getFromLocationCode(), businesstypeDO);
-        // 校验--库存状态 DBT——>DBT2——>ISO
-        // jobUtils.ifOutInventoryStatuses(detailCreateReqVO.getInventoryStatus(), businesstypeDO);
-        // 校验--库存余额 TB——>TB1
-//        List<String> business = validatorbusinessbasic(detailCreateReqVO.getInventoryStatus());
-//        List<BalanceDO> balance = validatorbalance(detailCreateReqVO.getItemCode(), detailCreateReqVO.getPackingNumber(),detailCreateReqVO.getBatch(), detailCreateReqVO.getFromLocationCode(), business);
-//        BalanceDO balanceDO = balance.get(0);
-//        productscrapRequestMainDO.setFromWarehouseCode(balanceDO.getWarehouseCode());
-//        productscrapRequestMainDO.setDueTime(balanceDO.getExpireDate());
-//        detailCreateReqVO.setFromLocationCode(balanceDO.getLocationCode());
-//        // 校验 报废数量【qty】不能大于库存数量【banlance.qty】
-//        validatorQty(detailCreateReqVO.getQty(), balanceDO.getQty());
-    }
-
     private ProductscrapRequestMainDO validateMainMethod(ProductscrapRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) {
         ProductscrapRequestMainDO productscrapRequestMainDO = ProductscrapRequestMainConvert.INSTANCE.convert(baseVO);
         RequestStatusState requestStatusState = new RequestStatusState();
@@ -376,7 +318,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
         List<ProductscrapRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
         if(subList!=null) {
             for (ProductscrapRequestDetailUpdateReqVO detailUpdateReqVO : subList) {
-                validateDetailMethod(detailUpdateReqVO, businesstypeDO, productputawayRequestMainDO);
+                // 子表数据校验
+                productscrapRequestDetailService.validateDetailMethod(detailUpdateReqVO, businesstypeDO, productputawayRequestMainDO);
             }
             List<ProductscrapRequestDetailDO> subDOList = ProductscrapRequestDetailConvert.INSTANCE.convertList05(subList);
             productscrapRequestDetailMapper.updateBatch(subDOList);
@@ -731,5 +674,28 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
         PageResult<ProductscrapRequestBomRespVO> pageResult = new PageResult(myPage.getRecords(),myPage.getTotal());
         return pageResult;
     }
+
+    @Transactional
+    @Override
+    public void updateProductscrapDetailRequestBom(Long id, List<RawscrapRequestDetailUpdateReqVO> updateReqVOList) {
+        // 删除之前的数据
+        LambdaQueryWrapper<RawscrapRequestDetailDO> requestDetailDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        requestDetailDOLambdaQueryWrapper.eq(RawscrapRequestDetailDO::getMasterId,id);
+        rawscrapRequestDetailMapper.delete(requestDetailDOLambdaQueryWrapper);
+        // 查询子表数据
+        ProductscrapRequestDetailDO productscrapRequestDetailDO = productscrapRequestDetailMapper.selectById(id);
+        ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(productscrapRequestDetailDO.getMasterId());
+        List<RawscrapRequestDetailDO> childList = new ArrayList<>();
+        for(RawscrapRequestDetailUpdateReqVO rawscrapRequestDetailUpdateReqVO:updateReqVOList){
+            RawscrapRequestDetailDO rawscrapRequestDetailDO = RawscrapRequestDetailConvert.INSTANCE.convert(rawscrapRequestDetailUpdateReqVO);
+            rawscrapRequestDetailDO.setMasterId(productscrapRequestDetailDO.getId());
+            rawscrapRequestDetailDO.setNumber(productscrapRequestDetailDO.getNumber());
+            // 校验--二级子表数据
+            rawscrapRequestDetailService.validateDetailbBom(rawscrapRequestDetailDO,productscrapRequestDetailDO,productscrapRequestMainDO);
+            rawscrapRequestDetailDO.setId(null);
+            childList.add(rawscrapRequestDetailDO);
+        }
+        rawscrapRequestDetailMapper.insertBatch(childList);
+    }
 }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailService.java

@@ -2,6 +2,8 @@ package com.win.module.wms.service.productscrapRequest;
 
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.productscrapRequest.vo.*;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
 import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO;
 
 import javax.validation.Valid;
@@ -77,5 +79,13 @@ public interface RawscrapRequestDetailService {
     * @param updatePart 是否支持更新
     * @return 导入结果
     */
-    public List<RawscrapRequestDetailExcelVO>  importRawscrapRequestDetailList(List<RawscrapRequestDetailExcelVO> datas, Integer mode, boolean updatePart);
+    List<RawscrapRequestDetailExcelVO>  importRawscrapRequestDetailList(List<RawscrapRequestDetailExcelVO> datas, Integer mode, boolean updatePart);
+
+    /**
+     * 校验子表数据
+     * @param rawscrapRequestDetailDO 请求数据
+     * @param detailDO 一级子表
+     * @param mainBo 主表
+     */
+    void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java

@@ -4,12 +4,19 @@ import cn.hutool.core.collection.CollUtil;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.productscrapRequest.vo.*;
 import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.balance.BalanceDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO;
 import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO;
 import com.win.module.wms.dal.mysql.productscrapRequest.RawscrapRequestDetailMapper;
+import com.win.module.wms.service.itembasic.ItembasicService;
+import com.win.module.wms.util.JobUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -29,6 +36,10 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe
 
     @Resource
     private RawscrapRequestDetailMapper rawscrapRequestDetailMapper;
+    @Resource
+    private ItembasicService itembasicService;
+    @Resource
+    private JobUtils jobUtils;
 
     @Override
     public Long createRawscrapRequestDetail(RawscrapRequestDetailCreateReqVO createReqVO) {
@@ -106,4 +117,27 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe
 
         return errorList;
     }
+
+    @Override
+    public void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo) {
+        // 校验--物品基本信息
+        ItembasicDO itembasicDO = itembasicService.selectItembasic(rawscrapRequestDetailDO.getItemCode());
+        // 赋值物品Item相关信息
+        rawscrapRequestDetailDO.setItemDesc1(itembasicDO.getDesc1());
+        rawscrapRequestDetailDO.setItemDesc2(itembasicDO.getDesc2());
+        rawscrapRequestDetailDO.setItemName(itembasicDO.getName());
+        rawscrapRequestDetailDO.setProjectCode(itembasicDO.getProject());
+        // 校验库存余额
+        List<String> inventoryStatus = new ArrayList<>();
+        inventoryStatus.add("OK");  // 查询合格的边料库存余额
+        List<BalanceDO> list = jobUtils.selectlocationReturnManagementAccuracy(rawscrapRequestDetailDO.getItemCode(),null,null,detailDO.getFromLocationCode(),inventoryStatus);
+        BalanceDO balanceDO = list.get(0); // 去第一条库存余额
+        rawscrapRequestDetailDO.setInventoryStatus(balanceDO.getInventoryStatus());
+        rawscrapRequestDetailDO.setBatch(balanceDO.getBatch());
+        rawscrapRequestDetailDO.setPackingNumber(balanceDO.getPackingNumber());
+        rawscrapRequestDetailDO.setFromLocationCode(balanceDO.getLocationCode());
+        rawscrapRequestDetailDO.setCreateTime(LocalDateTime.now());
+        rawscrapRequestDetailDO.setCreator(null);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -263,11 +263,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         purchasereceiptRecordMainDO.setActiveDate(LocalDateTime.now());
         purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime());
         purchasereceiptRecordMainDO.setAvailable("TRUE");
-        purchasereceiptRecordMainDO.setId(null);
+        purchasereceiptRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        purchasereceiptRecordMainDO.setCreateTime(null);
-        purchasereceiptRecordMainDO.setCreator(null);
-        purchasereceiptRecordMainDO.setUpdateTime(null);
-        purchasereceiptRecordMainDO.setUpdater(null);
         purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO);
         List<PurchasereceiptJobDetailUpdateReqVO> purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList();
         //收货记录子
@@ -311,11 +307,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());
                 purchasereceiptRecordDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice());
                 purchasereceiptRecordDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchasereceiptRecordDetailDO.getQty()));
-                purchasereceiptRecordDetailDO.setId(null);
+                purchasereceiptRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                purchasereceiptRecordDetailDO.setCreateTime(null);
-                purchasereceiptRecordDetailDO.setCreator(null);
-                purchasereceiptRecordDetailDO.setUpdateTime(null);
-                purchasereceiptRecordDetailDO.setUpdater(null);
                 purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO);
                 BigDecimal poQty = poQtyMap.get(purchasereceiptRecordDetailDO.getPoNumber() + "_" + purchasereceiptRecordDetailDO.getPoLine() + "_" + purchasereceiptRecordDetailDO.getItemCode());
                 if(poQty == null) {
@@ -363,11 +355,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());
                 purchaseshortageDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice());
                 purchaseshortageDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchaseshortageDetailDO.getQty()));
-                purchaseshortageDetailDO.setId(null);
+                purchaseshortageDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                purchaseshortageDetailDO.setCreateTime(null);
-                purchaseshortageDetailDO.setCreator(null);
-                purchaseshortageDetailDO.setUpdateTime(null);
-                purchaseshortageDetailDO.setUpdater(null);
                 purchaseshortageDetailDOList.add(purchaseshortageDetailDO);
             }
         }
@@ -479,18 +467,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 putawayRequestDetailCreateReqVO.setBatch(purchasereceiptRecordDetailDO.getToBatch());
                 putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode());
                 putawayRequestDetailCreateReqVO.setInventoryStatus("OK");
-                putawayRequestDetailCreateReqVO.setId(null);
+                putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                putawayRequestDetailCreateReqVO.setCreateTime(null);
-                putawayRequestDetailCreateReqVO.setCreator(null);
-                putawayRequestDetailCreateReqVO.setUpdateTime(null);
-                putawayRequestDetailCreateReqVO.setUpdater(null);
                 putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO);
             }
-            putawayRequestMainCreateReqVO.setId(null);
+            putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            putawayRequestMainCreateReqVO.setCreateTime(null);
-            putawayRequestMainCreateReqVO.setCreator(null);
-            putawayRequestMainCreateReqVO.setUpdateTime(null);
-            putawayRequestMainCreateReqVO.setUpdater(null);
             putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList);
             putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO);
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -514,11 +514,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
             purchasereceiptJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
             String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode());
             purchasereceiptJobMainDO.setNumber(number);
-            purchasereceiptJobMainDO.setId(null);
+            purchasereceiptJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            purchasereceiptJobMainDO.setCreateTime(null);
-            purchasereceiptJobMainDO.setCreator(null);
-            purchasereceiptJobMainDO.setUpdateTime(null);
-            purchasereceiptJobMainDO.setUpdater(null);
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
             purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode());
@@ -530,11 +526,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                 PurchasereceiptJobDetailDO purchasereceiptJobDetailDO = PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetailCreateReqVO);
                 purchasereceiptJobDetailDO.setNumber(number);
                 purchasereceiptJobDetailDO.setMasterId(purchasereceiptJobMainDO.getId());
-                purchasereceiptJobDetailDO.setId(null);
+                purchasereceiptJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-                purchasereceiptJobDetailDO.setCreateTime(null);
-                purchasereceiptJobDetailDO.setCreator(null);
-                purchasereceiptJobDetailDO.setUpdateTime(null);
-                purchasereceiptJobDetailDO.setUpdater(null);
                 purchasereceiptJobDetailDOList.add(purchasereceiptJobDetailDO);
                 //预计入
                 ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@@ -230,11 +230,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RETURN_RECORD.getCode());
         purchasereturnRecordMainDO.setNumber(number);
         purchasereturnRecordMainDO.setJobNumber(purchasereturnJobMainDO.getNumber());
-        purchasereturnRecordMainDO.setId(null);
+        purchasereturnRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        purchasereturnRecordMainDO.setCreateTime(null);
-        purchasereturnRecordMainDO.setCreator(null);
-        purchasereturnRecordMainDO.setUpdateTime(null);
-        purchasereturnRecordMainDO.setUpdater(null);
         purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         List<PurchasereturnJobDetailUpdateReqVO> purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList();
@@ -257,11 +253,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
             purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch());
             purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus());
             purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode());
-            purchasereturnRecordDetailDO.setId(null);
+            purchasereturnRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            purchasereturnRecordDetailDO.setCreateTime(null);
-            purchasereturnRecordDetailDO.setCreator(null);
-            purchasereturnRecordDetailDO.setUpdateTime(null);
-            purchasereturnRecordDetailDO.setUpdater(null);
             purchasereturnRecordDetailDOList.add(purchasereturnRecordDetailDO);
             //更新采购订单明细的退货数量
             purchaseMainService.updateOrderPurchaseReturnQty(purchasereturnRecordDetailDO.getPoNumber(), purchasereturnRecordDetailDO.getPoLine(), purchasereturnRecordDetailDO.getItemCode(), purchasereturnRecordDetailDO.getQty());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -120,7 +120,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         mainDO.setNumber(number);
         purchasereturnRequestMainMapper.insert(mainDO);
         for (PurchasereturnRequestDetailDO detailDO : subDOList) {
-            detailDO.setId(null);
+            detailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
             detailDO.setMasterId(mainDO.getId());
             detailDO.setNumber(number);
         }
@@ -373,11 +373,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         purchasereturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
         purchasereturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
         purchasereturnJobMainDO.setRequestTime(mainDO.getRequestTime());
-        purchasereturnJobMainDO.setId(null);
+        purchasereturnJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        purchasereturnJobMainDO.setCreateTime(null);
-        purchasereturnJobMainDO.setCreator(null);
-        purchasereturnJobMainDO.setUpdateTime(null);
-        purchasereturnJobMainDO.setUpdater(null);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode());
         purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
@@ -389,11 +385,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
             PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO);
             purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode());
             purchasereturnJobDetailDO.setNumber(number);
-            purchasereturnJobDetailDO.setId(null);
+            purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            purchasereturnJobDetailDO.setCreateTime(null);
-            purchasereturnJobDetailDO.setCreator(null);
-            purchasereturnJobDetailDO.setUpdateTime(null);
-            purchasereturnJobDetailDO.setUpdater(null);
             purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId());
             purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode());
             purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode());
@@ -450,7 +442,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         requestsettingAndBusinesstypeSet(mainDO);
         //子表校验
         for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) {
-            purchasereturnRequestDetailDO.setId(null);
+            purchasereturnRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
             validatorDetailMethod(purchasereturnRequestDetailDO, mainDO);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java

@@ -193,11 +193,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode());
         putawayRecordMainDO.setNumber(number);
         putawayRecordMainDO.setJobNumber(putawayJobMainDO.getNumber());
-        putawayRecordMainDO.setId(null);
+        putawayRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        putawayRecordMainDO.setCreator(null);
-        putawayRecordMainDO.setCreateTime(null);
-        putawayRecordMainDO.setUpdater(null);
-        putawayRecordMainDO.setUpdateTime(null);
         putawayRecordMainMapper.insert(putawayRecordMainDO);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob");
         //库存事务
@@ -218,11 +214,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
             putawayRecordDetailDO.setFromBatch(putawayJobDetailUpdateReqVO.getBatch());
             putawayRecordDetailDO.setToBatch(putawayJobDetailUpdateReqVO.getToBatch());
             putawayRecordDetailDO.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus());
-            putawayRecordDetailDO.setId(null);
+            putawayRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            putawayRecordDetailDO.setCreator(null);
-            putawayRecordDetailDO.setCreateTime(null);
-            putawayRecordDetailDO.setUpdater(null);
-            putawayRecordDetailDO.setUpdateTime(null);
             putawayRecordDetailDOList.add(putawayRecordDetailDO);
             //添加库存事务入list
             TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -359,11 +359,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
         putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
-        putawayJobMainDO.setId(null);
+        putawayJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-        putawayJobMainDO.setCreateTime(null);
-        putawayJobMainDO.setCreator(null);
-        putawayJobMainDO.setUpdateTime(null);
-        putawayJobMainDO.setUpdater(null);
         putawayJobMainMapper.insert(putawayJobMainDO);
         List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
         for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
@@ -373,11 +369,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             putawayJobDetailDO.setToLocationCode(locationDO.getCode());
             putawayJobDetailDO.setNumber(number);
             putawayJobDetailDO.setMasterId(putawayJobMainDO.getId());
-            putawayJobDetailDO.setId(null);
+            putawayJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
-            putawayJobDetailDO.setCreateTime(null);
-            putawayJobDetailDO.setCreator(null);
-            putawayJobDetailDO.setUpdateTime(null);
-            putawayJobDetailDO.setUpdater(null);
             putawayJobDetailDOList.add(putawayJobDetailDO);
             //预计出
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java

@@ -12,9 +12,11 @@ import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO;
 import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO;
 import com.win.module.wms.convert.transaction.TransactionConvert;
 import com.win.module.wms.convert.transferlog.TransferlogConvert;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.transaction.TransactionDO;
 import com.win.module.wms.dal.dataobject.transferlog.TransferlogDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
+import com.win.module.wms.dal.mysql.location.LocationMapper;
 import com.win.module.wms.dal.mysql.transaction.TransactionMapper;
 import com.win.module.wms.dal.mysql.transferlog.TransferlogMapper;
 import com.win.module.wms.service.rule.RuleService;
@@ -37,16 +39,14 @@ public class TransactionServiceImpl implements TransactionService {
 
     @Resource
     private TransactionMapper transactionMapper;
-
     @Resource
     private BalanceMapper balanceMapper;
-
     @Resource
     private TransferlogMapper transferlogMapper;
-
+    @Resource
+    private LocationMapper locationMapper;
     @Resource
     private RuleService ruleService;
-
     @Resource
     private SerialNumberApi serialNumberApi;
 
@@ -62,6 +62,10 @@ public class TransactionServiceImpl implements TransactionService {
             result += transactionMapper.insert(transactionDO);
             BalanceCreateReqVO balanceCreateReqVO = new BalanceCreateReqVO();
             BeanUtils.copyProperties(createReqVO, balanceCreateReqVO);
+            LocationDO locationDO = locationMapper.selectByCode(balanceCreateReqVO.getLocationCode());
+            balanceCreateReqVO.setWarehouseCode(locationDO.getWarehouseCode());
+            balanceCreateReqVO.setAreaCode(locationDO.getAreaCode());
+            balanceCreateReqVO.setLocationGroupCode(locationDO.getLocationGroupCode());
             balanceCreateReqVO.setLastTransNumber(number);
             RuleRespVO ruleRespVO = ruleService.warehouseStorage(createReqVO.getLocationCode());
             balanceMapper.updateBalanceQty(balanceCreateReqVO, ruleRespVO, createReqVO.getInventoryAction());

win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper">
 
     <!-- 盘点记录未盘平数量-->
-    <select id="getDifferenceCount" resultType="Long" parameterType="String">
+    <select id="getDifferenceCount" parameterType="String" resultType="Long">
         SELECT COUNT(1) FROM record_count_detail d1,(
             SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
                 SELECT id FROM record_count_main WHERE request_number=#{requestNumber}
@@ -12,8 +12,8 @@
     </select>
 
     <!-- 盘点记录未盘平数据-->
-    <select id="getDifferenceCount" resultType="CountRecordDetailDO" parameterType="String">
+    <select id="getDifferenceList" parameterType="String" resultType="com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO">
-        SELECT d1.* FROM record_count_detail d1,(
+        SELECT * FROM record_count_detail d1,(
             SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN (
                 SELECT id FROM record_count_main WHERE request_number=#{requestNumber}
             ) GROUP BY master_id,count_detail_number