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());
+                if(!"".equals(mainDO.getAcceptUserId()) && mainDO.getAcceptUserId() != null){
                     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/productdismantleRecord/ProductdismantleRecordMainController.java

@@ -3,13 +3,17 @@ package com.win.module.wms.controller.productdismantleRecord;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.dict.core.util.DictFrameworkUtils;
 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.productdismantleRecord.vo.*;
 import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
 import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO;
+import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService;
 import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -22,8 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collection;
+import java.util.*;
-import java.util.List;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -34,6 +37,8 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 @Validated
 public class ProductdismantleRecordMainController {
 
+    @Resource
+    private ProductdismantleRecordDetailaService productdismantleRecordDetailaService;
     @Resource
     private ProductdismantleRecordMainService productdismantleRecordMainService;
 
@@ -104,21 +109,54 @@ public class ProductdismantleRecordMainController {
         return success(result);
     }
 
+    private List<ProductdismantleRecordMainExcelVO> getExcelVo(List<ProductdismantleRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] useOnTheWayLocation = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(20, useOnTheWayLocation);
+        String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
+        mapDropDown.put(35, inventoryStatus);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(43, uom);
+        List<ProductdismantleRecordMainExcelVO> resultList = new ArrayList<>();
+        // 导出
+        for(ProductdismantleRecordMainDO mainDO : list) {
+            List<ProductdismantleRecordDetailaDO> subList = productdismantleRecordDetailaService.selectList(mainDO.getId());
+            for(ProductdismantleRecordDetailaDO detailDO : subList) {
+                ProductdismantleRecordMainExcelVO vo = ProductdismantleRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
+                AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator()));
+                vo.setCreator(user.getNickname());
+                vo.setUpdater(user.getNickname());
+                resultList.add(vo);
+            }
+        }
+        return resultList;
+    }
+
     @GetMapping("/export-excel")
-    @Operation(summary = "导出制品拆解记录主 Excel")
+    @Operation(summary = "导出制品拆解记录 Excel")
     @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:export')")
     @OperateLog(type = EXPORT)
     public void exportProductdismantleRecordMainExcel(@Valid ProductdismantleRecordMainExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
+
         List<ProductdismantleRecordMainDO> list = productdismantleRecordMainService.getProductdismantleRecordMainList(exportReqVO);
+        //组装vo
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductdismantleRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
         // 导出 Excel
-        List<ProductdismantleRecordMainExcelVO> datas = ProductdismantleRecordMainConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "制品拆解记录.xlsx", "制品拆解记录", ProductdismantleRecordMainExcelVO.class, resultList, mapDropDown);
-        for(ProductdismantleRecordMainExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
     }
-        ExcelUtils.write(response, "制品拆解记录主.xls", "数据", ProductdismantleRecordMainExcelVO.class, datas);
+
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出制品拆解记录 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductdismantleRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ProductdismantleRecordMainDO> list = productdismantleRecordMainService.getProductdismantleRecordMainList(conditions);
+        //组装vo
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductdismantleRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        // 导出 Excel
+        ExcelUtils.write(response, "制品拆解记录.xlsx", "制品拆解记录", ProductdismantleRecordMainExcelVO.class, resultList, mapDropDown);
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExportReqVO.java

