From 03097198f5b57b017794e69e6d59ee66f2b52365 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Apr 2023 23:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SyncDataSetController.java | 1 + .../entity/sync/BasicExportStatusEntity.java | 2 +- .../api/entity/system/SyncDataSetEntity.java | 1 + .../com/glxp/api/idc/utils/TableUtils.java | 39 +++++---- .../api/res/sync/SpsSyncOrderResponse.java | 4 +- .../api/res/system/SyncDataSetResponse.java | 1 + .../service/inout/IoCheckInoutService.java | 39 ++++----- .../glxp/api/service/sync/HeartService.java | 82 ++++++++++++++----- .../glxp/api/service/sync/UpBasicService.java | 10 +++ src/main/resources/application-pro.yml | 2 +- .../mybatis/mapper/system/SyncDataSetDao.xml | 6 +- src/main/resources/schemas/schema_v2.1.sql | 53 ++++++++++-- 12 files changed, 174 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index c63e17bec..74e34b4e7 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -65,6 +65,7 @@ public class SyncDataSetController { syncDataSetEntity.setBusTypes(null); if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) { + syncDataChangeBustypeService.deleteAll(); syncDataChangeBustypeService.inserts(syncDataSetResponse.getChangeBusTypes()); } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 63056f0cc..621b094a5 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -21,6 +21,6 @@ public class BasicExportStatusEntity { /** * 接收状态 -1：接收失败 0：等待接收 1：接收成功 */ - private Integer receiveStatus; + private String receiveStatus; } 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 429f8ff0b..e099d24ef 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -11,6 +11,7 @@ public class SyncDataSetEntity { private boolean typeThird; //第三方单据类型 private boolean basicProducts; //耗材字典 private boolean basicCorp; //往来单位字典 + private boolean basicDept; //部门字典 private boolean basicInv; //仓库字典 private boolean basicThirdProducts; //第三方产品信息 private boolean basicThirdCorp; //第三方往来信息 diff --git a/src/main/java/com/glxp/api/idc/utils/TableUtils.java b/src/main/java/com/glxp/api/idc/utils/TableUtils.java index 4a086a9ef..98838e2df 100644 --- a/src/main/java/com/glxp/api/idc/utils/TableUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/TableUtils.java @@ -4,13 +4,9 @@ package com.glxp.api.idc.utils; * @author chenqf */ public class TableUtils { - /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/ + /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/ private static final String[] SYNC_TABLES = { - "entrustAction//basic_entrust_accept/id///updateTime///委托验收", - "basicProducts//basic_udirel/id///updateTime///耗材字典", - "/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情", - "basicCorp//basic_corp/id///updateTime///往来单位", - "//company_product_relevance/id///updateTime///供应商关联信息", + "typeThird//thr_bustype_origin/id///updateTime///第三方单据类型", "basicThirdCorp//thr_corp/id///updateTime///第三方往来单位", "//thr_dept/id///updateTime///第三方部门", @@ -19,23 +15,36 @@ public class TableUtils { "basicThirdBusOrder//thr_order/id///updateTime///第三方业务单据", "/basicThirdBusOrder/thr_order_detail/orderIdFk/id/orderIdFk/updateTime///第三方单据详情", "basicThirdProducts//thr_products/id///updateTime///第三方产品信息", - "//sup_cert_set/id///updateTime///供应商资质证书设置", - "companyCert//sup_company/customerId///updateTime///配送企业", - "manufacturerCert//sup_manufacturer/id///updateTime///生产企业", - "productCert//sup_product/id///updateTime///产品资质信息", - "/companyCert/sup_cert/id/customerId/customerId/updateTime/filePath/type=1/配送企业资质证书信息", - "/manufacturerCert/sup_cert/id/manufacturerId/manufacturerIdFk/updateTime/filePath/type=2/生产企业资质证书信息", - "/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息", - "//udicompany/id///updateTime///国际库医疗器械注册人信息", "basicType//basic_hosp_type/id///updateTime///物资字典分类", "basicDept//auth_dept/id///updateTime///部门信息", "basicInv//auth_warehouse/id///updateTime///仓库信息", + "typeBus//basic_bustype_change/id///updateTime///业务单据类型", + "typeScan//basic_bussiness_type/id///updateTime///扫码单据类型" }; + + /** + * "entrustAction//basic_entrust_accept/id///updateTime///委托验收", + * "basicProducts//basic_udirel/id///updateTime///耗材字典", + * "/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情", + * "basicCorp//basic_corp/id///updateTime///往来单位", + * "//company_product_relevance/id///updateTime///供应商关联信息", + *

+ * "//sup_cert_set/id///updateTime///供应商资质证书设置", + * "companyCert//sup_company/customerId///updateTime///配送企业", + * "manufacturerCert//sup_manufacturer/id///updateTime///生产企业", + * "productCert//sup_product/id///updateTime///产品资质信息", + * "/companyCert/sup_cert/id/customerId/customerId/updateTime/filePath/type=1/配送企业资质证书信息", + * "/manufacturerCert/sup_cert/id/manufacturerId/manufacturerIdFk/updateTime/filePath/type=2/生产企业资质证书信息", + * "/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息", + * "//udicompany/id///updateTime///国际库医疗器械注册人信息", + */ + + //"dbDiProducts//productinfo/id///updateTime///DI产品信息", //"basicInv/////////仓库字典", //"typeBus/////////业务单据类型", //"typeScan/////////扫码单据类型", public static String[] syncTables() { - return SYNC_TABLES; + return SYNC_TABLES; } } diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java index c10f855c7..a56782617 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java @@ -15,8 +15,6 @@ public class SpsSyncOrderResponse { List orderDetailBizEntities; List orderDetailCodeEntities; List orderDetailResultEntities; - - - + List orderInvoiceEntities; } diff --git a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java index 15c64e85e..405462ace 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -16,6 +16,7 @@ public class SyncDataSetResponse { private boolean basicProducts; private boolean basicCorp; private boolean basicInv; + private boolean basicDept; private boolean basicThirdProducts; private boolean basicThirdCorp; private boolean basicThirdInv; 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 90a8275db..a69045886 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -236,28 +236,29 @@ public class IoCheckInoutService { orderService.update(orderEntity); return; } + if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP) { + orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); + orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); + orderDetailCodeEntities.forEach(orderDetailCodeEntity -> + { + //生成业务单据 + IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailBizEntity.setId(null); + orderDetailBizService.insert(orderDetailBizEntity); - orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); - orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); - orderDetailCodeEntities.forEach(orderDetailCodeEntity -> - { - //生成业务单据 - IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); - orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailBizEntity.setId(null); - 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); - - }); + }); + } //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 8d65214e9..44d8f9848 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -6,6 +6,10 @@ import java.util.List; import javax.annotation.Resource; +import com.glxp.api.dao.inout.*; +import com.glxp.api.entity.inout.*; +import com.glxp.api.service.inout.IoAddInoutService; +import com.glxp.api.service.inout.IoCheckInoutService; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -19,15 +23,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.inout.IoCodeTempDao; -import com.glxp.api.dao.inout.IoOrderDao; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; -import com.glxp.api.dao.inout.IoOrderDetailCodeDao; -import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; @@ -177,16 +172,18 @@ public class HeartService { public void dlAllOrder() { BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + ""); - List pageSimpleResponse = baseResponse !=null ? baseResponse.getData() : new ArrayList<>(); + List pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); if (pageSimpleResponse != null) { List basicExportStatusEntities = pageSimpleResponse; if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_ORDER); - BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { }); if (response.getCode() == 20000 && response.getData() != null) { - SpsSyncOrderResponse syncDataResponse = response.getData(); + + SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference() { + }); BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); basicDownloadStatusEntity.setId(CustomUtil.getId()); basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId()); @@ -207,10 +204,13 @@ public class HeartService { orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - IoOrderEntity temp = orderService.findById(orderEntity.getBillNo()); + IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { orderEntity.setId(null); mapper.insert(orderEntity); + + + //更新码详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { IoCodeTempDao codeMappert = batchSession.getMapper(IoCodeTempDao.class); List warehouseEntityList = syncDataResponse.getCodeEntities(); @@ -221,10 +221,10 @@ public class HeartService { codeTempEntity.setId(null); codeMappert.insert(codeTempEntity); } - } } + //更新业务详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) { IoOrderDetailBizDao orderDetailBizDao = batchSession.getMapper(IoOrderDetailBizDao.class); List orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities(); @@ -235,17 +235,48 @@ public class HeartService { } } + //更新码详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { IoOrderDetailCodeDao orderDetailCodeDao = batchSession.getMapper(IoOrderDetailCodeDao.class); List orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities(); - for (IoOrderDetailCodeEntity detailCodeEntity : orderDetailCodeEntities) { - if (detailCodeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - orderDetailCodeDao.insert(detailCodeEntity); + for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { + if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { + orderDetailCodeDao.insert(codeEntity); + } + } + } + + + //更新结果详情 + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailResultEntities())) { + IoOrderDetailResultDao orderDetailResultDao = batchSession.getMapper(IoOrderDetailResultDao.class); + List orderDetailResultEntities = syncDataResponse.getOrderDetailResultEntities(); + for (IoOrderDetailResultEntity detailResultEntity : orderDetailResultEntities) { + if (detailResultEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { + orderDetailResultDao.insert(detailResultEntity); } } } + //更新发票信息 + if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { + IoOrderInvoiceMapper orderInvoiceMapper = batchSession.getMapper(IoOrderInvoiceMapper.class); + List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); + for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { + if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { + orderInvoiceMapper.insert(orderInvoiceEntity); + } + } + } batchSession.commit(); + + + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); + addInoutService.dealProcess(orderEntity); + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } } } batchSession.commit(); @@ -253,14 +284,20 @@ public class HeartService { String logs = ""; if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) - logs = logs + "单据详情：" + syncDataResponse.getOrderDetailBizEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) + logs = logs + "业务详情：" + syncDataResponse.getOrderDetailBizEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) + logs = logs + "单据扫码详情：" + syncDataResponse.getOrderDetailCodeEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailResultEntities())) + logs = logs + "单据结果详情：" + syncDataResponse.getOrderDetailResultEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getCodeEntities())) logs = logs + "单据条码信息：" + syncDataResponse.getCodeEntities().size() + "条\n"; remark.append(logs); } catch (Exception e) { e.printStackTrace(); } + + } batchSession.close(); spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); @@ -270,10 +307,17 @@ public class HeartService { basicDownloadStatusEntity.setRemark(remark.toString()); basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + + } } } } } + + @Resource + IoAddInoutService addInoutService; + @Resource + IoCheckInoutService ioCheckInoutService; } diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index 602bb23cc..73ddbc6a0 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -46,6 +46,8 @@ public class UpBasicService { PurOrderService purOrderService; @Resource PurOrderDetailService purOrderDetailService; + @Resource + IoOrderInvoiceService orderInvoiceService; public SpsSyncOrderResponse upAllOrder(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse(); @@ -67,6 +69,7 @@ public class UpBasicService { List orderDetailBizEntities = new ArrayList<>(); List orderDetailCodeEntities = new ArrayList<>(); List orderDetailResultEntities = new ArrayList<>(); + List orderInvoiceEntities = new ArrayList<>(); if (CollUtil.isNotEmpty(orderEntities)) { for (IoOrderEntity orderEntity : orderEntities) { @@ -91,12 +94,19 @@ public class UpBasicService { if (CollUtil.isNotEmpty(detailResultEntities)) { orderDetailResultEntities.addAll(detailResultEntities); } + + List invoiceEntities = orderInvoiceService.findByBillNo(orderEntity.getBillNo()); + if (CollUtil.isNotEmpty(invoiceEntities)) { + orderInvoiceEntities.addAll(invoiceEntities); + } } } + syncOrderResponse.setCodeEntities(codeEntities); syncOrderResponse.setOrderDetailBizEntities(orderDetailBizEntities); syncOrderResponse.setOrderDetailCodeEntities(orderDetailCodeEntities); syncOrderResponse.setOrderDetailResultEntities(orderDetailResultEntities); + syncOrderResponse.setOrderInvoiceEntities(orderInvoiceEntities); return syncOrderResponse; } diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index b478cd74c..b88f18fc4 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: Glxp@6066 hikari: diff --git a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml index 533e2e069..87a03693c 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml @@ -17,7 +17,7 @@ typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime,syncDownloadTime, orderUnReceive,orderUnCheck,busTypes,sysUser,syncIp,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction - ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert) + ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert,basicDept) values ( #{id}, #{typeBus}, @@ -45,9 +45,9 @@ #{basicSyncStart}, #{entrustAction}, #{unCheckCert}, - #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert} + #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert},#{basicDept} ) - \ 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 f17d20a31..947b9db3c 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -6,12 +6,21 @@ 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_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('auth_warehouse', 'advanceType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1); @@ -24,6 +33,9 @@ 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); @@ -82,6 +94,8 @@ 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); + CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1); @@ -90,17 +104,46 @@ CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 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('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', '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_detail_biz', 'filePath', 'varchar(255)', 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('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('inv_remind_set', 'status', 'tinyint ', 1); +# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); +# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);