From de3e184f9c8fe720b610bb1a9765c108b6f47623 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 26 Feb 2024 15:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 5 ++- .../inout/IoCodeTempController.java | 4 +-- .../thrsys/ThrProductsAddDiController.java | 1 + .../api/dao/basic/BasicBusTypePreDao.java | 5 +-- .../entity/basic/BasicBusTypePreEntity.java | 23 +++++++++--- .../basic/BasicBussinessTypeEntity.java | 5 ++- .../api/entity/basic/UdiRelevanceEntity.java | 6 +++- .../entity/thrsys/ThrProductsAddDiEntity.java | 4 +++ .../req/basic/BussinessTypeSaveRequest.java | 2 +- .../basic/CompanyProductRelevanceRequest.java | 20 +++++++++++ .../api/req/basic/FilterUdiInfoRequest.java | 4 +++ .../api/req/basic/FilterUdiRelRequest.java | 4 +++ .../glxp/api/req/basic/SupplementRequest.java | 1 + .../api/req/basic/UdiRelevanceRequest.java | 4 +++ .../req/basic/UdiRelevanceSaveRequest.java | 4 +++ .../req/thrsys/AddThrDiProductsRequest.java | 1 + .../res/basic/BasicBussinessTypeResponse.java | 3 ++ .../CompanyProductRelevanceResponse.java | 5 ++- .../api/res/basic/UdiRelevanceResponse.java | 6 +++- .../glxp/api/res/basic/UdiRlSupResponse.java | 4 +++ .../glxp/api/res/thrsys/UdiInfoResponse.java | 4 +++ .../basic/IBasicBusTypePreService.java | 3 ++ .../service/basic/UdiRelevanceService.java | 3 ++ .../impl/BasicBusTypePreServiceImpl.java | 16 ++++++--- .../basic/impl/UdiRelevanceServiceImpl.java | 8 +++++ .../thrsys/impl/ThrProductsAddDiService.java | 3 ++ .../com/glxp/api/util/SupplementVailUtil.java | 7 +++- .../mapper/basic/BasicBusTypePreDao.xml | 17 ++++++--- .../basic/CompanyProductRelevanceDao.xml | 1 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 35 ++++++++++++------- .../mybatis/mapper/basic/UdiRlSupDao.xml | 4 ++- .../mapper/thrsys/ThrProductsAddDiDao.xml | 13 ++++--- src/main/resources/schemas/schema_v2.3.sql | 12 +++++++ 33 files changed, 192 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 7ffe7c28..74c3c890 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -228,6 +228,9 @@ public class UdiRelevanceController extends BaseController { @GetMapping("udiwms/udiinfo/local/filterByUuid") public BaseResponse filterLocalByUuid(FilterUdiRelRequest filterUdiRelRequest) { + if (filterUdiRelRequest.getId() == null) { + return ResultVOUtils.error(500, "产品ID主键不能为空！"); + } if (filterUdiRelRequest.getId() == null) { return ResultVOUtils.error(500, "产品ID主键不能为空！"); } @@ -239,6 +242,7 @@ public class UdiRelevanceController extends BaseController { if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiProductEntity udiProductEntity : udiInfoEntities) { UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); + BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse); udiRelevanceResponses.add(udiRelevanceResponse); } @@ -553,7 +557,6 @@ public class UdiRelevanceController extends BaseController { } - //获取对照过滤列表 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirel/thirdSys/detail") 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 50351f48..683b7ea1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -714,11 +714,11 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "该产品不可配送，请联系院方！"); } - if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) { //只采集集采产品 + if (bussinessTypeEntity.getVailGroupBuy() == 1 && !IntUtil.value(udiRelevanceResponse.getGroupBuy())) { //只采集集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入集采产品！"); } - if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 + if (bussinessTypeEntity.getVailGroupBuy() == 2 && IntUtil.value(udiRelevanceResponse.getGroupBuy())) { //只采集非集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入非集采产品！"); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 967d0d1c..b854286a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -226,6 +226,7 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); + udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType()); udiProductEntity.setNameCode(null); udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index 9d0fae66..792d120f 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -32,7 +32,8 @@ public interface BasicBusTypePreDao extends BaseMapperPlus findByAction(String action); + List findByAction(@Param("action") String action, @Param("originAction") String originAction); + /** * 查询单据流转列表数据 @@ -44,4 +45,4 @@ public interface BasicBusTypePreDao extends BaseMapperPlus uuids; + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + private String category; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index 22f4784a..0cf59f4b 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -45,6 +45,10 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String udplatCode; private String mainId; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index e7d01d02..f0feefe0 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -46,6 +46,10 @@ public class FilterUdiRelRequest extends ListPageRequest { private String udplatCode; private String mainId; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java index 2f2d83af..495ee706 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -22,4 +22,5 @@ public class SupplementRequest { private String cpms; private String price; private Boolean groupBuy; + private Integer purType; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 17e10273..afa3637c 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -31,6 +31,10 @@ public class UdiRelevanceRequest { private Integer lockStatus; private String udplatCode; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String supName; private String originUuid; private String price; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 73d9419b..b8c9c0a6 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -22,6 +22,10 @@ public class UdiRelevanceSaveRequest { private Boolean isLock; private Integer lockStatus; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java index 10df6f73..3e4a8adf 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java @@ -50,6 +50,7 @@ public class AddThrDiProductsRequest { private String deviceRecordKey; private Boolean groupBuy; + private Integer purType; } 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 dde0b357..1cdda6c7 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -76,6 +76,9 @@ public class BasicBussinessTypeResponse { private int checkBalance; private boolean secCheckBalance; + /** + * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库 + */ private boolean useDyCount; private boolean expireTip; diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index d0236f8b..3906556a 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -58,7 +58,10 @@ public class CompanyProductRelevanceResponse { private String mainId; private String mainName; private Boolean isAdavence; - + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String scbssfbhph; private String scbssfbhxlh; private String scbssfbhscrq; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 6d7fa045..153d1fdb 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -22,6 +22,10 @@ public class UdiRelevanceResponse { private Boolean isLock; private Integer lockStatus; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private Boolean useMuti; private Integer useNum; private String supName; @@ -104,7 +108,7 @@ public class UdiRelevanceResponse { //手持终端下载需要主键 private Long relId; private boolean dispatch; //是否可配送 - private boolean groupBuy; //是否集采产品 + private Boolean groupBuy; //是否集采产品 private boolean needCert; //是否需要资质材料 private String classifyName; //物资分类名称 diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 1a906bc6..2179129c 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -59,6 +59,10 @@ public class UdiRlSupResponse { private String mainId; private String mainName; private Boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private String scbssfbhph; private String scbssfbhxlh; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index 3b71dc60..0e02a96a 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -60,6 +60,10 @@ public class UdiInfoResponse { private Integer status; private String supId; private boolean isAdavence; + /** + * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 + */ + private Integer purType; private boolean isDisable; private boolean useMuti; diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index cbdf4cec..c7e178e6 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -20,6 +20,7 @@ public interface IBasicBusTypePreService extends IService * @return */ List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + /** * 根据ID删除补单单据类型 * @@ -62,6 +63,8 @@ public interface IBasicBusTypePreService extends IService */ List findByAction(String action); + List findByOiginActions(String originAction); + /** * 查询单据流转列表数据 * diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index 56ff9ade..fbe8c76d 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -101,4 +101,7 @@ public interface UdiRelevanceService extends IService { * @return */ String getRelIdByUdiCode(String code); + + Integer findPurType(Long relId); + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 47318400..24fee631 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -62,7 +62,12 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl findByAction(String action) { - return basicBusTypePreDao.findByAction(action); + return basicBusTypePreDao.findByAction(action, null); + } + + @Override + public List findByOiginActions(String originAction) { + return basicBusTypePreDao.findByAction(null, originAction); } @Override @@ -83,14 +88,17 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("action", basicBusTypePreEntity.getAction()) .eq("originAction", basicBusTypePreEntity.getOriginAction()) - .eq("invCode", basicBusTypePreEntity.getInvCode()) + .eq(null != basicBusTypePreEntity.getInvCode(), "invCode", basicBusTypePreEntity.getInvCode()) .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime()) .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode()) - .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll()); - + .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll()) + .eq(null != basicBusTypePreEntity.getAuditStatus(), "auditStatus", basicBusTypePreEntity.getAuditStatus()) + .eq(null != basicBusTypePreEntity.getBusAuditStatus(), "busAuditStatus", basicBusTypePreEntity.getBusAuditStatus()); List list = basicBusTypePreDao.selectList(wrapper); if (CollUtil.isNotEmpty(list)) { if (null != basicBusTypePreEntity.getId()) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 4a532824..d676cfdf 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; @@ -405,4 +406,11 @@ public class UdiRelevanceServiceImpl extends ServiceImpl().select("purType").eq("id", relId).last("limit 1")); + return IntUtil.value(udiRelevanceEntity.getPurType()); + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index e6d4316a..8dbf2f15 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -131,6 +131,7 @@ public class ThrProductsAddDiService extends ServiceImpl select basic_bustype_pre.*, - basic_bussiness_type.name + basic_bussiness_type.name from basic_bustype_pre - left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action - left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code - left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code - where basic_bustype_pre.action = #{action} + left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action + left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code + left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code + + + AND basic_bustype_pre.originAction like concat('%', #{originAction}, '%') + + + AND basic_bustype_pre.action like concat('%', #{action}, '%') + + diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 59794d35..476878a7 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -672,3 +672,15 @@ CALL Pro_Temp_ColumnWork('sys_menu_help', 'helpType', 'int', 1); # 字段新增 urlPath 字段注释：跳转url CALL Pro_Temp_ColumnWork('sys_menu_help', 'urlPath', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('thr_products_add_di', 'purType', 'tinyint', 1); +INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, + `sort`, `localEdit`) +VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1); + + + + +