@@ -99,4 +99,8 @@ public class ProductdismantleRecordDetailaExportReqVO {
     @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/productdismantleRecord/vo/ProductdismantleRecordDetailaPageReqVO.java

@@ -101,4 +101,7 @@ public class ProductdismantleRecordDetailaPageReqVO 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/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.controller.productdismantleRecord.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import com.win.module.wms.enums.DictTypeConstants;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -49,10 +50,6 @@ public class ProductdismantleRecordMainExcelVO {
     @ExcelProperty("部门")
     private String departmentCode;
 
-    @ExcelProperty(value = "接口类型", converter = DictConvert.class)
-    @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private String interfaceType;
-
     @ExcelProperty("单据号")
     private String number;
 
@@ -68,20 +65,88 @@ public class ProductdismantleRecordMainExcelVO {
     @ExcelProperty("创建者Id")
     private String creator;
 
-    @ExcelProperty("代码")
-    private String code;
-
     @ExcelProperty("从仓库代码")
     private String fromWarehouseCode;
 
-    @ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
+    @ExcelProperty("从库位类型范围")
-    @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String fromLocationTypes;
 
     @ExcelProperty("从库区代码范围")
     private String fromAreaCodes;
 
-    @ExcelProperty("是否可用")
+    @ExcelProperty(value = "是否可用", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String available;
 
+    @ExcelProperty("最后更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("最后更新者Id")
+    private String updater;
+
+    @ExcelProperty("生产线代码")
+    private String productionLineCode;
+
+    @ExcelProperty("工位代码")
+    private String workStationCode;
+
+    @ExcelProperty("工序代码")
+    private String processCode;
+
+    @ExcelProperty("包装号")
+    private String packingNumber;
+
+    @ExcelProperty("器具号")
+    private String containerNumber;
+
+    @ExcelProperty("批次")
+    private String batch;
+
+    @ExcelProperty("生产日期")
+    private String produceDate;
+
+    @ExcelProperty("过期日期")
+    private String expireDate;
+
+    @ExcelProperty("从库位代码")
+    private String fromLocationCode;
+
+    @ExcelProperty("从库位组代码")
+    private String fromLocationGroupCode;
+
+    @ExcelProperty("从库区代码")
+    private String fromAreaCode;
+
+    @ExcelProperty("从货主代码")
+    private String fromOwnerCode;
+
+    @ExcelProperty(value = "库存状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.INVENTORY_STATUS)
+    private String inventoryStatus;
+
+    @ExcelProperty("BOM版本")
+    private String bomVersion;
+
+    @ExcelProperty("物品代码")
+    private String itemCode;
+
+    @ExcelProperty("物品名称")
+    private String itemName;
+
+    @ExcelProperty("物品描述1")
+    private String itemDesc1;
+
+    @ExcelProperty("物品描述2")
+    private String itemDesc2;
+
+    @ExcelProperty("项目代码")
+    private String projectCode;
+
+    @ExcelProperty("数量")
+    private String qty;
+
+    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.UOM)
+    private String uom;
+
 }

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/convert/productdismantleRecord/ProductdismantleRecordMainConvert.java

@@ -5,8 +5,11 @@ import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleR
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExcelVO;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainRespVO;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
 import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
@@ -33,4 +36,13 @@ public interface ProductdismantleRecordMainConvert {
 
     List<ProductdismantleRecordMainExcelVO> convertList02(List<ProductdismantleRecordMainDO> list);
 
+    @Mappings({
+            @Mapping(source = "mainDO.number", target = "number"),
+            @Mapping(source = "mainDO.remark", target = "remark"),
+            @Mapping(source = "mainDO.createTime", target = "createTime"),
+            @Mapping(source = "mainDO.creator", target = "creator"),
+            @Mapping(source = "mainDO.updateTime", target = "updateTime"),
+            @Mapping(source = "mainDO.updater", target = "updater"),
+    })
+    ProductdismantleRecordMainExcelVO convert(ProductdismantleRecordMainDO mainDO, ProductdismantleRecordDetailaDO 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/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/productdismantleRecord/ProductdismantleRecordDetailaMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO;
+import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO;
 import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,6 +23,7 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX<Product
 
     default PageResult<ProductdismantleRecordDetailaDO> selectPage(ProductdismantleRecordDetailaPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductdismantleRecordDetailaDO>()
+                .eqIfPresent(ProductdismantleRecordDetailaDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getWorkStationCode, reqVO.getWorkStationCode())
@@ -58,6 +60,7 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX<Product
 
     default List<ProductdismantleRecordDetailaDO> selectList(ProductdismantleRecordDetailaExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRecordDetailaDO>()
+                .eqIfPresent(ProductdismantleRecordDetailaDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getWorkStationCode, reqVO.getWorkStationCode())
@@ -88,4 +91,8 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX<Product
                 .orderByDesc(ProductdismantleRecordDetailaDO::getId));
     }
 
+    default List<ProductdismantleRecordDetailaDO> selectList(Long masterId) {
+        return selectList(new LambdaQueryWrapperX<ProductdismantleRecordDetailaDO>()
+                .eq(ProductdismantleRecordDetailaDO::getMasterId, masterId));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordMainMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExportReqVO;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainPageReqVO;
+import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
 import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -76,4 +77,7 @@ public interface ProductdismantleRecordMainMapper extends BaseMapperX<Productdis
                 .orderByDesc(ProductdismantleRecordMainDO::getId));
     }
 
+    default List<ProductdismantleRecordMainDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

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

@@ -121,6 +121,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     }
 
     @Override
+    @Transactional
     public Integer acceptCountJobMain(Long id) {
         CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id);
         JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
@@ -138,6 +139,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     }
 
     @Override
+    @Transactional
     public Integer abandonCountJobMain(Long id) {
         CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id);
         JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
@@ -166,6 +168,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     }
 
     @Override
+    @Transactional
     public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) {
         //查询数据
         CountJobMainDO countJobMainDO = this.validateCountJobMainExists(countJobMainUpdateReqVO.getId());
@@ -192,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();
@@ -212,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) {
@@ -224,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/countPlan/CountPlanMainServiceImpl.java

@@ -83,6 +83,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     private SchedulerManager schedulerManager;
 
     @Override
+    @Transactional
     public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) {
         if(!createReqVO.getType().equals("MANUAL")) {
             if (!CronUtils.isValid(createReqVO.getCrontab())) {
@@ -105,6 +106,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     }
 
     @Override
+    @Transactional
     public int updateCountPlanMain(CountPlanMainUpdateReqVO updateReqVO) {
         // 校验存在
         validateCountPlanMainExists(updateReqVO.getId());
@@ -115,6 +117,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
     }
 
     @Override
+    @Transactional
     public int deleteCountPlanMain(Long id) {
         // 校验存在
         validateCountPlanMainExists(id);
@@ -306,6 +309,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
      * @param mainDO 盘点申请主
      */
     @Override
+    @Transactional
     public void generateRequest(CountPlanMainDO mainDO) {
         List<CountPlanDetailDO> detailDOList = countPlanDetailMapper.selectList(mainDO.getId());
         List<BalanceDO> balanceDOList = this.getBalanceDOList(detailDOList);

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

@@ -11,6 +11,7 @@ import com.win.module.wms.convert.countRequest.CountRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO;
 import com.win.module.wms.dal.mysql.countRequest.CountRequestDetailMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -35,6 +36,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
     private TrendsApi trendsApi;
 
     @Override
+    @Transactional
     public Long createCountRequestDetail(CountRequestDetailCreateReqVO createReqVO) {
         // 插入
         CountRequestDetailDO countRequestDetailDO = CountRequestDetailConvert.INSTANCE.convert(createReqVO);
@@ -45,6 +47,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
     }
 
     @Override
+    @Transactional
     public int updateCountRequestDetail(CountRequestDetailUpdateReqVO updateReqVO) {
         // 校验存在
         validateCountRequestDetailExists(updateReqVO.getId());
@@ -55,6 +58,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
     }
 
     @Override
+    @Transactional
     public int deleteCountRequestDetail(Long id) {
         // 校验存在
         CountRequestDetailDO countRequestDetailDO = validateCountRequestDetailExists(id);

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

@@ -344,6 +344,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
     }
 
     @Override
+    @Transactional
     public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) {
         CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
         mainDO.setStage("RECOUNT");//重盘
@@ -361,6 +362,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
     }
 
     @Override
+    @Transactional
     public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) {
         CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
         mainDO.setStage("AUDIT_COUNT");//监盘
@@ -416,13 +418,9 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
             countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
             countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
+            countJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
             String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode());
             countJobMainDO.setNumber(number);
-            countJobMainDO.setId(null);
-            countJobMainDO.setCreateTime(null);
-            countJobMainDO.setCreator(null);
-            countJobMainDO.setUpdateTime(null);
-            countJobMainDO.setUpdater(null);
             countJobMainMapper.insert(countJobMainDO);
             List<CountJobDetailDO> countJobDetailDOList = new ArrayList<>();
             List<CountRequestDetailDO> countRequestDetailDOList = listMap.get(mapKey);
@@ -432,6 +430,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
                     CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO);
                     countJobDetailDO.setNumber(number);
                     countJobDetailDO.setMasterId(countJobMainDO.getId());
+                    countJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
                     countJobDetailDOList.add(countJobDetailDO);
                 }
             }
