盘点申请接口。

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

@@ -197,6 +197,15 @@ public class CountRequestMainController {
         return success(count > 0);
     }
 
+    @PutMapping("/reAdd")
+    @Operation(summary = "重新添加采购收货申请主")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:reAdd')")
+    public CommonResult<Boolean> openCountRequestMain(@RequestParam("id") Long id) {
+        Integer count = countRequestMainService.reAddCountRequestMain(id);
+        return success(count > 0);
+    }
+
     @PutMapping("/submit")
     @Operation(summary = "提交盘点申请主")
     @Parameter(name = "id", description = "编号", required = true)
@@ -224,12 +233,12 @@ public class CountRequestMainController {
         return success(count > 0);
     }
 
-    @PutMapping("/abort")
+    @PutMapping("/refused")
     @Operation(summary = "审批拒绝盘点申请主")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('wms:count-request-main:abort')")
-    public CommonResult<Boolean> abortCountRequestMain(@RequestParam("id") Long id) {
-        Integer count = countRequestMainService.abortCountRequestMain(id);
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:refused')")
+    public CommonResult<Boolean> refusedCountRequestMain(@RequestParam("id") Long id) {
+        Integer count = countRequestMainService.refusedCountRequestMain(id);
         return success(count > 0);
     }
 

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

@@ -86,6 +86,14 @@ public interface CountRequestMainService {
      */
     Integer closeCountRequestMain(Long id);
 
+    /**
+     * 重新添加盘点申请主
+     *
+     * @param id 退货申请主ID
+     * @return 更新数量
+     */
+    Integer reAddCountRequestMain(Long id);
+
     /**
      * 提交盘点申请主
      *
@@ -109,12 +117,12 @@ public interface CountRequestMainService {
      */
     Integer handleCountRequestMain(Long id);
     /**
-     * 审批拒绝盘点申请主
+     * 审批驳回盘点申请主
      *
      * @param id 盘点申请主ID
      * @return 更新数量
      */
-    Integer abortCountRequestMain(Long id);
+    Integer refusedCountRequestMain(Long id);
     /**
      * 生成重盘任务
      *

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

@@ -277,6 +277,21 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
         return countRequestMainMapper.updateById(mainDO);
     }
 
+    @Override
+    @Transactional
+    public Integer reAddCountRequestMain(Long id) {
+        // 校验存在存在下级单据
+        CountRequestMainDO mainDO = validateCountRequestMainExists(id);
+        RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
+        boolean flag = requestStatusState.reAdd();
+        if (!flag) {
+            throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_RE_ADD);
+        }
+        mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
+        trendsApi.createTrends(id, "countRequest", "打开了盘点申请", TrendsTypeEnum.UPDATE);
+        return countRequestMainMapper.updateById(mainDO);
+    }
+
     @Override
     @Transactional
     public Integer submitCountRequestMain(Long id) {
@@ -334,7 +349,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
 
     @Override
     @Transactional
-    public Integer abortCountRequestMain(Long id) {
+    public Integer refusedCountRequestMain(Long id) {
         // 校验存在
         CountRequestMainDO mainDO = validateCountRequestMainExists(id);
         RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java

@@ -55,7 +55,7 @@ public interface CountadjustRequestMainService {
     Integer closeCountadjustRequestMain(Long id);
 
     /**
-     * 重新添加退货申请主
+     * 重新添加盘点调整申请主
      *
      * @param id 退货申请主ID
      * @return 更新数量