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 @@ 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 AND code LIKE #{code} @@ -62,19 +62,19 @@ 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 AND workPlaceCode = #{workPlaceCode}