From 8de95122da0b4d32cadd2b49d4e36ebe8eb08295 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 4 Jul 2022 14:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=90=8E=E7=AB=AF=E8=87=AA=E5=8A=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/thrsys/ThrOrderReceiveController.java      | 8 +++++---
 .../src/main/java/com/glxp/sale/admin/util/Constant.java  | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java
index d751827..b35924c 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java
@@ -9,7 +9,7 @@ import com.glxp.sale.admin.req.inout.StockOrderPostRequest;
 import com.glxp.sale.admin.service.auth.CustomerService;
 import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService;
 import com.glxp.sale.admin.service.thrsys.ThrOrderService;
-import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -33,6 +33,8 @@ public class ThrOrderReceiveController {
     private ThrOrderDetailService thrOrderDetailService;
     @Resource
     CustomerService customerService;
+    @Resource
+    GennerOrderUtils gennerOrderUtils;
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/thrsys/order/insertWeb")
@@ -43,17 +45,17 @@ public class ThrOrderReceiveController {
         }
         Integer userId = customerService.getUserId();
         ThrOrderEntity stockOrderEntity = new ThrOrderEntity();
-//        Integer id = Integer.parseInt(CustomUtil.getId());
         BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
         stockOrderEntity.setCreateUser(userId + "");
         stockOrderEntity.setType(1);//领用单据
         stockOrderEntity.setUpdateTime(new Date());
         stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
-//        stockOrderEntity.setId(id);
         ThrOrderEntity temp = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk());
         if (temp != null) {
             stockOrderEntity.setId(temp.getId());
         }
+        String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
+        stockOrderEntity.setBillNo(orderNo);
         thrOrderService.insertThrOrder(stockOrderEntity);
         stockOrderEntity = thrOrderService.findByUnique(stockOrderEntity.getBillNo(), stockOrderEntity.getThirdSysFk());
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java
index f684d67..26b8539 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java
@@ -20,6 +20,7 @@ public class Constant {
 
     public static final String SCAN_ORDER = "ZS";
     public static final String BUS_ORDER = "ZY";
+    public static final String LIN_YONG = "ZL";
 
     public static String SPTM_TO_DI = "sptm_to_di";
     public static String DELAY_SYNC_TIME = "DELAY_SYNC_TIME";