From 69e40b887bcc98a3ad1470d842a7a37b80ceefc2 Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Wed, 22 Nov 2023 14:32:19 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/purchase/vo/PurchaseMainBaseVO.java   |  4 ++--
 .../service/purchase/PurchaseMainServiceImpl.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainBaseVO.java
index 3bd55655..eb2e6319 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainBaseVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainBaseVO.java
@@ -64,14 +64,14 @@ public class PurchaseMainBaseVO {
     private String isConsignment;
 
     @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "业务类型不能为空")
+//    @NotNull(message = "业务类型不能为空")
     private String businessType;
 
     @Schema(description = "备注")
     private String remark;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建时间不能为空")
+//    @NotNull(message = "创建时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
index aa48ee21..1dd08f90 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
@@ -114,12 +114,16 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
     @Override
     public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) {
         // 插入主表
-        RequestsettingDO requestsettingDO = requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseOrder");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseOrder");
+        createReqVO.setBusinessType(businesstypeDO.getCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_ORDER.getCode());
+        createReqVO.setNumber(number);
+        createReqVO.setCreateTime(LocalDateTime.now());
         PurchaseMainDO purchaseMainDO = validatorToCreate(createReqVO);
         //调用自动执行方法
         if (RequestStatusEnum.HANDLING.getCode().equals(purchaseMainDO.getStatus())) {
         }
-        trendsApi.createTrends(requestsettingDO.getId(), "PurchaseOrder", "增加了采购订单", TrendsTypeEnum.CREATE);
+        trendsApi.createTrends(purchaseMainDO.getId(), "PurchaseOrder", "增加了采购订单", TrendsTypeEnum.CREATE);
         return purchaseMainDO.getId();
     }
 
@@ -289,8 +293,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
         PurchaseMainDO mainDo = PurchaseMainConvert.INSTANCE.convert(baseVO);
         this.validatorShiftExist(mainDo.getSupplierCode());
         mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseOrder");
-        mainDo.setBusinessType(businesstypeDO.getCode());
         return mainDo;
     }
 
@@ -311,8 +313,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
         for (PurchaseDetailDO purchaseDetailDO : subDOList) {
             validatorDetailMethod(purchaseDetailDO, purchaseMainDO);
         }
-        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_ORDER.getCode());
-        purchaseMainDO.setNumber(number);
         purchaseMainMapper.insert(purchaseMainDO);
         purchaseDetailMapper.insertBatch(subDOList);
         return purchaseMainDO;