调整仓库

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -186,7 +186,7 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/spms/sub/inv/warehouse/save")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
+    public BaseResponse save(@RequestBody  InvWarehouseEntity invWarehouseEntity,
                              BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
@@ -437,8 +437,8 @@ public class InvWarehouseController extends BaseController {
         //1.获取所有单据类型
         FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
         filterBussinessTypeRequest.setEnable(true);
-        if (invWarehouseEntity.getAdvanceType()) {
-            filterBussinessTypeRequest.setAdvanceType(true);
+        if (invWarehouseEntity.getAdvanceType() == 2) {
+            filterBussinessTypeRequest.setAdvanceType(2);
         }
         List<BasicBussinessTypeEntity> basicBussinessTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest);
 

src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java

@@ -86,7 +86,8 @@ public class InvWarehouseEntity {
      * 是否寄售
      */
     @TableField(value = "advanceType")
-    private Boolean advanceType;
+    private Integer advanceType;
+
     @TableField(value = "spUse")
     private Boolean spUse;
     @TableField(value = "updateTime")

src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java

@@ -34,4 +34,4 @@ public class ThrDeptEntity {
      * 第三方系统标识
      */
     private String thirdSysFk;
-}
+}

src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java

@@ -11,7 +11,7 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest {
     private String name;
     private String parentId;
     private Boolean defaultInv;
-    private Boolean advanceType;
+    private Integer advanceType;
 
     public String thirdId;
     public String thirdId1;

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

@@ -44,7 +44,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     /**
      * 是否预入库
      */
-    private Boolean advanceType;
+    private Integer advanceType;
 
     private String type;
 

src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java

@@ -21,6 +21,6 @@ public class InvSubWarehouseResponse {
     private boolean defaultInv;
     private String parentCode;
     private String parentInvName;
-    private Boolean advanceType;
+    private Integer advanceType;
     private Boolean spUse;
 }

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

@@ -104,6 +104,11 @@ CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1);
 
+INSERT INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1);
+INSERT INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1);
+INSERT INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1);
+
+
 CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);