From 5d6bb97dea6564e047184fe88702c6de0363fe91 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 26 Feb 2025 21:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E4=B8=8E=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E4=B8=8A=E8=B4=A7=EF=BC=8C=E5=AE=8C=E6=88=90=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 23 ++++---- .../controller/inout/IoSplitController.java | 7 ++- .../controller/inout/WorkPutController.java | 29 ---------- .../api/entity/inout/IoSplitCodeEntity.java | 10 ++-- .../entity/inout/IoSplitFifoCodeEntity.java | 10 ++-- .../collect/IoCollectOrderService.java | 29 +++++----- .../api/service/inout/IoAddInoutService.java | 11 ---- .../api/service/inout/IoSplitCodeService.java | 48 ++++++++++++++++ .../service/inout/IoSplitFifoCodeService.java | 5 -- .../service/inout/IoSplitFifoInvService.java | 8 +-- .../task/AsyncIoCollectOrderFinishTask.java | 13 +++-- src/main/resources/schemas/schema_v2.4.sql | 57 +++++++++++-------- 12 files changed, 136 insertions(+), 114 deletions(-) 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 66f7f15a8..5e3ceaf66 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -3142,25 +3142,25 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/deleteCode") - public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest) { // 已经做过校验了 所以 要上药队列 还是库存队列 的码 然后进行扣减库存 删码 IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest); - if (ioCodeTemp != null){ + if (ioCodeTemp != null) { codeTempService.removeCodeById(ioCodeTemp); return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest)); } IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest); - if (ioSplitFifoCode != null){ + if (ioSplitFifoCode != null) { ArrayList codes = new ArrayList<>(); codes.add(ioSplitFifoCode.getCode()); - ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode()); + ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode()); return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest)); } //判断是上位队列 还是 库存 - return ResultVOUtils.error(500,"追溯码不存在"); + return ResultVOUtils.error(500, "追溯码不存在"); } - public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest){ + public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode()); UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); udiEntity.setCode(filterCodeRequest.getCode()); @@ -3170,7 +3170,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/deleteCodes") - public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest) { List codeList = filterCodeRequest.getCodeList(); AddCodeResult addCodeResult = new AddCodeResult(); List vailCodeResultResponses = new ArrayList<>(); @@ -3178,7 +3178,7 @@ public class IoCodeTempController extends BaseController { VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); filterCodeRequest.setCode(code); IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest); - if (ioCodeTemp != null){ + if (ioCodeTemp != null) { codeTempService.removeCodeById(ioCodeTemp); vailCodeResultResponse.setCode(code); vailCodeResultResponse.setStatus(1); @@ -3187,10 +3187,10 @@ public class IoCodeTempController extends BaseController { continue; } IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest); - if (ioSplitFifoCode != null){ + if (ioSplitFifoCode != null) { ArrayList codes = new ArrayList<>(); codes.add(ioSplitFifoCode.getCode()); - ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode()); + ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode()); vailCodeResultResponse.setCode(code); vailCodeResultResponse.setStatus(1); vailCodeResultResponse.setErrMsg("正确"); @@ -3208,7 +3208,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/warehouse/inout/fallback") - public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest){ + public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest) { List codeList = codeTempService.selectListByGroupNumber(filterCodeRequest.getGroupNumber()); for (IoCodeTempEntity codeTempEntity : codeList) { codeTempService.removeCodeById(codeTempEntity); @@ -3217,5 +3217,4 @@ public class IoCodeTempController extends BaseController { } - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 7f87f9e42..18494c654 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -148,7 +148,12 @@ public class IoSplitController extends BaseController { if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode()); //todo 后面改 - splitCodeService.preAutoTagCode(collectOrder, null); + if(sysWorkplaceDocumentEntity.getProductType() == 1){ + + }else { + splitCodeService.preAutoTagCode(collectOrder, null); + } + collectOrderService.updateById(collectOrder); return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看"); } else { diff --git a/src/main/java/com/glxp/api/controller/inout/WorkPutController.java b/src/main/java/com/glxp/api/controller/inout/WorkPutController.java index c2c2bfbf4..702633469 100644 --- a/src/main/java/com/glxp/api/controller/inout/WorkPutController.java +++ b/src/main/java/com/glxp/api/controller/inout/WorkPutController.java @@ -438,13 +438,6 @@ public class WorkPutController extends BaseController { } else if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { return ResultVOUtils.error(500, "该产品不允许以使用单元入库！"); } - -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入整取产品！"); -// } -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！"); -// } //计算实际数量 if (bussinessTypeEntity.isUse()) { codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse)); @@ -501,28 +494,6 @@ public class WorkPutController extends BaseController { return ResultVOUtils.error(500, "请先录入业务详情"); } } - - -// BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); -// if (baseResponse != null) { -// deleteEmptyBillNo(orderEntity); -// } -// genDetaiEntity = codeEnttity; -// if (baseResponse == null) { -// baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk); -// if (baseResponse != null) -// return baseResponse; -// } else { -// if (baseResponse.getCode() == 501) { -// return baseResponse; -// } else if (baseResponse.getCode() == 502) { -// return baseResponse; -// } -// checkSupId(bussinessTypeEntity, codeEnttity, unitFk); -// return baseResponse; -// } - - //预出库退货校验队列库存 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEnttity.getCode(), orderEntity.getWorkPlaceCode()); diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java index f9dbb4fd1..0598091cd 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java @@ -245,11 +245,11 @@ public class IoSplitCodeEntity implements Serializable { private String measname; @TableField(exist = false) private String manufactory; -// /** -// * 医保编码，组套编码 -// */ -// @TableField(value = "ybbm") -// private String ybbm; + /** + * 医保编码，组套编码 + */ + @TableField(value = "ybbm") + private String ybbm; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java index 1e17228a3..94a99f68c 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java @@ -219,11 +219,11 @@ public class IoSplitFifoCodeEntity implements Serializable { */ @TableField(value = "workPlaceQueueCode") private String workPlaceQueueCode; -// /** -// * 医保编码，组套编码 -// */ -// @TableField(value = "ybbm") -// private String ybbm; + /** + * 医保编码，组套编码 + */ + @TableField(value = "ybbm") + private String ybbm; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index e398e8f83..6d21429f4 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -584,20 +584,21 @@ public class IoCollectOrderService extends ServiceImpl ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper().select("id", "count", "reCount", "bindRlFk", "batchNo", "price").eq("orderIdFk", orderEntity.getBillNo())); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), codeTempEntity.getSupId()); -// if (StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode()) && CollUtil.isNotEmpty(ioOrderDetailCodeEntities)) { -// boolean isSame = false; -// for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntities) { -// if (ioOrderDetailCodeEntity.getBindRlFk().equals(udiRelevanceResponse.getId())) { -// isSame = true; -// } -// } -// if (!isSame) -// throw new JsonException(507, "上货产品不符！"); -// } - if (codeTempEntity.getPrice() == null && udiRelevanceResponse.getPrice() != null) { codeTempService.updateById(IoCodeTempEntity.builder().id(codeTempEntity.getId()).price(udiRelevanceResponse.getPrice()).build()); } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 68e4cfd28..44a592751 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -97,6 +97,16 @@ public class IoSplitCodeService extends ServiceImpl findSplitCodes(String ybbm, String batchNo, Long workPlaceCode) { + List ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper() + .eq(StrUtil.isNotEmpty(batchNo), IoSplitCodeEntity::getBatchNo, batchNo) + .eq(workPlaceCode != null, IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode) + .gt(IoSplitCodeEntity::getRemainCount, 0) + .in(IoSplitCodeEntity::getStatus, 1, 2).orderByAsc(IoSplitCodeEntity::getInBactchNo)); + return ioSplitCodeEntities; + } + public IoSplitCodeEntity findByCode(String code, Long workPlaceCode) { if (workPlaceCode == null) { return null; @@ -657,6 +667,44 @@ public class IoSplitCodeService extends ServiceImpl collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo()); + for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { + List splitFifoCodeEntities = + splitFifoCodeService.findByCheckCode(putWorkPlaceCode, + collectOrderBiz.getYbbm(), collectOrderBiz.getBatchNo(), queueCode); + int total = splitFifoCodeEntities.stream() + .mapToInt(IoSplitFifoCodeEntity::getTotalCount) + .sum(); + collectOrderBiz.setTempWorkPlaceCount(total); + List splitCodeEntities = splitCodeService.findSplitCodes(collectOrderBiz.getRelId() + , collectOrderBiz.getBatchNo(), putWorkPlaceCode); + int splitTotal = splitCodeEntities.stream() + .mapToInt(IoSplitCodeEntity::getRemainCount) + .sum(); + collectOrderBiz.setTempSplitCount(splitTotal); + total = total + splitTotal; + if (total >= IntUtil.value(collectOrderBiz.getCount())) { + collectOrderBiz.setAutoTagStatus(2); + } else if (total > 0) { + collectOrderBiz.setAutoTagStatus(3); + } else + collectOrderBiz.setAutoTagStatus(1); + } + collectOrderBizService.updateBatchById(collectOrderBizs); + } + /** * 拆零单据撤回，则将拆零表剩余数量加回预出库队列 diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index e46e80d55..6a7744576 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -68,9 +68,6 @@ public class IoSplitFifoCodeService extends ServiceImpl list = collectOrderService.list(new LambdaQueryWrapper().eq(IoCollectOrder::getTagStatus, 1)); - + IoCollectSet collectSet = collectSetService.getSet(); if (CollUtil.isNotEmpty(list)) { for (IoCollectOrder collectOrder : list) { SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrder.getBusType()); @@ -84,18 +87,18 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer { collectOrderRequest.setWorkPlaceCode(sysWorkplaceBus.getWorkplaceCode()); collectOrderRequest.setBusType(sysWorkplaceBus.getBusTypeCode()); collectOrderRequest.setBillNo(collectOrder.getBillNo()); - if (sysWorkplaceDocumentEntity.getAutoHandle()) { + if (IntUtil.value(collectSet.getAutoFinishOrder())) { //单据是否自动完成 是 调用 完成 AuthAdmin authAdmin = new AuthAdmin(); authAdmin.setId(1l); collectOrderRequest.setUpdateUser(1l); try { collectOrderService.finishOrder(collectOrderRequest, authAdmin, true); - }catch (Exception e){ - log.error("自动完成第三方处方单异常",e); + } catch (Exception e) { + log.error("自动完成第三方处方单异常", e); } - } + } } } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index d1fd6917f..f792bf1af 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5163,8 +5163,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow', - - CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount', 'int NULL DEFAULT NULL COMMENT ''入库码数量''', 1); @@ -5196,11 +5194,11 @@ VALUES (463279, 213, '2', 1, 'macBind', '灯组是否绑定', 'select', NULL, NU -CREATE TABLE IF NOT EXISTS `sys_order_led` +CREATE TABLE IF NOT EXISTS `sys_order_led` ( `id` int NOT NULL, `ledNum` tinyint NULL DEFAULT NULL COMMENT '1.红，2：橙，3：蓝，4：绿', - `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', + `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `updateTime` datetime NULL DEFAULT NULL, `createTime` datetime NULL DEFAULT NULL, @@ -5222,7 +5220,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'relCodeCount', ' int DEFAULT ''0'' COMMENT ''关联关系数量''', 1); INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark`) -VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); +VALUES (510, 'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', 'int NULL DEFAULT NULL COMMENT ''扫码数量''', @@ -5268,25 +5266,28 @@ CREATE TABLE IF NOT EXISTS `sys_workplace_region` ALTER TABLE rel_code_batch MODIFY COLUMN `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '批次号'; -CREATE TABLE IF NOT EXISTS `inv_product_batch` ( - `id` int NOT NULL AUTO_INCREMENT, - `inBatchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '内部批号', - `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '入库单号', - `relIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '产品ID', - `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最小销售标识', - `batchNo` varchar(60) DEFAULT NULL COMMENT '批次号', - `price` decimal(10,3) DEFAULT NULL COMMENT '价格', - `produceDate` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生产日期', - `expireDate` varchar(60) DEFAULT NULL COMMENT '失效日期', - `inCount` int DEFAULT NULL COMMENT '入库数量', - `reCount` int DEFAULT NULL COMMENT '剩余数量', - `supId` varchar(60) DEFAULT NULL COMMENT '供应商ID', - `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '部门编码', - `createTime` datetime DEFAULT NULL COMMENT '创建时间', - `updateTime` datetime DEFAULT NULL COMMENT '更新时间', - `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '仓库编码', +CREATE TABLE IF NOT EXISTS `inv_product_batch` +( + `id` int NOT NULL AUTO_INCREMENT, + `inBatchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '内部批号', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '入库单号', + `relIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '产品ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(60) DEFAULT NULL COMMENT '批次号', + `price` decimal(10, 3) DEFAULT NULL COMMENT '价格', + `produceDate` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(60) DEFAULT NULL COMMENT '失效日期', + `inCount` int DEFAULT NULL COMMENT '入库数量', + `reCount` int DEFAULT NULL COMMENT '剩余数量', + `supId` varchar(60) DEFAULT NULL COMMENT '供应商ID', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '部门编码', + `createTime` datetime DEFAULT NULL COMMENT '创建时间', + `updateTime` datetime DEFAULT NULL COMMENT '更新时间', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '仓库编码', PRIMARY KEY (`id`) USING BTREE - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci; CALL Pro_Temp_ColumnWork('auth_company', 'auditComment', @@ -5337,3 +5338,13 @@ CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'preInBillNo', CALL Pro_Temp_ColumnWork('sys_workplace', 'productType', 'tinyint NULL DEFAULT NULL COMMENT ''业务类型 1器械业务 2药品业务''', 1); + + + +CALL Pro_Temp_ColumnWork('io_split_fifo_code', 'ybbm', + ' varchar(50) NULL DEFAULT NULL COMMENT ''医保编码''', + 1); + +CALL Pro_Temp_ColumnWork('io_split_code', 'ybbm', + ' varchar(50) NULL DEFAULT NULL COMMENT ''医保编码''', + 1);