8/91 优化

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;

src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java

@@ -136,4 +136,6 @@ public class IoSplitCodeRequest extends ListPageRequest {
     private Long workPlaceCode;
 
 
+
+
 }

src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java

@@ -150,4 +150,5 @@ public class IoSplitCodeResponse {
     private String useLevelUnit;
 
 
+
 }

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">

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,
+        sum(totalCount) as groupCount,
-               bp.cpmctymc,
+        bp.cpmctymc,
-               bp.ggxh,
+        bp.ggxh,
-               bp.bzgg,
+        bp.bzgg,
-               bu.useLevelUnit,
+        bu.useLevelUnit,
-               bp.ylqxzcrbarmc,
+        bp.ylqxzcrbarmc,
-               bp.manufactory,
+        bp.manufactory,
-               bp.measname,
+        bp.measname,
-               bp.zczbhhzbapzbh,
+        bp.zczbhhzbapzbh,
-               bp.ybbm,
+        bp.ybbm,
-               bp.zxxsdycpbs,
+        bp.zxxsdycpbs,
-               bc.name            supName,
+        bc.name supName,
-               sw.workPlaceName
+        sw.workPlaceName
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        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_products bp ON bu.uuid = bp.uuid
-                     left join basic_corp bc on bc.erpId = io_split_fifo_code.supId
+        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 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.cpmctymc,
-               bp.ggxh,
+        bp.ggxh,
-               bp.bzgg,
+        bp.bzgg,
-               bp.ylqxzcrbarmc,
+        bp.ylqxzcrbarmc,
-               bp.manufactory,
+        bp.manufactory,
-               bp.measname,
+        bp.measname,
-               bu.useLevelUnit,
+        bu.useLevelUnit,
-               bp.zczbhhzbapzbh,
+        bp.zczbhhzbapzbh,
-               bp.ybbm,
+        bp.ybbm,
-               bp.zxxsdycpbs
+        bp.zxxsdycpbs
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        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_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,
+        sum(totalCount) as groupCount,
-               bp.cpmctymc,
+        bp.cpmctymc,
-               bp.ggxh,
+        bp.ggxh,
-               bp.ylqxzcrbarmc,
+        bp.ylqxzcrbarmc,
-               bp.manufactory,
+        bp.manufactory,
-               bp.measname,
+        bp.measname,
-               bp.zczbhhzbapzbh,
+        bp.zczbhhzbapzbh,
-               bp.ybbm,
+        bp.ybbm,
-               bp.zxxsdycpbs
+        bp.zxxsdycpbs
         FROM io_split_fifo_code
-                     LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        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_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}