From 77256a15163154ab4a1ccb46db6177e798dffe98 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 16 Jun 2023 18:07:08 +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

---
 .../glxp/api/controller/basic/BasicBusTypePreController.java   | 3 +++
 src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java    | 1 +
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml    | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
index 3391c2feb..41244d4e6 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
@@ -173,6 +173,9 @@ public class BasicBusTypePreController {
             if (result) {
                 return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
             }
+            if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同！");
+            }
 
             basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity);
         } else {
diff --git a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java
index ffd1bfb31..ba0842b41 100644
--- a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java
@@ -16,4 +16,5 @@ public class InnerOrderEntity {
     private String remark;
     private String createUser;
     private int status;
+    private String createByName;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 32d8c836d..121699f69 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -1556,6 +1556,7 @@
                 AND b1.cpmctymc like concat('%', #{productName}, '%')
             </if>
         </where>
+        order by b1.id desc
     </select>