From e597b197794f9438d0b21c22b377ad8fa881e217 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 22 Aug 2024 18:35:58 +0800
Subject: [PATCH] =?UTF-8?q?8/22=20=E5=B7=A5=E4=BD=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoOrderController.java     | 3 +++
 src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java | 5 +++++
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml          | 2 +-
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml       | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index b531c9374..20ade8db0 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -332,6 +332,9 @@ public class IoOrderController extends BaseController {
 
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         //要是特殊往来信息没有就创建
+        if (addOrderRequest.getOrderType() != null){
+            orderEntity.setOrderType(addOrderRequest.getOrderType());
+        }
         orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()));
         orderEntity.setAction(addOrderRequest.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 6b46b1632..a32ae472e 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -226,4 +226,9 @@ public class FilterOrderRequest extends ListPageRequest {
      * 产品类别
      */
     private Integer productType;
+
+    /**
+     * 工位编码
+     */
+    private String workPlaceCode;
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 10a7f9e46..3824c0a34 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -10,7 +10,7 @@
         sys_workplace_document.busName busTypeName,
         bc.name fromCorpName,
         sw.workplaceId workPlaceCode,
-        sw.workplaceName
+        sw.workplaceName,ico.id
         FROM io_collect_order ico
         left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
         left join basic_corp bc on ico.fromCorp = bc.erpId
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 5f7aa53fc..c27929f97 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -80,6 +80,9 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND io.fromCorp = #{fromCorp}
             </if>
+            <if test="workPlaceCode != null and workPlaceCode != ''">
+                AND io.workPlaceCode = #{workPlaceCode}
+            </if>
             <if test="invoiceEncode != null and invoiceEncode != ''">
                 AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
             </if>