From 4eb14efc5f9dc402e4ee89444b2d05461389e47d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 15 Aug 2023 22:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E7=BB=88=E7=AB=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 45 ++++++++++++++++++- .../basic/BasicBussinessTypeEntity.java | 1 - .../req/basic/FilterBussinessTypeRequest.java | 6 +++ .../res/basic/BasicBussinessTypeResponse.java | 7 +++ src/main/resources/application-dev.yml | 10 ++--- 5 files changed, 60 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 34db52f08..80a9ecac1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -15,6 +15,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.BusNoUserRequest; import com.glxp.api.req.basic.BussinessTypeSaveRequest; @@ -416,9 +417,9 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/busType/selectList") public BaseResponse selectList() { - FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest(); bussinessTypeFilterRequest.setActionType(2); bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT); @@ -427,4 +428,46 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.success(bussinessTypeEntities); } + @AuthRuleAnnotation("") + @GetMapping("/udiwms/pda/busType/filter") + public BaseResponse pdaGetBusTypes(FilterBussinessTypeRequest filterBussinessTypeRequest, HttpServletRequest servletServerHttpRequest) { + filterBussinessTypeRequest.setUserId(getUserId()); + List list = basicBussinessTypeService.filterJoinByUser(filterBussinessTypeRequest); + List results = new ArrayList<>(); + if (filterBussinessTypeRequest.getPdaType() == 1) { + list.forEach(bussinessTypeEntity -> { + if (bussinessTypeEntity.getCheckWebNew() == 0) { + results.add(bussinessTypeEntity); + } + }); + } else if (filterBussinessTypeRequest.getPdaType() == 2) { + list.forEach(bussinessTypeEntity -> { + if (bussinessTypeEntity.getCheckWebNew() == 1 || bussinessTypeEntity.getCheckWebNew() == 2) { + results.add(bussinessTypeEntity); + } + }); + } else if (filterBussinessTypeRequest.getPdaType() == 3) { + list.forEach(bussinessTypeEntity -> { + if (bussinessTypeEntity.getCheckWebNew() == 3) { + results.add(bussinessTypeEntity); + } + }); + } else if (filterBussinessTypeRequest.getPdaType() == 4) { + list.forEach(bussinessTypeEntity -> { + if (bussinessTypeEntity.isThrCheckEnable()) { + results.add(bussinessTypeEntity); + } + }); + } else if (filterBussinessTypeRequest.getPdaType() == 5) { + list.forEach(bussinessTypeEntity -> { + if (bussinessTypeEntity.isSecCheckChange()) { + results.add(bussinessTypeEntity); + } + }); + } else { + results.addAll(list); + } + return ResultVOUtils.success(results); + } + } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index cadc2f15f..16d149d6b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -113,7 +113,6 @@ public class BasicBussinessTypeEntity { * 3.有三期业务单校验 */ - @TableField(value = "checkWebNew") private int checkWebNew; diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 2163adbfe..6eb649415 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -111,4 +111,10 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private Integer corpType; private Integer sortNum; private Integer actionType; + + + /** + * 1：新增出入库单；2:待配货；3：待校验；4：待核对；5：待审核 + */ + private int pdaType; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 0c5cbd7a1..0b58db4e7 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -52,6 +52,13 @@ public class BasicBussinessTypeResponse { private int checkPdaEd; private int checkPdaUn; private int checkPc; + /** + * web前端页面新增单据 + * 0.扫码直接生成业务单 + * 1.有三期业务单配/拣货 + * 2.无三期业务单配/拣货 + * 3.有三期业务单校验 + */ private int checkWebNew; private int checkChange; private boolean secCheckUdims; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 981e3a735..2eeeaf266 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_0710?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 20 @@ -46,16 +46,12 @@ logging: level: com.glxp.api.dao: debug - file_path: D:/udi/udiwms/udiwmsfile/ -file_lpath: /udiwms/image/register/file/getImage -file_url: http://127.0.0.1:9991 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs - +SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b back_file_path: D:/share/udisps/back/ API_KEY: 1101 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L WEB_TITLE: 平潭协和医院 -SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b