From 1738822d07fe74f94422b4a3bad5291b3976a365 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 25 Aug 2024 16:21:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=94=A8=E6=88=B7=E5=B7=A5=E4=BD=8D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicCollectUserController.java | 6 +++++- .../com/glxp/api/req/basic/BasicCollectUserRequest.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index 471e06dc0..d43f37488 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.req.basic.BasicCollectRequest; @@ -28,13 +29,16 @@ import java.util.List; */ @Slf4j @RestController -public class BasicCollectUserController { +public class BasicCollectUserController extends BaseController { @Resource private BasicCollectUserService basicCollectUserService; @GetMapping("/udiwms/sysWorkplace/getUserBindWork") public BaseResponse getUserBindWork(BasicCollectUserRequest request) { + if (request.getAutoUserId() == 1){ + request.setUserId(String.valueOf(getUserId())); + } List page = basicCollectUserService.filterList(request); PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java index 0b8edd230..1746bfb20 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java @@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest { private String userKey; private String workKey; + private Integer autoUserId; + } From 445514e2cce5b45f30b2c6090626cea12fe724db Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 25 Aug 2024 16:42:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicCollectUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index d43f37488..f36ed0e85 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController { @GetMapping("/udiwms/sysWorkplace/getUserBindWork") public BaseResponse getUserBindWork(BasicCollectUserRequest request) { - if (request.getAutoUserId() == 1){ + if (request != null && request.getAutoUserId() == 1){ request.setUserId(String.valueOf(getUserId())); } List page = basicCollectUserService.filterList(request); From d83ab87193465d7e04ea97ee7b9a09badf9ed9fa Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 25 Aug 2024 16:56:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicCollectUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index f36ed0e85..cfa37fa91 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController { @GetMapping("/udiwms/sysWorkplace/getUserBindWork") public BaseResponse getUserBindWork(BasicCollectUserRequest request) { - if (request != null && request.getAutoUserId() == 1){ + if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){ request.setUserId(String.valueOf(getUserId())); } List page = basicCollectUserService.filterList(request); From 6415acad80cd52850991d1189fd479177571e56e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 25 Aug 2024 17:15:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?8/25=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/req/collect/CollectOrderRequest.java | 5 +++++ .../res/collect/CollectOrderBizResponse.java | 1 + .../collect/IoCollectOrderCodeManService.java | 19 +++++++++++++++++-- .../mybatis/mapper/auth/SysWorkplaceDao.xml | 3 +-- .../mapper/basic/SysWorkplaceDocumentDao.xml | 4 ++-- .../collect/IoCollectOrderBizMapper.xml | 2 +- .../mapper/collect/IoCollectOrderMapper.xml | 3 +++ 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index b45d35b9d..1a1e50d84 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -95,6 +95,11 @@ public class CollectOrderRequest extends ListPageRequest { */ private Boolean confirmGet; + /** + * 工位用户 + */ + private String chargeUser; + private Boolean confirmFinish; 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 de69badb9..795898454 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -122,5 +122,6 @@ public class CollectOrderBizResponse { private String splitUdiCode; private String unSplitUdiCode; private String finishUdiCode; + private String bzgg; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 8276820c5..761d6d01e 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -18,6 +18,8 @@ import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; +import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; import com.glxp.api.req.collect.CollectOrderCodeManRequest; @@ -30,6 +32,8 @@ import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.BasicCollectBustypeService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.thrsys.IThrBusTypeOriginService; +import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; @@ -63,6 +67,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl() + .eq(ThrBusTypeOriginEntity::getAction, sysWorkplaceDocumentEntity.getDocumentTypeCode())); + if (one != null){ + ThrSystemEntity thrSystemEntity = thrSystemService.getOne(new LambdaQueryWrapper().eq(ThrSystemEntity::getThirdId, one.getThirdSys())); + if (thrSystemEntity != null){ + collectOrder.setFromType(thrSystemEntity.getThirdName()); + } + } } collectOrderService.save(collectOrder); } else { diff --git a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml index eadec7e67..daed69220 100644 --- a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml @@ -7,13 +7,12 @@ - SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory + SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory,bp.bzgg 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 diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 2ac927c9b..2b6375013 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -43,6 +43,9 @@ AND ico.workPlaceCode = #{workPlaceCode} + + AND sw.chargeUser = #{chargeUser} + AND (