@@ -446,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());
@@ -460,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;
@@ -483,11 +478,7 @@ 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());

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/InspectRequestDetailServiceImpl.java

@@ -22,6 +22,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -56,6 +57,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
     private TrendsApi trendsApi;
 
     @Override
+    @Transactional
     public Long createInspectRequestDetail(InspectRequestDetailCreateReqVO createReqVO) {
         // 插入
         InspectRequestDetailDO inspectRequestDetail = InspectRequestDetailConvert.INSTANCE.convert(createReqVO);
@@ -69,6 +71,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
     }
 
     @Override
+    @Transactional
     public int updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) {
         // 校验存在
         validateInspectRequestDetailExists(updateReqVO.getId());
@@ -79,6 +82,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
     }
 
     @Override
+    @Transactional
     public int deleteInspectRequestDetail(Long id) {
         // 校验存在
         InspectRequestDetailDO inspectRequestDetailDO = validateInspectRequestDetailExists(id);

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/productdismantleRecord/ProductdismantleRecordDetailaService.java

@@ -82,4 +82,5 @@ public interface ProductdismantleRecordDetailaService {
      */
     PageResult<ProductdismantleRecordDetailaDO> getProductdismantleRecordDetailaSenior(CustomConditions conditions);
 
+    List<ProductdismantleRecordDetailaDO> selectList(Long id);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java

@@ -87,4 +87,9 @@ public class ProductdismantleRecordDetailaServiceImpl implements Productdismantl
         return productdismantleRecordDetailaMapper.selectSenior(conditions);
     }
 
+    @Override
+    public List<ProductdismantleRecordDetailaDO> selectList(Long masterId) {
+        return productdismantleRecordDetailaMapper.selectList(masterId);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainService.java

@@ -82,4 +82,5 @@ public interface ProductdismantleRecordMainService {
      */
     List<ProductdismantleRecordMainDO> getProductdismantleRecordMainList(ProductdismantleRecordMainExportReqVO exportReqVO);
 
+    List<ProductdismantleRecordMainDO> getProductdismantleRecordMainList(CustomConditions conditions);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java

@@ -88,4 +88,9 @@ public class ProductdismantleRecordMainServiceImpl implements ProductdismantleRe
         return productdismantleRecordMainMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public List<ProductdismantleRecordMainDO> getProductdismantleRecordMainList(CustomConditions conditions) {
+        return productdismantleRecordMainMapper.selectSeniorList(conditions);
+    }
+
 }

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

@@ -117,7 +117,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
      * @param ppoLine       订单行
      * @return 供应商发货记录子
      */
-    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) {
+    private SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) {
         SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode, pnumber, pitemCode, ppoNumber, ppoLine);
         if (supplierdeliverRecordDetailDO != null) {
             return supplierdeliverRecordDetailDO;
@@ -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/PurchasereturnRequestDetailServiceImpl.java

@@ -16,6 +16,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.itempackaging.ItempackagingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -46,6 +47,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
     private ItempackagingService itempackagingService;
 
     @Override
+    @Transactional
     public Long createPurchasereturnRequestDetail(PurchasereturnRequestDetailCreateReqVO createReqVO) {
         // 插入
         PurchasereturnRequestDetailDO purchasereturnRequestDetailDO = PurchasereturnRequestDetailConvert.INSTANCE.convert(createReqVO);
@@ -57,6 +59,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
     }
 
     @Override
+    @Transactional
     public void updatePurchasereturnRequestDetail(PurchasereturnRequestDetailUpdateReqVO updateReqVO) {
         // 校验存在
         validatePurchasereturnRequestDetailExists(updateReqVO.getId());
@@ -66,6 +69,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
     }
 
     @Override
+    @Transactional
     public void deletePurchasereturnRequestDetail(Long id) {
         // 校验存在
         validatePurchasereturnRequestDetailExists(id);

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

@@ -110,6 +110,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
     private JobsettingService jobsettingService;
 
     @Override
+    @Transactional
     public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) {
         PurchasereturnRequestMainDO mainDO = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO);
         List<PurchasereturnRequestDetailDO> subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
@@ -119,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);
         }
