diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index e4c61a1aa..e0bafd9d9 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -193,6 +193,16 @@ public class CollectOrderBizResponse { */ private Integer relCodeCount; + private String freightName; + + private String layerName; + + private String regionName; + private String queueName; + private String productLocation; + + + // /** diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index 14b667e8d..cafc978eb 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -11,6 +11,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -29,9 +30,38 @@ public class IoCollectOrderBizService extends ServiceImpl data = collectOrderBizMapper.filterList(collectOrderRequest); + for (CollectOrderBizResponse collectOrderBizResponse : data){ + collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse)); + } return data; } + public String setProductName(CollectOrderBizResponse collectOrderBizResponse){ + StringBuilder sb = new StringBuilder(); + if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) { + sb.append(collectOrderBizResponse.getRegionName()); + } + if (collectOrderBizResponse.getFreightName() != null && !collectOrderBizResponse.getFreightName().isEmpty()) { + if (sb.length() > 0) { + sb.append("-"); + } + sb.append(collectOrderBizResponse.getFreightName()); + } + if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) { + if (sb.length() > 0) { + sb.append("-"); + } + sb.append(collectOrderBizResponse.getQueueName()); + } + if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) { +// if (sb.length() > 0) { +// sb.append("-"); +// } + sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")"); + } + return sb.toString(); + } + public List listByBillNo(String billNo) { List list = super.list(Wrappers.lambdaQuery(IoCollectOrderBiz.class) diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml index 0ba9e7ece..c522ef378 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml @@ -9,11 +9,19 @@ bp.manufactory, COALESCE(bp.bzgg, icob.ggxh) AS spec, bp.prepnSpec AS prepnSpec, - sys_workplace_queue.code + swf.name freightName, + swl.name layerName, + swr.regionName, + sys_workplace_queue.code as workplaceQueueCode, + sys_workplace_queue.name queueName + FROM io_collect_order_biz icob left join basic_udirel bu on icob.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid - left join sys_workplace_queue on icob.queueCode = sys_workplace_queue.code + left join sys_workplace_queue on sys_workplace_queue.relId = bu.id + left join sys_workplace_layer swl on swl.code = sys_workplace_queue.layerCode + left join sys_workplace_freight swf on swf.code = sys_workplace_queue.freightCode + left join sys_workplace_region swr on swr.regionCode = swf.freightRow AND icob.thrCode LIKE concat('%', #{thrCode}, '%')