From ab8b980f788fae064ccdc2b0d810b31e34f73872 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 13 Dec 2023 19:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countRecord/vo/CountRecordDetailBaseVO.java      |  3 ---
 .../countRecord/vo/CountRecordDetailExportReqVO.java |  3 ---
 .../countRecord/vo/CountRecordDetailPageReqVO.java   |  3 ---
 .../dataobject/countRecord/CountRecordDetailDO.java  |  4 ----
 .../mysql/countRecord/CountRecordDetailMapper.java   |  2 --
 .../countRecord/CountRecordMainServiceImpl.java      | 12 ++++++++++++
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java
index 9e39012e..425bdc6b 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java
@@ -96,9 +96,6 @@ public class CountRecordDetailBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
-    @Schema(description = "创建者Id")
-    private String creatorId;
-
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java
index de2a6fe4..1a09c509 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java
@@ -90,9 +90,6 @@ public class CountRecordDetailExportReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "创建者Id")
-    private String creatorId;
-
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java
index d00482bf..fb0c8c8f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java
@@ -95,9 +95,6 @@ public class CountRecordDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "创建者Id")
-    private String creatorId;
-
     @Schema(description = "任务明细ID")
     private String jobDetailId;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java
index ea3086b5..b9ec8659 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java
@@ -134,10 +134,6 @@ public class CountRecordDetailDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
-     * 创建者Id
-     */
-    private String creatorId;
     /**
      * 地点ID
      */
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java
index 576e7893..adb2152e 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java
@@ -48,7 +48,6 @@ public interface CountRecordDetailMapper extends BaseMapperX<CountRecordDetailDO
                 .eqIfPresent(CountRecordDetailDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(CountRecordDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordDetailDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(CountRecordDetailDO::getCreatorId, reqVO.getCreatorId())
                 .eqIfPresent(CountRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(CountRecordDetailDO::getId));
     }
@@ -82,7 +81,6 @@ public interface CountRecordDetailMapper extends BaseMapperX<CountRecordDetailDO
                 .eqIfPresent(CountRecordDetailDO::getItemCode, reqVO.getItemCode())
                 .eqIfPresent(CountRecordDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountRecordDetailDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(CountRecordDetailDO::getCreatorId, reqVO.getCreatorId())
                 .eqIfPresent(CountRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(CountRecordDetailDO::getId));
     }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java
index faf3b1d1..2de06e81 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java
@@ -17,11 +17,13 @@ import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
 import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
 import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO;
+import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper;
 import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper;
 import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper;
 import com.win.module.wms.enums.request.RequestStatusEnum;
+import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -54,6 +56,8 @@ public class CountRecordMainServiceImpl implements CountRecordMainService {
     @Resource
     private CountadjustRequestDetailMapper countadjustRequestDetailMapper;
     @Resource
+    private RequestsettingService requestsettingService;
+    @Resource
     private TrendsApi trendsApi;
     @Resource
     private JobUtils jobUtils;
@@ -100,6 +104,7 @@ public class CountRecordMainServiceImpl implements CountRecordMainService {
     }
 
     @Override
+    @Transactional
     public int generateCountadjustRequest(Long countRecordMainId) {
         CountRecordMainDO countRecordMainDO = countRecordMainMapper.selectById(countRecordMainId);
         CountadjustRequestMainDO countadjustRequestMainDOExists = countadjustRequestMainMapper.selectByCountRecordNumber(countRecordMainDO.getNumber());
@@ -135,8 +140,15 @@ public class CountRecordMainServiceImpl implements CountRecordMainService {
         if(!countadjustRequestDetailDOList.isEmpty()) {
             CountadjustRequestMainDO countadjustRequestMainDO = new CountadjustRequestMainDO();
             BeanUtils.copyProperties(countRecordMainDO, countadjustRequestMainDO);
+            RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("CountAdjustRequest");
+            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjustRequest");
             String adjustNumber = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_REQUEST.getCode());
             countadjustRequestMainDO.setNumber(adjustNumber);
+            countadjustRequestMainDO.setBusinessType(businesstypeDO.getCode());
+            countadjustRequestMainDO.setAutoAgree(requestsettingDO.getAutoAgree());
+            countadjustRequestMainDO.setAutoCommit(requestsettingDO.getAutoCommit());
+            countadjustRequestMainDO.setAutoExecute(requestsettingDO.getAutoExecute());
+            countadjustRequestMainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
             countadjustRequestMainDO.setCountRecordNumber(countRecordMainDO.getNumber());
             countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
             countadjustRequestMainDO.setId(null);