diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index f29173fd6..ea4701b39 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -132,23 +132,23 @@ public class IoCollectCodeBackupController extends BaseController { //如果是null 正常查询 request.setSelectType(1); } - if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2){ + if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2) { List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); - if (list.size() > 0){ + if (list.size() > 0) { ioCollectOrderCheckCodeService.removeBatchByIds(list); } List list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getBillNo, request.getBillNo())); List filteredList = list1.stream() .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3) .collect(Collectors.toList()); - if (filteredList.size() > 0){ + if (filteredList.size() > 0) { ioCollectCodeBackService.removeBatchByIds(filteredList); } List filteredList2 = list1.stream() - .filter(item ->item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1) + .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1) .collect(Collectors.toList()); - if (filteredList2.size() > 0){ - filteredList2.forEach(item -> item.setScanCodeCheckStatus(0)); + if (filteredList2.size() > 0) { + filteredList2.forEach(item -> item.setScanCodeCheckStatus(0)); // 调用服务层方法批量更新 ioCollectCodeBackService.updateBatchById(filteredList2); } @@ -156,7 +156,7 @@ public class IoCollectCodeBackupController extends BaseController { ioCollectOrderBackupService.updateByBillNo(order); } List ioCollectCodeResponses = ioCollectCodeBackService.filterList(request); - for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){ + for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses) { UdiEntity udiEntity = FilterUdiUtils.getUdi(ioCollectCodeResponse.getCode()); ioCollectCodeResponse.setSerialNo(udiEntity.getSerialNo()); ioCollectCodeResponse.setProductDate(udiEntity.getProduceDate()); @@ -189,27 +189,24 @@ public class IoCollectCodeBackupController extends BaseController { } @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCode") - public BaseResponse scanCheckCode(@RequestBody IoCollectCodeRequest filterCodeRequest){ + public BaseResponse scanCheckCode(@RequestBody IoCollectCodeRequest filterCodeRequest) { BaseResponse response = ioCollectCodeBackService.scanCheckCode(filterCodeRequest); return response; } @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCodeReplace") - public BaseResponse replaceScanCode(@RequestBody IoCollectCodeRequest filterCodeRequest){ + public BaseResponse replaceScanCode(@RequestBody IoCollectCodeRequest filterCodeRequest) { BaseResponse response = ioCollectCodeBackService.replaceScanCode(filterCodeRequest); return response; } - @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/commitCheckCodeOrder") - public BaseResponse commitCheckCodeOrder(@RequestBody IoCollectCodeRequest filterCodeRequest){ + public BaseResponse commitCheckCodeOrder(@RequestBody IoCollectCodeRequest filterCodeRequest) { BaseResponse response = ioCollectCodeBackService.commitCheckCodeOrder(filterCodeRequest); return response; } - - } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index 744fed32d..cdee79aad 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -96,7 +96,7 @@ public class IoCollectOrderBackupController extends BaseController { } } - List collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage()-1)*collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()). + List collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage() - 1) * collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()). collect(Collectors.toList()); PageInfo pageInfo = new PageInfo<>(collectOrderBizResponses); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index e2b3d6758..947d05e18 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -116,7 +116,7 @@ public class IoCollectOrderCodeManController extends BaseController { collectOrder = collectOrderCodeManService.prescribeTagCode(addTagCodeReqeust); } IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); - collectOrderBiz.setId(collectOrder.getId()); + collectOrderBiz.setId(Long.parseLong(data[0])); collectOrderBiz.setSplitUnCheck(true); collectOrderBizService.updateById(collectOrderBiz); return ResultVOUtils.success(collectOrder); @@ -225,6 +225,7 @@ public class IoCollectOrderCodeManController extends BaseController { } else collectOrderCodeMEN = addTagCodeReqeust.getCollectOrderCodeManList(); if (CollUtil.isNotEmpty(collectOrderCodeMEN)) { for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeMEN) { + collectOrderCodeMan.setIsSplitCode(true); collectOrderCodeManService.updateById(collectOrderCodeMan); IoCollectOrderBiz collectiveOrderBiz = new IoCollectOrderBiz(); collectiveOrderBiz.setId(collectOrderCodeMan.getBizIdFk()); diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java index 989af7a01..f210ea5c8 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java @@ -111,7 +111,7 @@ public class IoCollectCodeBackup implements Serializable { /** - * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码 + * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动整取赋码，4.手动拆零赋码 */ @TableField(value = "fifoSplit") @ApiModelProperty(value = "") @@ -147,26 +147,31 @@ public class IoCollectCodeBackup implements Serializable { private Integer scanCodeCheckStatus; /** - * 采购类型 1：普通入账产品；2.预验收产品。3：寄售产品 + * 采购类型 1：普通入账产品；2.预验收产品。3：寄售产品 */ @TableField(value = "purType") @ApiModelProperty(value = "1：普通入账产品；2.预验收产品。3：寄售产品") private Integer purType; /** - * 是否消耗 0:未消耗 1:已消耗 + * 是否消耗 0:未消耗 1:已消耗 */ @TableField(value = "isUsed") @ApiModelProperty(value = "是否消耗 0:未消耗 1:已消耗") private Boolean isUsed; /** - * 时间戳 + * 时间戳 */ @TableField(value = "inBatchNo") @ApiModelProperty(value = "时间戳") private Long inBatchNo; + @TableField(value = "isSplitCode") + @ApiModelProperty(value = "是否拆零码") + private Boolean isSplitCode; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index 6e00109a7..e4b6ddeb3 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -113,7 +113,8 @@ public class IoCollectCodeService extends ServiceImpl ioCollectCodeBackups = collectCodeBackService.listByBillNo(billNo); ArrayList ioCollectCodeBackups1 = new ArrayList<>(); for (IoCollectCodeBackup collectCodeBackup : ioCollectCodeBackups) { - if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1){ + if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1) { collectCodeBackup.setIsUsed(true); ioCollectCodeBackups1.add(collectCodeBackup); } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2a19e4451..fd42be5f1 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -5,71 +5,71 @@ select basic_udirel.*, - basic_udirel.id relId, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, + basic_udirel.id relId, + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8 + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8 FROM basic_udirel - inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid - inner join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk + inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid + inner join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -267,8 +267,8 @@ resultType="java.lang.String"> select basic_products.packLevel FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid AND basic_products.nameCode = #{nameCode} @@ -280,94 +280,94 @@ select basic_udirel.*, - bht.name classifyName, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.bzgg, - basic_products.id as productId, - basic_products.categoryName, - basic_products.catalogname1, - basic_products.catalogname2, - basic_products.catalogname3, - basic_products.matrial, - basic_products.requireScanCode, - basic_products.prepnSpec, - basic_products.levelUnit, - basic_products.prepnUnit, - basic_products.majorStatus, - basic_products.physicType, - basic_products.packMatrial, - basic_products.storageCondition, - basic_products.transportCondition, - basic_products.indate, - basic_products.majorType, - basic_products.medicareType, - basic_products.workPlaceCount, - th.hsmc hslbName + bht.name classifyName, + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.bzgg, + basic_products.id as productId, + basic_products.categoryName, + basic_products.catalogname1, + basic_products.catalogname2, + basic_products.catalogname3, + basic_products.matrial, + basic_products.requireScanCode, + basic_products.prepnSpec, + basic_products.levelUnit, + basic_products.prepnUnit, + basic_products.majorStatus, + basic_products.physicType, + basic_products.packMatrial, + basic_products.storageCondition, + basic_products.transportCondition, + basic_products.indate, + basic_products.majorType, + basic_products.medicareType, + basic_products.workPlaceCount, + th.hsmc hslbName FROM basic_products - inner JOIN basic_udirel - ON basic_products.uuid = basic_udirel.uuid - left join basic_hosp_type bht on basic_udirel.relCode = bht.code - left join thr_hslb th on basic_products.basicPrductRemak8 = th.hsbm + inner JOIN basic_udirel + ON basic_products.uuid = basic_udirel.uuid + left join basic_hosp_type bht on basic_udirel.relCode = bht.code + left join thr_hslb th on basic_products.basicPrductRemak8 = th.hsbm AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -612,22 +612,22 @@ AND (relCode is null - or trim(relCode) = '') + or trim(relCode) = '') AND supName LIKE concat('%', #{supName}, '%') AND ( - nameCode LIKE concat('%', #{nameCode}, '%') - or ybbm LIKE concat('%', #{nameCode}, '%') - or sptm LIKE concat('%', #{nameCode}, '%') - or basic_udirel.mainId LIKE concat('%', #{nameCode}, '%') - or basic_udirel.thirdId LIKE concat('%', #{nameCode}, '%') - or basic_udirel.thirdId1 LIKE concat('%', #{nameCode}, '%') - or basic_udirel.thirdId2 LIKE concat('%', #{nameCode}, '%') - or basic_udirel.thirdId3 LIKE concat('%', #{nameCode}, '%') - or basic_udirel.thirdId4 LIKE concat('%', #{nameCode}, '%')) + nameCode LIKE concat('%', #{nameCode}, '%') + or ybbm LIKE concat('%', #{nameCode}, '%') + or sptm LIKE concat('%', #{nameCode}, '%') + or basic_udirel.mainId LIKE concat('%', #{nameCode}, '%') + or basic_udirel.thirdId LIKE concat('%', #{nameCode}, '%') + or basic_udirel.thirdId1 LIKE concat('%', #{nameCode}, '%') + or basic_udirel.thirdId2 LIKE concat('%', #{nameCode}, '%') + or basic_udirel.thirdId3 LIKE concat('%', #{nameCode}, '%') + or basic_udirel.thirdId4 LIKE concat('%', #{nameCode}, '%')) AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%') @@ -637,13 +637,13 @@ AND (basic_products.ggxh LIKE concat('%', #{ggxh}, '%') - or basic_products.bzgg LIKE concat('%', #{ggxh}, '%')) + or basic_products.bzgg LIKE concat('%', #{ggxh}, '%')) and ( - nameCode LIKE concat('%', #{unionCode}, '%') - or ybbm LIKE concat('%', #{unionCode}, '%') - or sptm LIKE concat('%', #{unionCode}, '%')) + nameCode LIKE concat('%', #{unionCode}, '%') + or ybbm LIKE concat('%', #{unionCode}, '%') + or sptm LIKE concat('%', #{unionCode}, '%')) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) @@ -653,10 +653,10 @@ and (thirdId LIKE concat('%', #{thrPiId}, '%') - or thirdId1 LIKE concat('%', #{thrPiId}, '%') - or thirdId2 LIKE concat('%', #{thrPiId}, '%') - or thirdId3 LIKE concat('%', #{thrPiId}, '%') - or thirdId4 LIKE concat('%', #{thrPiId}, '%')) + or thirdId1 LIKE concat('%', #{thrPiId}, '%') + or thirdId2 LIKE concat('%', #{thrPiId}, '%') + or thirdId3 LIKE concat('%', #{thrPiId}, '%') + or thirdId4 LIKE concat('%', #{thrPiId}, '%')) AND basic_udirel.uuid = #{uuid} @@ -675,21 +675,22 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and mainId ]]> '' AND basic_products.originUuid is NULL - AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null) - or (thirdId2 = '' or thirdId2 is null) or (thirdId3 = '' or thirdId3 is null) - or (thirdId4 = '' or thirdId4 is null)) AND (mainId = '' or mainId is null) + AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null) + or (thirdId2 = '' or thirdId2 is null) or (thirdId3 = '' or thirdId3 is null) + or (thirdId4 = '' or thirdId4 is null)) + AND (mainId = '' or mainId is null) AND (mainId is NULL or mainId = '') @@ -745,23 +746,23 @@ AND ( - nameCode LIKE concat('%', #{keyWords}, '%') - or ybbm LIKE concat('%', #{keyWords}, '%') - or sptm LIKE concat('%', #{keyWords}, '%') - or basic_udirel.mainId LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId2 LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId3 LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%') - or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%') - or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%') - or basic_products.ggxh LIKE concat('%', #{keyWords}, '%') - or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%') - or basic_products.manufactory LIKE concat('%', #{keyWords}, '%') - or basic_products.ybbm LIKE concat(#{keyWords}, '%') - or basic_products.bzgg LIKE concat('%', #{keyWords}, '%') - or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')) + nameCode LIKE concat('%', #{keyWords}, '%') + or ybbm LIKE concat('%', #{keyWords}, '%') + or sptm LIKE concat('%', #{keyWords}, '%') + or basic_udirel.mainId LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId2 LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId3 LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%') + or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%') + or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%') + or basic_products.ggxh LIKE concat('%', #{keyWords}, '%') + or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%') + or basic_products.manufactory LIKE concat('%', #{keyWords}, '%') + or basic_products.ybbm LIKE concat(#{keyWords}, '%') + or basic_products.bzgg LIKE concat('%', #{keyWords}, '%') + or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')) and nameCode not in @@ -779,62 +780,62 @@ select basic_udirel.*, - bht.name classifyName, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - -- basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.categoryName + bht.name classifyName, + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + -- basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.categoryName FROM basic_products - inner JOIN basic_udirel - ON basic_products.uuid = basic_udirel.uuid - left join basic_hosp_type bht on basic_udirel.relCode = bht.code - inner join company_product_relevance on company_product_relevance.udiRlIdFk = basic_udirel.id + inner JOIN basic_udirel + ON basic_products.uuid = basic_udirel.uuid + left join basic_hosp_type bht on basic_udirel.relCode = bht.code + inner join company_product_relevance on company_product_relevance.udiRlIdFk = basic_udirel.id AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -1041,7 +1042,7 @@ AND relCode is null - or trim(relCode) = '' + or trim(relCode) = '' AND supName LIKE concat('%', #{supName}, '%') @@ -1057,19 +1058,19 @@ and ( - nameCode LIKE concat('%', #{unionCode}, '%') - or ybbm LIKE concat('%', #{unionCode}, '%') - or sptm LIKE concat('%', #{unionCode}, '%')) + nameCode LIKE concat('%', #{unionCode}, '%') + or ybbm LIKE concat('%', #{unionCode}, '%') + or sptm LIKE concat('%', #{unionCode}, '%')) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) and (thirdId LIKE concat('%', #{thrPiId}, '%') - or thirdId1 LIKE concat('%', #{thrPiId}, '%') - or thirdId2 LIKE concat('%', #{thrPiId}, '%') - or thirdId3 LIKE concat('%', #{thrPiId}, '%') - or thirdId4 LIKE concat('%', #{thrPiId}, '%')) + or thirdId1 LIKE concat('%', #{thrPiId}, '%') + or thirdId2 LIKE concat('%', #{thrPiId}, '%') + or thirdId3 LIKE concat('%', #{thrPiId}, '%') + or thirdId4 LIKE concat('%', #{thrPiId}, '%')) AND basic_udirel.uuid = #{uuid} @@ -1088,31 +1089,31 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') - and basic_products.originUuid ]]> '' + thirdId3 ]]> '' or thirdId4 ]]> '') + and basic_products.originUuid ]]> '' AND basic_products.originUuid is NULL AND (mainId is NULL or mainId = '') - and basic_products.originUuid ]]> '' + and basic_products.originUuid ]]> '' AND thirdId1 is NULL - and basic_products.originUuid ]]> '' + and basic_products.originUuid ]]> '' AND thirdId2 is NULL - and basic_products.originUuid ]]> '' + and basic_products.originUuid ]]> '' AND thirdId3 is NULL - and basic_products.originUuid ]]> '' + and basic_products.originUuid ]]> '' AND thirdId4 is NULL - and basic_products.originUuid ]]> '' + and basic_products.originUuid ]]> '' AND basic_udirel.updateTime is NULL @@ -1140,69 +1141,69 @@ select basic_udirel.*, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.categoryName, basic_products.bhltcjsl, basic_products.bhsycjsl,basic_products.xjdw + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.categoryName, + basic_products.bhltcjsl, + basic_products.bhsycjsl, + basic_products.xjdw FROM basic_udirel - INNER JOIN basic_products - on basic_udirel.uuid = basic_products.uuid + INNER JOIN basic_products + on basic_udirel.uuid = basic_products.uuid AND nameCode = #{nameCode} @@ -1731,14 +1735,14 @@ update - basic_udirel + basic_udirel set `relCode` = #{item.relCode} where id = #{item.id} @@ -1760,79 +1764,81 @@ SELECT b2.id FROM basic_products b1 - LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid + LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid AND b1.cpmctymc like concat('%', #{productName}, '%') @@ -1915,68 +1921,71 @@ select bu.id, - basic_products.uuid, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.categoryName + basic_products.uuid, + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.categoryName from basic_udirel AS bu - LEFT JOIN basic_products - ON bu.uuid = basic_products.uuid + LEFT JOIN basic_products + ON bu.uuid = basic_products.uuid where bu.id in #{item} @@ -2122,8 +2131,8 @@ basic_products.mjfs, basic_products.categoryName from basic_udirel AS bu - LEFT JOIN basic_products - ON bu.uuid = basic_products.uuid + LEFT JOIN basic_products + ON bu.uuid = basic_products.uuid where basic_products.nameCode = #{nameCode} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 7f8deb8dc..f8996097c 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5118,3 +5118,11 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'getSplitConfirm', CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'isSingQueue', ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用单品种槽位 0:关闭 1:开启''', 1); + + + +CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'isSplitCode', + ' tinyint NULL DEFAULT b''1''COMMENT ''是否拆零码''', + 1); + +