From e3c6399aa51992ca09f2ccc97272d872c8dce895 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 13:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/basic/BasicBusTypePreDao.java | 4 +- .../entity/basic/BasicBusTypePreEntity.java | 5 + .../req/basic/BussinessTypeSaveRequest.java | 1 - .../basic/IBasicBusTypePreService.java | 3 - .../impl/BasicBusTypePreServiceImpl.java | 5 - .../service/inout/IoChangeInoutService.java | 26 +++-- .../service/inout/IoCheckInoutService.java | 16 +-- .../com/glxp/api/task/AsyncFetchUdiTask.java | 4 +- .../java/com/glxp/api/task/AsyncUdiTask.java | 4 +- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +- .../glxp/api/util/udi/UdiCalCountUtil.java | 4 +- .../mapper/basic/BasicBusTypePreDao.xml | 86 ++++++++++++++++ .../mapper/thrsys/ThrInvProductsDao.xml | 4 +- src/main/resources/schemas/schema_v2.1.sql | 97 ++++++++++++++++++- 14 files changed, 223 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index c7be7d40a..72ff84fb9 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -42,4 +42,6 @@ public interface BasicBusTypePreDao extends BaseMapperPlus selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); -} \ No newline at end of file + boolean insertOrUpdate(BasicBusTypePreEntity record); + +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index c81ca2e11..673757866 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -123,6 +123,11 @@ public class BasicBusTypePreEntity { @TableField(value = "remark") private String remark; +// 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收/寄售转入库单模式 + + @TableField(value = "createType") + private int createType; + /** * 目标业务单 diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index b5496efb0..c301844ac 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -294,7 +294,6 @@ public class BussinessTypeSaveRequest { private boolean fillCodeRel; - private boolean checkVailDate; private boolean checkExpire; private boolean checkCertExpire; diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 3822a371d..8c3aa4c01 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,7 +5,6 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; -import java.util.Date; import java.util.List; /** @@ -80,6 +79,4 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); - - List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 1fb71d32e..2b898f0d9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,11 +105,6 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } - @Override - public List findByLastTime(Date lastUpdateTime) { - return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); - } - /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index e64170fb4..9aa37fe0c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -190,15 +190,27 @@ public class IoChangeInoutService { String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(targetBustypeEntity.getPrefix()), "yyyyMMdd")); outOrder.setBillNo(orderNo); - if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + if (bussinessChangeTypeEntity.getCreateType() == 1) {//送货至入库补单 outOrder.setCustomerId(corpName); outOrder.setFromCorp(corpName); outOrder.setFromInvCode(null); outOrder.setFromDeptCode(null); + } else if (bussinessChangeTypeEntity.getCreateType() == 3) { //寄售、预验收补单 + if (targetBustypeEntity.getActionType() == 2) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000001"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } else if (targetBustypeEntity.getActionType() == 3) { + outOrder.setCustomerId(null); + outOrder.setFromCorp(null); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode("1000002"); + outOrder.setFromInvCode(invWarehouseEntity.getCode()); + outOrder.setFromDeptCode(invWarehouseEntity.getParentId()); + } } else { outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); - - InvWarehouseEntity curInv = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); InvWarehouseEntity upInv = invWarehouseService.findByInvSubByCode(curInv.getParentCode()); outOrder.setFromInvCode(upInv.getCode()); @@ -217,13 +229,7 @@ public class IoChangeInoutService { InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setDeptCode(invWarehouseEntity.getParentId()); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); - if ("1".equals(systemParamConfigEntity.getParamValue())) { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - } else { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); - } - + outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); //互填单号 orderEntity.setUllageSupNo(outOrder.getBillNo()); orderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 6028d9056..ea2d67d78 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -265,13 +265,13 @@ public class IoCheckInoutService { orderDetailBizService.insert(orderDetailBizEntity); - //生成单据结果 - IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); - orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); - orderDetailResultEntity.setId(null); - orderDetailResultService.insert(orderDetailResultEntity); + //生成单据结果 + IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); + orderDetailResultEntity.setId(null); + orderDetailResultService.insert(orderDetailResultEntity); }); } @@ -812,6 +812,8 @@ public class IoCheckInoutService { }); } + + //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { //生成库存 diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index 3f49738f5..ccf16ef4d 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -16,8 +16,8 @@ import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class AsyncFetchUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncFetchUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/AsyncUdiTask.java b/src/main/java/com/glxp/api/task/AsyncUdiTask.java index 001d5a507..8db9661d4 100644 --- a/src/main/java/com/glxp/api/task/AsyncUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncUdiTask.java @@ -16,8 +16,8 @@ import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class AsyncUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index dee034dcb..3b3ed6eea 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index aebc2833c..2270c94aa 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java @@ -21,14 +21,14 @@ public class UdiCalCountUtil { public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { int actCount; - if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() != 2) { + if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { udiRelevanceResponse.setBhzxxsbzsl(1); } - if (udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { + if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { udiRelevanceResponse.setZxxsbzbhsydysl(1); } actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index ee878512b..ef64d7378 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -61,4 +61,90 @@ + + + insert into basic_bustype_pre + + + id, + + intro, + `action`, + `index`, + beforeTime, + changeType, + defaultDeptCode, + defaultInvCode, + deptCode, + invCode, + originAction, + changeEnable, + supplementAll, + `createUser`, + updateUser, + createTime, + updateTime, + remark, + targetBusAction, + busBeforeTime, + auditStatus, + busAuditStatus,createType, + + values + + + #{id,jdbcType=INTEGER}, + + #{intro,jdbcType=VARCHAR}, + #{action,jdbcType=VARCHAR}, + #{index,jdbcType=TINYINT}, + #{beforeTime,jdbcType=INTEGER}, + #{changeType,jdbcType=TINYINT}, + #{defaultDeptCode,jdbcType=VARCHAR}, + #{defaultInvCode,jdbcType=VARCHAR}, + #{deptCode,jdbcType=VARCHAR}, + #{invCode,jdbcType=VARCHAR}, + #{originAction,jdbcType=VARCHAR}, + #{changeEnable,jdbcType=TINYINT}, + #{supplementAll,jdbcType=TINYINT}, + #{createUser,jdbcType=VARCHAR}, + #{updateUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, + #{targetBusAction,jdbcType=VARCHAR}, + #{busBeforeTime,jdbcType=TINYINT}, + #{auditStatus,jdbcType=TINYINT}, + #{busAuditStatus,jdbcType=TINYINT}, #{createType,jdbcType=TINYINT}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + intro = #{intro,jdbcType=VARCHAR}, + `action` = #{action,jdbcType=VARCHAR}, + `index` = #{index,jdbcType=TINYINT}, + beforeTime = #{beforeTime,jdbcType=INTEGER}, + changeType = #{changeType,jdbcType=TINYINT}, + defaultDeptCode = #{defaultDeptCode,jdbcType=VARCHAR}, + defaultInvCode = #{defaultInvCode,jdbcType=VARCHAR}, + deptCode = #{deptCode,jdbcType=VARCHAR}, + invCode = #{invCode,jdbcType=VARCHAR}, + originAction = #{originAction,jdbcType=VARCHAR}, + changeEnable = #{changeEnable,jdbcType=TINYINT}, + supplementAll = #{supplementAll,jdbcType=TINYINT}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + targetBusAction = #{targetBusAction,jdbcType=VARCHAR}, + busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, + auditStatus = #{auditStatus,jdbcType=TINYINT}, + busAuditStatus = #{busAuditStatus,jdbcType=TINYINT}, + createType = #{createType,jdbcType=TINYINT}, + + + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 955b17265..0a44c4925 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -100,7 +100,7 @@ batchNo=#{batchNo}, warehouseName=#{warehouseName}, warehouseCode=#{warehouseCode}, - registerCertNo=#{registerCertNo}, + registerCertNo=#{registerCertNo},8 manufacturingDate=#{manufacturingDate}, expirationDate=#{expirationDate}, spaceCode=#{spaceCode}, @@ -124,4 +124,4 @@ WHERE id = #{id} - \ No newline at end of file + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 68292a1e4..82ca826fa 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -10,6 +10,8 @@ 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_code_lost', 'nameCode', 'varchar(255) ', 1); @@ -20,6 +22,10 @@ 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('auth_warehouse', 'advanceType', 'tinyint', 1); @@ -60,8 +66,8 @@ 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('basic_bussiness_type', 'checkPreInOrders', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); @@ -99,6 +105,17 @@ 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, '', 2, 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, '', 3, 1); + + CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1); @@ -108,7 +125,6 @@ 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`, @@ -136,6 +152,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', '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, '删除日志数据'); @@ -153,6 +171,7 @@ 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); @@ -172,3 +191,75 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'd # 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; + + + +