diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java index 9ca4180d8..535a34e08 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java @@ -77,9 +77,9 @@ public class SysWorkplaceQueueController extends BaseController { String scanCode = request.getScanCode(); - if (StrUtil.isNotEmpty(scanCode)){ + if (StrUtil.isNotEmpty(scanCode)) { UdiEntity udi = FilterUdiUtils.getUdi(scanCode); - if (udi != null ) request.setNameCode(udi.getUdi()); + if (udi != null) request.setNameCode(udi.getUdi()); } request.setScanCode(null); @@ -94,9 +94,9 @@ public class SysWorkplaceQueueController extends BaseController { @GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList") public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) { String scanCode = request.getScanCode(); - if (StrUtil.isNotEmpty(scanCode)){ + if (StrUtil.isNotEmpty(scanCode)) { UdiEntity udi = FilterUdiUtils.getUdi(scanCode); - if (udi != null ) request.setNameCode(udi.getUdi()); + if (udi != null) request.setNameCode(udi.getUdi()); } request.setScanCode(null); @@ -112,7 +112,7 @@ public class SysWorkplaceQueueController extends BaseController { @GetMapping("/udiwms/sysWorkplaceQueue/getByCode") public BaseResponse getByCode(SysWorkplaceQueueRequest request) { List list = sysWorkplaceQueueService.filterBindList(request); - if (list.size() == 0){ + if (list.size() == 0) { return ResultVOUtils.error("当前工位未绑定取货槽!"); } SysWorkplaceQueueResponse sysWorkplaceQueueResponse = list.get(0); @@ -200,18 +200,18 @@ public class SysWorkplaceQueueController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/udiwms/sysWorkplaceQueue/add/layer") - public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request){ - sysWorkplaceQueueService.addLayer(request,getUserId()); + public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request) { + sysWorkplaceQueueService.addLayer(request, getUserId()); return ResultVOUtils.success("增加成功"); } @PostMapping("/udiwms/WorkplaceQueue/bind") - public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest){ + public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest) { String relId = sysWorkplaceQueueBindRequest.getRelId(); List list = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, relId)); - if (CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑"); } @@ -232,14 +232,14 @@ public class SysWorkplaceQueueController extends BaseController { * 根据货位槽号 获取 货位槽信息 */ @PostMapping("/udiwms/sysWorkplaceQueue/getInfoByCode") - public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request){ + public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request) { String code = request.getCode(); - if (StrUtil.isEmpty(code)){ + if (StrUtil.isEmpty(code)) { return ResultVOUtils.error("货位槽码不能为空"); } List list = sysWorkplaceQueueService.filterBindList(request); - if (CollUtil.isEmpty(list)){ + if (CollUtil.isEmpty(list)) { return ResultVOUtils.error("未找到该货位槽码的信息"); } SysWorkplaceQueueResponse sysWorkplaceQueue = list.get(0); @@ -254,20 +254,21 @@ public class SysWorkplaceQueueController extends BaseController { * 根据货位槽号 获取 货位槽信息 */ @PostMapping("/udiwms/sysWorkplaceQueue/getProductByCode") - public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request){ + public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request) { String udiCode = request.getUdiCode(); - if (StrUtil.isEmpty(udiCode)){ + if (StrUtil.isEmpty(udiCode)) { return ResultVOUtils.error("UDI码不能为空"); } + UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode); - if (byNameCode == null){ + if (byNameCode == null) { return ResultVOUtils.error("UDI码未能识别出对应产品"); } String relId = byNameCode.getRelId(); List list = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getRelId, relId)); - if (CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑"); } @@ -278,7 +279,7 @@ public class SysWorkplaceQueueController extends BaseController { * 解除绑定 */ @PostMapping("/udiwms/sysWorkplaceQueue/removeProduct") - public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request){ + public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request) { sysWorkplaceQueueService.removeProduct(request); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index e6bc67e84..266d11ea7 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -75,16 +75,16 @@ public class SyncDataSetEntity { private int deviceInfo; //设备信息管理 private int deviceCheck;//巡检管理 -// private int deviceCheckDetail;//巡检设备具体信息 + // private int deviceCheckDetail;//巡检设备具体信息 // private int deviceCheckDetailItem;//巡检设备项目表 private int deviceRepairApply;//报修管理 -// private int deviceRepairDetail;//报修明细 + // private int deviceRepairDetail;//报修明细 // private int deviceRepair;//维修单 private int deviceUpkeep;//保养单 private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA /** - * 设备任务 + * 药品关联关系同步 */ private int drugDataTask; diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 65d304c75..5f1151da6 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -13,6 +13,7 @@ import com.glxp.api.dao.basic.SupEvaluateDetailMapper; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.SupEvaluateDetailEntity; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.CodeRel; @@ -107,8 +108,15 @@ public class UdiProductService extends ServiceImpl 13) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode); + if (udiEntity != null) { + nameCode = udiEntity.getUdi(); + } + } + return udiProductDao.findByNameCode(nameCode); } public UdiProductEntity findById(String id) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index a8436005a..54be9e7f1 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -34,65 +34,65 @@ - SELECT basic_products.*,basic_udirel.purType,basic_udirel.hcType,basic_udirel.id as relId + SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType, basic_udirel.id as relId FROM basic_products LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid - WHERE (basic_products.nameCode = #{nameCode}) + WHERE (basic_products.nameCode = #{nameCode} or basic_products.ybbm = #{nameCode}) limit 1 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, - pinyinInitial, - updateUser, - createTime, - createUser, - catalogname1, - catalogname2, - catalogname3, - matrial, - destinyType, - productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, + 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}, - #{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}, + #{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}, + #{productsType}, + #{prepnUnit}, + #{prepnSpec}, + #{storageCondition}, + #{transportCondition}, + #{indate}, + #{packMatrial}, + #{majorType}, + #{majorStatus}, + #{physicType}, + #{medicareType}, + #{bzgg}, #{requireScanCode}) 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, pinyinInitial) - values + (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) + values (#{item.id}, - #{item.uuid}, - #{item.originUuid}, - #{item.nameCode}, - #{item.deviceRecordKey}, - #{item.packRatio}, - #{item.packLevel}, - #{item.packUnit}, - #{item.bhxjsl}, - #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, - #{item.bhxjcpbm}, - #{item.bzcj}, - #{item.cpmctymc}, - #{item.cplb}, - #{item.flbm}, - #{item.ggxh}, - #{item.qxlb}, - #{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarywmc}, - #{item.sydycpbs}, - #{item.sjcpbm}, - #{item.versionNumber}, - #{item.diType}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.productType}, - #{item.scbssfbhph}, - #{item.scbssfbhxlh}, - #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq}, - #{item.cpms}, - #{item.allowNoBatch}, - #{item.allowNoExpire}, - #{item.allowNoProduct}, #{item.allowNoSerial}, - #{item.spmc}, - #{item.cplx}, - #{item.hchzsb}, - #{item.cpdls}, - #{item.price}, - #{item.basicPrductRemak1}, - #{item.basicPrductRemak2}, - #{item.basicPrductRemak3}, - #{item.basicPrductRemak4}, - #{item.basicPrductRemak5}, - #{item.basicPrductRemak6}, - #{item.basicPrductRemak7}, - #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy}, - #{item.zdcfsycs}, - #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs}, - #{item.categoryName}, #{item.pinyinInitial}) + #{item.uuid}, + #{item.originUuid}, + #{item.nameCode}, + #{item.deviceRecordKey}, + #{item.packRatio}, + #{item.packLevel}, + #{item.packUnit}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.sydycpbs}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.productType}, + #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq}, + #{item.cpms}, + #{item.allowNoBatch}, + #{item.allowNoExpire}, + #{item.allowNoProduct}, #{item.allowNoSerial}, + #{item.spmc}, + #{item.cplx}, + #{item.hchzsb}, + #{item.cpdls}, + #{item.price}, + #{item.basicPrductRemak1}, + #{item.basicPrductRemak2}, + #{item.basicPrductRemak3}, + #{item.basicPrductRemak4}, + #{item.basicPrductRemak5}, + #{item.basicPrductRemak6}, + #{item.basicPrductRemak7}, + #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy}, + #{item.zdcfsycs}, + #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs}, + #{item.categoryName}, #{item.pinyinInitial}) @@ -566,7 +567,7 @@ transportCondition=#{transportCondition}, - indate=#{indate}, + indate=#{indate}, useAttribute=#{useAttribute}, @@ -588,7 +589,7 @@ WHERE nameCode = #{nameCode} - and uuid = #{uuid} + and uuid = #{uuid} @@ -1002,7 +1003,6 @@ matrial=#{matrial}, - where id = #{id} @@ -1034,7 +1034,7 @@ @@ -1209,13 +1209,13 @@ @@ -1224,64 +1224,64 @@ diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 12e247124..1bb01db45 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4824,4 +4824,10 @@ CREATE TABLE IF NOT EXISTS `third_ali_drug` AUTO_INCREMENT = 8052 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci - ROW_FORMAT = Dynamic; \ No newline at end of file + ROW_FORMAT = Dynamic; + + + +CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask', + ' tinyint NULL DEFAULT NULL COMMENT ''药品关联关系同步''', + 1);