diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 7c1ad24b..593422f5 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -321,6 +321,7 @@ public class UdiRlSupController extends BaseController { udiRelevanceEntity.setId(Long.parseLong(rlidStr)); udiRelevanceEntity.setLockStatus(1); udiRelevanceEntity.setProductsType(2); + udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); udiProductEntity.setProductsType(2); 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 c34e5837..3df3222b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -786,7 +786,8 @@ public class IoCodeTempController extends BaseController { if (unitFk == null) return ResultVOUtils.error(500, "耗材字典不存在此产品！"); else - return ResultVOUtils.error(500, "当前供应商不存在此配送产品！"); + return ResultVOUtils.error(500, "83720660090080653605" + + "！"); } //校验供应商是否配送此产品 diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java index f8419a5b..79d65918 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java @@ -179,4 +179,11 @@ public class IoOrderDetailCodeResponse { //金额 private BigDecimal amount; + + private String bzgg; + private String packUnit; + private String prepnSpec; + private String prepnUnit; + + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index d52160f2..e047abf0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -280,6 +280,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setHcType(addProductRequest.getHcType()); udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode()); + if (CollUtil.isNotEmpty(addProductRequest.getDrugLevelLists())) { for (UpdateLevelDrugRequest updateLevelDrugRequest : addProductRequest.getDrugLevelLists()) { UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode()); @@ -301,6 +302,8 @@ public class UdiProductServiceImpl implements UdiProductService { udiProductEntity.setZczbhhzbapzbh(addProductRequest.getRegisterNo()); udiProductEntity.setPackLevel(updateLevelDrugRequest.getPackLevel() + ""); udiProductEntity.setUuid(udiProductEntity.getUuid()); + //药品扫码 过滤 三期 + udiProductEntity.setAllowNoSerial(true); if (IntUtil.value(udiProductEntity.getPackLevel()) == 1 || addProductRequest.getDrugLevelLists().size() == 1) { udiProductEntity.setDiType(1); if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 2150e324..6cca918d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -181,23 +181,27 @@ replace - INTO basic_products - (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8, updateTime - , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName, - catalogname1, - catalogname2, - catalogname3, - matrial, - catalogCode1, - catalogCode2, - catalogCode3) + INTO basic_products + (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8, updateTime + , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName, + pinyinInitial, + updateUser, + createTime, + createUser, + catalogname1, + catalogname2, + catalogname3, + matrial, + destinyType, + productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, + requireScanCode) values (#{id}, #{uuid}, #{originUuid}, #{nameCode}, @@ -249,15 +253,29 @@ #{basicPrductRemak6}, #{basicPrductRemak7}, #{basicPrductRemak8}, #{updateTime} - , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs}, - #{categoryName}, + , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs}, + #{categoryName}, #{pinyinInitial}, + #{updateUser}, + #{createTime}, + #{createUser}, #{catalogname1}, #{catalogname2}, #{catalogname3}, #{matrial}, - #{catalogCode1}, - #{catalogCode2}, - #{catalogCode3}) + #{destinyType}, + #{productsType}, + #{prepnUnit}, + #{prepnSpec}, + #{storageCondition}, + #{transportCondition}, + #{indate}, + #{packMatrial}, + #{majorType}, + #{majorStatus}, + #{physicType}, + #{medicareType}, + #{bzgg}, + #{requireScanCode}) diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml index aa2fc349..d61e8434 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml @@ -132,9 +132,6 @@ AND ic.code = #{code} - - AND bp.productsType = #{productType} - AND ic.orderId like concat('%', #{orderId}, '%') diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index f950da42..e4c0880d 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -42,9 +42,6 @@ AND bindRlFk = #{relId} - - AND bp.productsType = #{productType} - AND batchNo = #{batchNo} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml index 417dee0f..7c95ac30 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -3,6 +3,10 @@