预验收入库单区分带回与不带回

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -191,7 +191,10 @@ public class IoOrderController extends BaseController {
     public BaseResponse filterPreInorder(FilterOrderRequest filterOrderRequest) {
         filterOrderRequest.setVueType(Constant.ORDER_ACTION_SUP_PREIN);
         orderService.setActions(filterOrderRequest);
-        List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
+        List<IoOrderResponse> list = new ArrayList<>();
+        if (CollUtil.isEmpty(filterOrderRequest.getActions()))
+            return ResultVOUtils.page(new PageInfo<>(list));
+        list = orderService.filterList(filterOrderRequest);
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }

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

@@ -447,4 +447,11 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "editType")
     private Integer editType;
 
+    /**
+     * 入库预验收是否带回, 1：带回，2：不带回
+     */
+    @TableField(value = "inPreInBack")
+    private Integer inPreInBack;
+
+
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -308,6 +308,6 @@ public class BussinessTypeSaveRequest {
 
     private Boolean advancePreIn;
     private int spaceOut;
-
+    private Integer inPreInBack;
 
 }

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -123,4 +123,6 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
      */
     private Integer editType;
     private String deptCode;
+    private Integer inPreInBack;
+
 }

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -205,4 +205,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private List<String> inOrders;
 
     private String keyWord;
+
+    private Integer inPreInBack;
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -182,4 +182,6 @@ public class BasicBussinessTypeResponse {
      * 是否启用, 1：仅查看，2：增删改查
      */
     private Integer editType;
+
+    private Integer inPreInBack;
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -759,6 +759,11 @@ public class IoOrderServiceImpl implements IoOrderService {
         if (CollectionUtils.isEmpty(bussinessTypeEntities)) {
             return null;
         }
+        if (filterOrderRequest.getInPreInBack() != null) {
+            bussinessTypeEntities = bussinessTypeEntities.stream()
+                    .filter(item -> item.getInPreInBack().equals(filterOrderRequest.getInPreInBack()))
+                    .collect(Collectors.toList());
+        }
         actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
         filterOrderRequest.setActions(actions);
         return actions;

src/main/resources/schemas/schema_v2.3.sql

@@ -898,6 +898,7 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1)
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'editType', 'tinyint', 1);
 
+
 CALL Pro_Temp_ColumnWork('auth_user', 'lastUpdatePwdTime', 'datetime', 1);
 
 

src/main/resources/schemas/schema_v2.4.sql

@@ -82,3 +82,4 @@ VALUES (1, 'udi_wms_new', '3.0.6', 306, 'UDI扫码终端', '2023-10-30 18:42:24'
 
 CALL Pro_Temp_ColumnWork('basic_product_category', 'deptCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_product_category', 'invCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inPreInBack', 'tinyint', 1);