From 8ea1b42e7df32d3bac6cadea04803cf212cc7cf9 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sun, 1 Sep 2024 18:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  5 ++++
 .../collect/IoSplitDesOrderService.java       | 30 ++++++++-----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9b87a8db..f33100a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,11 @@
             <artifactId>tochina</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.glxp</groupId>
+            <artifactId>yb</artifactId>
+            <version>zephyr1.7.0</version>
+        </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
index 6bb0f7585..871dbe518 100644
--- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
@@ -297,23 +297,19 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
     public void splitDesOrder(AddInvDesDetaiRequest addInvDesDetaiRequest) {
 
         IoSplitDesOrder collectOrder;
-        if (StrUtil.isNotEmpty(addInvDesDetaiRequest.getBillNo())) {
-            collectOrder = getByBillNo(addInvDesDetaiRequest.getBillNo());
-        } else {
-            collectOrder = IoSplitDesOrder.builder()
-                    .billNo(gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")))
-                    .busType("1")
-                    .workPlaceCode(addInvDesDetaiRequest.getWorkPlaceCode())
-                    .createTime(new Date())
-                    .billTime(new Date())
-                    .remark(addInvDesDetaiRequest.getRemark())
-                    .status(1)
-                    .createUser(addInvDesDetaiRequest.getCreateUser())
-                    .updateTime(new Date())
-                    .updateUser(addInvDesDetaiRequest.getUpdateUser())
-                    .build();
-            save(collectOrder);
-        }
+        collectOrder = IoSplitDesOrder.builder()
+                .billNo(gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")))
+                .busType("1")
+                .workPlaceCode(addInvDesDetaiRequest.getWorkPlaceCode())
+                .createTime(new Date())
+                .billTime(new Date())
+                .remark(addInvDesDetaiRequest.getRemark())
+                .status(1)
+                .createUser(addInvDesDetaiRequest.getCreateUser())
+                .updateTime(new Date())
+                .updateUser(addInvDesDetaiRequest.getUpdateUser())
+                .build();
+        save(collectOrder);
         IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(addInvDesDetaiRequest.getCode(), addInvDesDetaiRequest.getWorkPlaceCode(), null);
         if (splitCodeEntity == null) {
             throw new RuntimeException("该追溯码不存在！");