From 8670d53fcef4fa3951f66aa5152c9043569830de Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 9 Nov 2024 15:47:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=85=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8F=96=E8=B4=A7=E6=A7=BD=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/collect/IoCollectOrderController.java | 1 + .../com/glxp/api/res/collect/CollectOrderBizResponse.java | 1 + .../mybatis/mapper/collect/IoCollectOrderBizMapper.xml | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 1368673df..b5e82ce3f 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -475,6 +475,7 @@ public class IoCollectOrderController extends BaseController { @PostMapping("/udiwms/basic/collect/order/bindWork") public BaseResponse bindWork(@RequestBody CollectOrderBindWorkRequest bindWorkRequest) { if (bindWorkRequest.getCollOrder() != null) { + IoCollectOrder collectOrder = bindWorkRequest.getCollOrder(); collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode()); collectOrder.setTagStatus(1); 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 7a8802331..7029d1519 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -160,5 +160,6 @@ public class CollectOrderBizResponse { private boolean splitUnCheck; private Boolean getConfirm; + private String workplaceQueueCode; } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml index 7d1215948..47e7bc6ac 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml @@ -7,10 +7,12 @@ bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, - bp.bzgg + bp.bzgg, + sys_workplace_queue.code 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.relId = sys_workplace_queue.relId AND icob.thrCode LIKE concat('%', #{thrCode}, '%')