手持终端获取单据类型

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<BasicBussinessTypeResponse> list = basicBussinessTypeService.filterJoinByUser(filterBussinessTypeRequest);
+        List<BasicBussinessTypeResponse> 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);
+    }
+
 }

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -113,7 +113,6 @@ public class BasicBussinessTypeEntity {
      * 3.有三期业务单校验
      */
 
-
     @TableField(value = "checkWebNew")
     private int checkWebNew;
 

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;
 }

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;

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