@@ -134,6 +135,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
     }
 
     @Override
+    @Transactional
     public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) {
         // 校验存在
         validatePurchasereturnRequestMainExists(updateReqVO.getId());
@@ -169,6 +171,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
     }
 
     @Override
+    @Transactional
     public List<PurchasereturnRequestImportErrorVO> importPurchasereturnRequestList(List<PurchasereturnRequestMainCreateReqVO> datas, Integer mode, boolean updatePart) {
         if (CollUtil.isEmpty(datas)) {
             throw exception(PURCHASERETURN_REQUEST_IMPORT_LIST_IS_EMPTY);
@@ -370,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());
@@ -386,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());
@@ -447,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/PutawayRequestDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
 import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -31,6 +32,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
     private PutawayRequestDetailMapper putawayRequestDetailMapper;
 
     @Override
+    @Transactional
     public Long createPutawayRequestDetail(PutawayRequestDetailCreateReqVO createReqVO) {
         // 插入
         PutawayRequestDetailDO putawayRequestDetail = PutawayRequestDetailConvert.INSTANCE.convert(createReqVO);
@@ -43,6 +45,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
         return putawayRequestDetailMapper.selectSenior(conditions);
     }
     @Override
+    @Transactional
     public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) {
         // 校验存在
         validatePutawayRequestDetailExists(updateReqVO.getId());
@@ -52,6 +55,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
     }
 
     @Override
+    @Transactional
     public void deletePutawayRequestDetail(Long id) {
         // 校验存在
         validatePutawayRequestDetailExists(id);

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/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