From 74060f32d479e7147384c8b67e0ccbc21096cc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 18 Apr 2023 15:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 11 +++++++++++ .../api/controller/inout/IoCodeTempController.java | 2 +- .../api/entity/basic/BasicBussinessTypeEntity.java | 6 +++++- .../glxp/api/req/basic/BussinessTypeSaveRequest.java | 4 ++-- .../api/req/basic/FilterBussinessTypeRequest.java | 2 ++ .../api/res/basic/BasicBussinessTypeResponse.java | 3 ++- .../mybatis/mapper/basic/BasicBussinessTypeDao.xml | 3 +++ src/main/resources/schemas/schema_v2.1.sql | 9 ++++++--- 8 files changed, 32 insertions(+), 8 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 a84411cb..ced6c88b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/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 bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); + return ResultVOUtils.success(bussinessTypeEntities); + } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 3af82750..1a148330 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/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); 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 5707b1cb..0b34c3fc 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 3a27bc1a..d3031b40 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/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; } 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 77977151..6d61ff71 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/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; } 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 eeb39b1d..e101575d 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/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; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 3e3ad211..1cdd0a55 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -119,6 +119,9 @@ AND bu.busType = #{busType} + + AND bu.corpType = #{corpType} + AND bu.action in diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 76ca2f58..0b8a7ac8 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/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 ('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 ('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); @@ -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);