重盘、监盘和bug修复。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@@ -233,4 +233,12 @@ public class CountRequestMainController {
         return success(count > 0);
     }
 
+    @PutMapping("/reCount")
+    @Operation(summary = "重盘")
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:reCount')")
+    public CommonResult<Boolean> createReCountJob(@Valid @RequestBody CountRequestMainUpdateReqVO updateReqVO) {
+        int result = countRequestMainService.createReCountJob(updateReqVO);
+        return success(result > 0);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java

@@ -81,4 +81,16 @@ public class CountRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+
+    @Schema(description = "初盘任务状态")
+    private String jobStatus1;
+
+    @Schema(description = "重盘任务状态")
+    private String jobStatus2;
+
+    @Schema(description = "监盘任务状态")
+    private String jobStatus3;
+
+    @Schema(description = "生成盘点调整状态")
+    private String countAdjustStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainUpdateReqVO.java

@@ -1,12 +1,24 @@
 package com.win.module.wms.controller.countRequest.vo;
 
+import com.win.framework.excel.core.annotations.SubObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 盘点申请主更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CountRequestMainUpdateReqVO extends CountRequestMainBaseVO {
 
+    @Schema(description = "类型")
+    private String type;
+
+    @Schema(description = "数量")
+    private Integer count;
+
+    @SubObject
+    @Schema(description = "子表数据")
+    private List<CountRequestDetailUpdateReqVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -143,14 +143,14 @@ public class InspectJobMainController {
     public CommonResult<InspectJobMainRespVO> getInspectJobById(@RequestParam("id") Long id) {
         InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
         InspectJobMainRespVO result = InspectJobMainConvert.INSTANCE.convert(inspectJobMain);
-        if(result==null) {
-            return success(result);
-        };
+        if(result == null) {
+            return success(null);
+        }
         InspectJobDetailExportReqVO inspectJobDetailExportReqVO = new InspectJobDetailExportReqVO();
         inspectJobDetailExportReqVO.setMasterId(result.getId());
         List<InspectJobDetailDO> inspectJobDetailList = inspectJobDetailService.getInspectJobDetailList(inspectJobDetailExportReqVO);
-        List<InspectJobDetailExcelVO> inspectJobDetailExcelVOS = InspectJobDetailConvert.INSTANCE.convertList02(inspectJobDetailList);
-        result.setSubList(inspectJobDetailExcelVOS);
+        List<InspectJobDetailRespVO> inspectJobDetailRespVOList = InspectJobDetailConvert.INSTANCE.convertList(inspectJobDetailList);
+        result.setSubList(inspectJobDetailRespVOList);
         return success(result);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java

@@ -12,5 +12,5 @@ import java.util.List;
 public class InspectJobMainRespVO extends InspectJobMainBaseVO {
 
     @Schema(description = "检验任务任务子表job_inspect_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
+    private List<InspectJobDetailRespVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countRequest/CountRequestDetailConvert.java

@@ -35,6 +35,8 @@ public interface CountRequestDetailConvert {
 
     List<CountRequestDetailDO> convertList03(List<CountRequestDetailCreateReqVO> list);
 
+    List<CountRequestDetailDO> convertList04(List<CountRequestDetailUpdateReqVO> list);
+
     CountRequestDetailCreateReqVO convert1(CountRequestDetailDO bean);
 
     @Mappings({

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -79,8 +79,6 @@ public class CountRequestMainDO extends BaseDO {
     private String departmentCode;
     /**
      * 状态
-     *
-     * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
     /**
@@ -107,5 +105,20 @@ public class CountRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
-
+    /**
+     * 初盘任务状态
+     */
+    private String jobStatus1;
+    /**
+     * 重盘任务状态
+     */
+    private String jobStatus2;
+    /**
+     * 监盘任务状态
+     */
+    private String jobStatus3;
+    /**
+     * 生成盘点调整状态1不可生成2可生成3已生成4不需要生成
+     */
+    private String countAdjustStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.mysql.countRequest;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
@@ -48,9 +49,39 @@ public interface CountRequestDetailMapper extends BaseMapperX<CountRequestDetail
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
 
+    /**
+     * 根据主表id查询全部
+     * @param masterId 主表id
+     * @return 子表数据
+     */
     default List<CountRequestDetailDO> selectList(Long masterId) {
         return selectList(new LambdaQueryWrapperX<CountRequestDetailDO>()
                 .eq(CountRequestDetailDO::getMasterId, masterId));
     }
 
+    /**
+     * 根据主表id随机查询
+     * @param masterId 主表id
+     * @param count 查询数量
+     * @return 子表数据
+     */
+    default List<CountRequestDetailDO> selectList(Long masterId, int count) {
+        QueryWrapper<CountRequestDetailDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("master_id", masterId);
+        queryWrapper.orderByDesc("RAND()");
+        queryWrapper.last("LIMIT " + count);
+        return selectList(queryWrapper);
+    }
+
+    /**
+     * 根据主表id随机查询
+     * @param masterId 主表id
+     * @return 子表数据
+     */
+    default List<CountRequestDetailDO> selectDifferenceList(Long masterId) {
+        QueryWrapper<CountRequestDetailDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("master_id", masterId);
+        return selectList(queryWrapper);
+    }
+
 }

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

@@ -115,5 +115,18 @@ public interface CountRequestMainService {
      * @return 更新数量
      */
     Integer abortCountRequestMain(Long id);
-
+    /**
+     * 生成重盘任务
+     *
+     * @param updateReqVO 盘点申请
+     * @return 更新数量
+     */
+    Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO);
+    /**
+     * 生成监盘务
+     *
+     * @param updateReqVO 盘点申请
+     * @return 更新数量
+     */
+    Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO);
 }

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

@@ -311,6 +311,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             throw new ServiceException(COUNT_REQUEST_CANNOT_HANDLE);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());
+        mainDO.setJobStatus1("1");
         //调用执行方法
         this.generateJob(mainDO, countRequestDetailMapper.selectList(mainDO.getId()));
         trendsApi.createTrends(id, "countRequest", "执行了盘点申请", TrendsTypeEnum.UPDATE);
@@ -332,6 +333,38 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
         return countRequestMainMapper.updateById(mainDO);
     }
 
+    @Override
+    public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) {
+        CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
+        mainDO.setStage("RECOUNT");//重盘
+        mainDO.setJobStatus2("1");
+        List<CountRequestDetailDO> detailDOList;
+        if(updateReqVO.getType().equals("1")) {//全部
+            detailDOList = countRequestDetailMapper.selectList(updateReqVO.getId());
+        } else if(updateReqVO.getType().equals("2")) {//差异
+            detailDOList = countRequestDetailMapper.selectDifferenceList(updateReqVO.getId());
+        } else {//选择
+            detailDOList = CountRequestDetailConvert.INSTANCE.convertList04(updateReqVO.getSubList());
+        }
+        this.generateJob(mainDO, detailDOList);
+        return countRequestMainMapper.updateById(mainDO);
+    }
+
+    @Override
+    public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) {
+        CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
+        mainDO.setStage("AUDIT_COUNT");//监盘
+        mainDO.setJobStatus2("1");
+        List<CountRequestDetailDO> detailDOList;
+        if(updateReqVO.getType().equals("1")) {//数量
+            detailDOList = countRequestDetailMapper.selectList(updateReqVO.getId(), updateReqVO.getCount());
+        } else {//选择
+            detailDOList = CountRequestDetailConvert.INSTANCE.convertList04(updateReqVO.getSubList());
+        }
+        this.generateJob(mainDO, detailDOList);
+        return countRequestMainMapper.updateById(mainDO);
+    }
+
     /**
      * 生成盘点任务
      * @param mainDO 盘点申请主

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

@@ -329,7 +329,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord");
             putawayRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
-            int result = putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
+            putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
             for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
                 PutawayRecordDetailCreateReqVO putawayRecordDetailCreateReqVO = new PutawayRecordDetailCreateReqVO();
                 BeanUtils.copyProperties(putawayRequestDetailDO, putawayRecordDetailCreateReqVO);
@@ -359,6 +359,11 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
         putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
+        putawayJobMainDO.setId(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) {
@@ -367,7 +372,12 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             LocationDO locationDO = locationService.inspectLocation(groundingRuleRespVO, putawayRequestDetailDO.getItemCode(), putawayJobDetailDO.getBatch(), putawayJobDetailDO.getInventoryStatus());
             putawayJobDetailDO.setToLocationCode(locationDO.getCode());
             putawayJobDetailDO.setNumber(number);
-            putawayJobDetailDO.setMasterId(putawayJobDetailDO.getId());
+            putawayJobDetailDO.setMasterId(putawayJobMainDO.getId());
+            putawayJobDetailDO.setId(null);
+            putawayJobDetailDO.setCreateTime(null);
+            putawayJobDetailDO.setCreator(null);
+            putawayJobDetailDO.setUpdateTime(null);
+            putawayJobDetailDO.setUpdater(null);
             putawayJobDetailDOList.add(putawayJobDetailDO);
             //预计出
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();