单据类型界面修改

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -444,4 +444,15 @@ public class BasicBussinessTypeController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/udiwms/busType/selectList")
+    public BaseResponse selectList() {
+
+        FilterBussinessTypeRequest bussinessTypeFilterRequest=new FilterBussinessTypeRequest();
+        bussinessTypeFilterRequest.setAction("2");
+        bussinessTypeFilterRequest.setMainAction("WareHouseOut");
+        bussinessTypeFilterRequest.setCorpType(2);
+        List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest);
+        return ResultVOUtils.success(bussinessTypeEntities);
+    }
+
 }

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

@@ -434,7 +434,7 @@ public class IoCodeTempController extends BaseController {
         //失效期提醒
         SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
         long recent = Long.parseLong(recentParamConfigEntity.getParamValue());
-        if (bussinessTypeEntity.isCheckVailDate() && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
+        if (bussinessTypeEntity.getCheckVailDate()==1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = DateUtil.parseDateExpire(expireDate);

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

@@ -390,7 +390,7 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "fillCodeRel")
     private boolean fillCodeRel;
     @TableField(value = "checkVailDate")
-    private boolean checkVailDate;
+    private Integer checkVailDate;
     @TableField(value = "checkExpire")
     private boolean checkExpire;
     @TableField(value = "checkCertExpire")
@@ -402,4 +402,8 @@ public class BasicBussinessTypeEntity {
     //    预验收剩余库存退库方式  1:按单使用或退库，2：按货位/仓库使用或退库
     @TableField(value = "backPreinType")
     private Integer backPreinType;
+
+    //    寄售使用禁止无库存出库
+    @TableField(value = "advancePreIn")
+    private Integer advancePreIn;
 }

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

@@ -295,11 +295,11 @@ public class BussinessTypeSaveRequest {
 
 
 
-    private boolean checkVailDate;
+    private Integer checkVailDate;
     private boolean checkExpire;
     private boolean checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
 
-
+    private Boolean advancePreIn;
 }

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

@@ -108,4 +108,6 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private Boolean fillCodeRel;
 
     private String vueType;
+
+    private Integer corpType;
 }

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

@@ -144,9 +144,10 @@ public class BasicBussinessTypeResponse {
 
     private boolean fillCodeRel;
 
-    private boolean checkVailDate;
+    private Integer checkVailDate;
     private boolean checkExpire;
     private boolean checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
+    private Boolean advancePreIn;
 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -119,6 +119,9 @@
             <if test="busType != null">
                 AND bu.busType = #{busType}
             </if>
+            <if test="corpType != null">
+                AND bu.corpType = #{corpType}
+            </if>
 
             <if test="actionList != null and actionList.size() != 0">
                 AND bu.action in

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

@@ -104,9 +104,9 @@ 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 ('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 ('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);
+# 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);
@@ -171,6 +171,9 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1);
 
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);
+
+
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);