From 2fd1ca35592b5046d26445aacff533b1ad5e16c1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 9 Jun 2023 18:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=AA=8C=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 34 +- .../inout/IoOrderReviewController.java | 7 +- src/main/resources/schemas/schema_v2.1.sql | 817 +++++++++--------- 3 files changed, 431 insertions(+), 427 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 fde9b530..07058514 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -626,30 +626,30 @@ public class IoCodeTempController extends BaseController { exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); + + if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) { + return ResultVOUtils.error(500, "重复扫码！"); + } + BaseResponse invRes = checkInv(bussinessTypeEntity, exitLocalEntity); if (invRes != null) { return invRes; } - if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) { - if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { - String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); - if (errMsg != null) { - return ResultVOUtils.error(500, errMsg); - } else - codeTempService.updateById(exitLocalEntity); - } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { - String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity); - if (errMsg != null) { - return ResultVOUtils.error(500, errMsg); - } else - codeTempService.updateById(exitLocalEntity); - } else { + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { + String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else + codeTempService.updateById(exitLocalEntity); + } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { + String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else codeTempService.updateById(exitLocalEntity); - } - } else { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT); + codeTempService.updateById(exitLocalEntity); } } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 7056ceef..1e0c8a79 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -336,9 +336,10 @@ public class IoOrderReviewController extends BaseController { checkCode = checkCode.replace("\u001D", ""); } if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { - if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED - && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { - return Constant.CHECK_REPEAT; + if (StrUtil.isNotEmpty(checkOrderCodesBean.getSerialNo())) { + if (checkOrderCodesBean.getScanCount() > 0) { + return Constant.CHECK_REPEAT; + } } int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode()); if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) { diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 2421a141..2a85ca6d 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -4,412 +4,415 @@ CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', -# 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); -# CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', -# 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); -# CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', -# 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); -# CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', -# 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'dbDiCompany', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1); -# -# CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'relKey', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'varchar(255) ', 1); -# -# -# -# CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1); -# -# CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); -# CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3); -# -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1); -# -# CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1); -# -# CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint ', 1); -# -# -# -# CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1); -# -# -# CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1); -# -# -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'busType', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1); -# -# -# -# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1); -# -# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1); -# -# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1); -# -# -# CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1); -# -# -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1); -# -# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, -# `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) -# VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1); -# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, -# `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) -# VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1); -# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, -# `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) -# VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1); -# -# -# CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originCount', 'int', 1); -# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1); -# -# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'mainAction', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'action', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1); -# -# INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, -# `paramType`, `paramExplain`) -# VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '0：否；1：是'); -# -# CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1); -# CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'direct', 'tinyint', 1); -# -# -# CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessType', 'varchar(255)', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1); -# -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1); -# -# -# CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1); -# -# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) -# VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据'); -# -# -# -# CALL Pro_Temp_ColumnWork('inv_product', 'nowStock', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product', 'frozenCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product', 'planInCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product', 'planOutCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product', 'onWayCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product', 'availableStock', 'int ', 1); -# -# CALL Pro_Temp_ColumnWork('inv_product_detail', 'inCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_product_detail', 'outCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'inCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'outCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'inCount', 'int ', 1); -# CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'outCount', 'int ', 1); -# -# -# CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_set', 'orderToInSyncTime', 'int', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'supCert', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); -# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); -# -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1); -# -# -# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) -# VALUES (211, 'syncDi', '0 24 3 * * ?', NULL, NULL); -# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) -# VALUES (212, 'syncCompany', '0 0 3 * * 1', NULL, NULL); -# -# -# -# # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); -# # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); -# -# -# CREATE TABLE IF NOT EXISTS `inv_prein_product` -# ( -# `id` int NOT NULL AUTO_INCREMENT, -# `relIdFk` bigint NULL DEFAULT NULL COMMENT '耗材字典ID', -# `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', -# `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', -# `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', -# `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', -# `inCount` int NULL DEFAULT NULL COMMENT '入库数量', -# `outCount` int NULL DEFAULT NULL COMMENT '出库数量', -# `reCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量', -# `customerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '客户ID', -# `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', -# `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', -# `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', -# `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', -# `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', -# PRIMARY KEY (`id`) USING BTREE -# ) ENGINE = InnoDB -# CHARACTER SET = utf8mb4 -# COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存表' -# ROW_FORMAT = DYNAMIC; -# -# SET FOREIGN_KEY_CHECKS = 1; -# -# -# -# CREATE TABLE IF NOT EXISTS `inv_prein_product_detail` -# ( -# `id` int NOT NULL AUTO_INCREMENT, -# `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UDI码', -# `mainAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '出入单据类型', -# `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '单据类型', -# `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单号外键', -# `relId` int NOT NULL COMMENT '耗材字典ID', -# `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', -# `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', -# `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', -# `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', -# `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', -# `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商', -# `count` int NULL DEFAULT NULL COMMENT '扫码数量', -# `reCount` int NULL DEFAULT NULL COMMENT '实际数量', -# `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', -# `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '仓库编码', -# `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', -# `purchaseType` tinyint NULL DEFAULT NULL COMMENT '采购类型', -# `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', -# PRIMARY KEY (`id`) USING BTREE -# ) ENGINE = InnoDB -# CHARACTER SET = utf8mb4 -# COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存详情表' -# ROW_FORMAT = DYNAMIC; -# -# -# CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes` -# ( -# `id` int NOT NULL AUTO_INCREMENT, -# `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, -# `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, -# `outChange` tinyint NULL DEFAULT NULL, -# `orderStatus` tinyint NULL DEFAULT NULL, -# PRIMARY KEY (`id`) USING BTREE -# ) ENGINE = InnoDB -# AUTO_INCREMENT = 128 -# CHARACTER SET = utf8mb4 -# COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型' -# ROW_FORMAT = DYNAMIC; -# -# -# # 修改主键为LONG -# CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2); -# -# CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2); -# -# -# CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2); -# -# -# CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2); -# -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2); -# -# -# CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2); -# -# CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); -# -# CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); -# -# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2); -# CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1); -# +CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', + 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); +CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', + 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); +CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', + 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', + 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1); + +CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1); + +CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'dbDiCompany', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1); + +CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'relKey', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'varchar(255) ', 1); + + + +CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1); + +CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); +CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1); + +CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1); + +CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint ', 1); + + + +CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1); + + +CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1); + + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'busType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1); + + + +CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1); + +CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1); + +CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1); + + +CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1); + + +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1); + +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1); +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1); +INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, + `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) +VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1); + + +CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originCount', 'int', 1); +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1); + +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'mainAction', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'action', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1); + +INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`) +VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '0：否；1：是'); + +CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1); +CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1); + +CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'direct', 'tinyint', 1); + + +CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessType', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1); + + +CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1); + +INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) +VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据'); + + + +CALL Pro_Temp_ColumnWork('inv_product', 'nowStock', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product', 'frozenCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product', 'planInCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product', 'planOutCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product', 'onWayCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product', 'availableStock', 'int ', 1); + +CALL Pro_Temp_ColumnWork('inv_product_detail', 'inCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_product_detail', 'outCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'inCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'outCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'inCount', 'int ', 1); +CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'outCount', 'int ', 1); + + +CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1); + +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1); + +CALL Pro_Temp_ColumnWork('sync_data_set', 'orderToInSyncTime', 'int', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'supCert', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1); + + +INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) +VALUES (211, 'syncDi', '0 24 3 * * ?', NULL, NULL); +INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) +VALUES (212, 'syncCompany', '0 0 3 * * 1', NULL, NULL); + + + +# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); +# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); + + +CREATE TABLE IF NOT EXISTS `inv_prein_product` +( + `id` int NOT NULL AUTO_INCREMENT, + `relIdFk` bigint NULL DEFAULT NULL COMMENT '耗材字典ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `inCount` int NULL DEFAULT NULL COMMENT '入库数量', + `outCount` int NULL DEFAULT NULL COMMENT '出库数量', + `reCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量', + `customerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '客户ID', + `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存表' + ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; + + + +CREATE TABLE IF NOT EXISTS `inv_prein_product_detail` +( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UDI码', + `mainAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '出入单据类型', + `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '单据类型', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单号外键', + `relId` int NOT NULL COMMENT '耗材字典ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商', + `count` int NULL DEFAULT NULL COMMENT '扫码数量', + `reCount` int NULL DEFAULT NULL COMMENT '实际数量', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '仓库编码', + `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', + `purchaseType` tinyint NULL DEFAULT NULL COMMENT '采购类型', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存详情表' + ROW_FORMAT = DYNAMIC; + + +CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes` +( + `id` int NOT NULL AUTO_INCREMENT, + `action` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `outChange` tinyint NULL DEFAULT NULL, + `orderStatus` tinyint NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 128 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型' + ROW_FORMAT = DYNAMIC; + + +# 修改主键为LONG +CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2); + + +CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2); + + +CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2); + + +CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2); +CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1); + # ALTER TABLE `auth_dept_user` # ADD UNIQUE (`userId`, deptId); -# -# -# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2); -# CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2); -# -# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1); -# CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1); -# -# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1); -# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1); -# -# -# -# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2); -# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2); -# CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2); -# -# -# CALL Pro_Temp_ColumnWork('pur_order_detail', 'price', 'decimal(10, 2)', 1); -# -# -# INSERT ignore INTO `sys_pdf_template_relevance_label`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (1, 30, 110, 0, 9, '内部码打印', NULL, NULL, NULL, NULL, 'lable'); -# INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (1, 31, 110, 0, NULL, '配送企业资质打印', NULL, NULL, NULL, NULL, 'reportForms'); -# INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (2, 32, 110, 0, NULL, '生产企业资质打印', NULL, NULL, NULL, NULL, 'reportForms'); -# INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (3, 33, 110, 0, NULL, '配送产品资质打印', NULL, NULL, NULL, NULL, 'reportForms'); -# INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (4, 33, 110, 0, NULL, '库存报表打印', NULL, NULL, NULL, NULL, 'reportForms'); -# INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, -# `localAction`, `remark1`, `remark2`, `remark3`, `printType`, -# `modelKey`) -# VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms'); -# CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1); -# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1); -# + + +CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2); + +CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1); + + + +CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2); +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2); +CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2); + + +CALL Pro_Temp_ColumnWork('pur_order_detail', 'price', 'decimal(10, 2)', 1); + + +INSERT ignore INTO `sys_pdf_template_relevance_label`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (1, 30, 110, 0, 9, '内部码打印', NULL, NULL, NULL, NULL, 'lable'); +INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (1, 31, 110, 0, NULL, '配送企业资质打印', NULL, NULL, NULL, NULL, 'reportForms'); +INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (2, 32, 110, 0, NULL, '生产企业资质打印', NULL, NULL, NULL, NULL, 'reportForms'); +INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (3, 33, 110, 0, NULL, '配送产品资质打印', NULL, NULL, NULL, NULL, 'reportForms'); +INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (4, 33, 110, 0, NULL, '库存报表打印', NULL, NULL, NULL, NULL, 'reportForms'); +INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, + `localAction`, `remark1`, `remark2`, `remark3`, `printType`, + `modelKey`) +VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms'); +CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1); +CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1); + + +call Modify_index('basic_products','uuid','idx_uuid','BTREE'); +