From 1b36ce9bb2562ac9f58ef80d2f9e14de66e34c91 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 31 Aug 2024 18:48:56 +0800
Subject: [PATCH] =?UTF-8?q?8/91=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/inout/IoSplitCodeEntity.java   |  2 +
 .../api/req/inout/IoSplitCodeRequest.java     |  2 +
 .../api/res/inout/IoSplitCodeResponse.java    |  1 +
 .../mapper/inout/IoSplitCodeMapper.xml        |  4 +-
 .../mapper/inout/IoSplitFifoCodeMapper.xml    | 80 +++++++++----------
 5 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
index ed9bddd98..c8bfb273a 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
@@ -218,6 +218,8 @@ public class IoSplitCodeEntity implements Serializable {
     private String productName;
     @TableField(exist = false)
     private String workplaceName;
+    @TableField(exist = false)
+    private String busTypeName;
 
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
index 447ad63c1..c8297c8fa 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
@@ -136,4 +136,6 @@ public class IoSplitCodeRequest extends ListPageRequest {
     private Long workPlaceCode;
 
 
+
+
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java
index f84aa821c..3fe687bc4 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java
@@ -150,4 +150,5 @@ public class IoSplitCodeResponse {
     private String useLevelUnit;
 
 
+
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
index 887c604b7..94346d260 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -3,10 +3,12 @@
 <mapper namespace="com.glxp.api.dao.inout.IoSplitCodeMapper">
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitCodeRequest"
             resultType="com.glxp.api.entity.inout.IoSplitCodeEntity">
-        SELECT isc.*,bp.cpmctymc productName,sw.workplaceName
+        SELECT isc.*,bp.cpmctymc productName,sw.workplaceName,COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName
         FROM io_split_code isc
         left join basic_products bp on bp.nameCode = isc.nameCode
         left join sys_workplace sw on sw.workplaceId = isc.workPlaceCode
+        left join thr_bustype_origin on isc.action = thr_bustype_origin.action
+        left join basic_bussiness_type on isc.action = basic_bussiness_type.action
         <where>
             isc.remainCount > 0
             <if test="code != '' and code != null">
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
index b3be9496f..8d9b6757e 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml
@@ -4,24 +4,24 @@
     <select id="filterGroupList" parameterType="com.glxp.api.req.inout.IoSplitFifoCodeRequest"
             resultType="com.glxp.api.res.inout.IoSplitCodeResponse">
         SELECT io_split_fifo_code.*,
-               sum(totalCount) as groupCount,
-               bp.cpmctymc,
-               bp.ggxh,
-               bp.bzgg,
-               bu.useLevelUnit,
-               bp.ylqxzcrbarmc,
-               bp.manufactory,
-               bp.measname,
-               bp.zczbhhzbapzbh,
-               bp.ybbm,
-               bp.zxxsdycpbs,
-               bc.name            supName,
-               sw.workPlaceName
+        sum(totalCount) as groupCount,
+        bp.cpmctymc,
+        bp.ggxh,
+        bp.bzgg,
+        bu.useLevelUnit,
+        bp.ylqxzcrbarmc,
+        bp.manufactory,
+        bp.measname,
+        bp.zczbhhzbapzbh,
+        bp.ybbm,
+        bp.zxxsdycpbs,
+        bc.name supName,
+        sw.workPlaceName
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
-                     left join basic_corp bc on bc.erpId = io_split_fifo_code.supId
-                     left join sys_workplace sw on sw.workplaceId = io_split_fifo_code.workPlaceCode
+        LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        left join basic_corp bc on bc.erpId = io_split_fifo_code.supId
+        left join sys_workplace sw on sw.workplaceId = io_split_fifo_code.workPlaceCode
         <where>
             <if test="code != '' and code != null">
                 AND code LIKE #{code}
@@ -62,19 +62,19 @@
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitFifoCodeRequest"
             resultType="com.glxp.api.res.inout.IoSplitCodeResponse">
         SELECT io_split_fifo_code.*,
-               bp.cpmctymc,
-               bp.ggxh,
-               bp.bzgg,
-               bp.ylqxzcrbarmc,
-               bp.manufactory,
-               bp.measname,
-               bu.useLevelUnit,
-               bp.zczbhhzbapzbh,
-               bp.ybbm,
-               bp.zxxsdycpbs
+        bp.cpmctymc,
+        bp.ggxh,
+        bp.bzgg,
+        bp.ylqxzcrbarmc,
+        bp.manufactory,
+        bp.measname,
+        bu.useLevelUnit,
+        bp.zczbhhzbapzbh,
+        bp.ybbm,
+        bp.zxxsdycpbs
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="code != '' and code != null">
                 AND code LIKE #{code}
@@ -109,18 +109,18 @@
 
     <select id="findInvRemind" parameterType="long" resultType="com.glxp.api.res.inout.IoSplitCodeResponse">
         SELECT io_split_fifo_code.*,
-               sum(totalCount) as groupCount,
-               bp.cpmctymc,
-               bp.ggxh,
-               bp.ylqxzcrbarmc,
-               bp.manufactory,
-               bp.measname,
-               bp.zczbhhzbapzbh,
-               bp.ybbm,
-               bp.zxxsdycpbs
+        sum(totalCount) as groupCount,
+        bp.cpmctymc,
+        bp.ggxh,
+        bp.ylqxzcrbarmc,
+        bp.manufactory,
+        bp.measname,
+        bp.zczbhhzbapzbh,
+        bp.ybbm,
+        bp.zxxsdycpbs
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}