diff --git a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
index 93f893bc..a1e2b500 100644
--- a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
+++ b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java
@@ -82,7 +82,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
public void buildSchemas() {
// schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
- schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
-// schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
+// schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
+ schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
}
}
diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 0f7aa9f3..5b03efd4 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -15,6 +15,7 @@ import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
+import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@@ -69,6 +70,8 @@ public class UdiRelevanceController extends BaseController {
UdiRlSupService udiRlSupService;
@Resource
ProductInfoService productInfoService;
+ @Resource
+ UdiRelevanceDao udiRelevanceDao;
//手持终端下载UDI产品信息
@AuthRuleAnnotation("")
@@ -80,7 +83,7 @@ public class UdiRelevanceController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<UdiRelevanceResponse> udiRelevanceResponses = null;
- udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
+ udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(udiRelevanceResponses);
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 56cf6c42..549c9073 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -443,7 +443,7 @@ public class IoCodeTempController extends BaseController {
//过期提醒：
// SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
- if (bussinessTypeEntity.getCheckExpire() == 1 && !addOrderRequest.isIgnoreExpire()) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
@@ -453,7 +453,7 @@ public class IoCodeTempController extends BaseController {
}
}
- if (bussinessTypeEntity.getCheckExpire() == 2) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
@@ -470,7 +470,7 @@ public class IoCodeTempController extends BaseController {
long recent = 0;
if (udiRelevanceResponse.getRecentDateTime() != null)
recent = udiRelevanceResponse.getRecentDateTime().longValue();
- if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
@@ -486,7 +486,7 @@ public class IoCodeTempController extends BaseController {
}
}
- if (bussinessTypeEntity.getCheckVailDate() == 2 && recent > 0) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckVailDate()) == 2 && recent > 0) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
@@ -788,7 +788,7 @@ public class IoCodeTempController extends BaseController {
return baseResponse;
}
- if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index 42dcb718..db22862d 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -52,6 +52,7 @@ import com.glxp.api.service.thrsys.ThrOrderDetailService;
import com.glxp.api.service.thrsys.ThrOrderService;
import com.glxp.api.service.thrsys.ThrSystemBusApiService;
import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.IntUtil;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
@@ -167,7 +168,7 @@ public class IoOrderDetailBizController extends BaseController {
for (AddBizProductReqeust item : datas) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
- if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
+ if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
// List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
index 2753ae2c..b68a4f87 100644
--- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
@@ -13,8 +13,10 @@ import java.util.List;
public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
+
String selectPackLevel(@Param("nameCode") String nameCode);
+ List<UdiRelevanceResponse> pdaDlUdiRel(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
index 84d7f2d5..9cf9da1e 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -109,7 +109,7 @@ public class SpsSyncDownloadService {
//首次任务or上次任务结束
if (basicExportStatusEntity1 == null || IntUtil.value(BasicExportStatusEnum.COMPLETED.getCode()) == IntUtil.value(basicExportStatusEntity1.getStatus())) {
- log.info("no2:" + basicExportStatusEntity1.getStatus() + "---" + BasicExportStatusEnum.COMPLETED.getCode());
+// log.info("no2:" + basicExportStatusEntity1.getStatus() + "---" + BasicExportStatusEnum.COMPLETED.getCode());
SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
if (lastUpdateTime != null)
spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime));
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 9140fb90..b7ae2b3f 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -143,7 +143,127 @@
LIMIT 1
</select>
+ <select id="pdaDlUdiRel" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+ resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+ select basic_udirel.*,
+ basic_udirel.id relId,
+ basic_products.originUuid,
+ basic_products.nameCode,
+ basic_products.deviceRecordKey,
+ basic_products.packRatio,
+ basic_products.packUnit,
+ basic_products.packLevel,
+ basic_products.bhxjsl,
+ basic_products.bhzxxsbzsl,
+ basic_products.zxxsbzbhsydysl,
+ basic_products.bhxjcpbm,
+ basic_products.bzcj,
+ basic_products.cpmctymc,
+ basic_products.cplb,
+ basic_products.flbm,
+ basic_products.ggxh,
+ basic_products.qxlb,
+ basic_products.tyshxydm,
+ basic_products.ylqxzcrbarmc,
+ basic_products.zczbhhzbapzbh,
+ basic_products.ylqxzcrbarywmc,
+ basic_products.sydycpbs,
+ basic_products.sjcpbm,
+ basic_products.versionNumber,
+ basic_products.diType,
+ basic_products.ybbm,
+ basic_products.sptm,
+ basic_products.manufactory,
+ basic_products.measname,
+ basic_products.productType,
+ basic_products.scbssfbhph,
+ basic_products.scbssfbhxlh,
+ basic_products.scbssfbhscrq,
+ basic_products.scbssfbhsxrq,
+ basic_products.cpms,
+ basic_products.allowNoBatch,
+ basic_products.allowNoExpire,
+ basic_products.allowNoProduct,
+ basic_products.allowNoSerial,
+ basic_products.spmc,
+ basic_products.cplx,
+ basic_products.hchzsb,
+ basic_products.cpdls,
+ basic_products.price,
+ basic_products.basicPrductRemak1,
+ basic_products.basicPrductRemak2,
+ basic_products.basicPrductRemak3,
+ basic_products.basicPrductRemak4,
+ basic_products.basicPrductRemak5,
+ basic_products.basicPrductRemak6,
+ basic_products.basicPrductRemak7,
+ basic_products.basicPrductRemak8
+ FROM basic_udirel
+ inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+ <where>
+ <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+ AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+ </if>
+ <if test="manufactory != '' and manufactory != null">
+ AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
+ </if>
+ <if test="cpmctymc != '' and cpmctymc != null">
+ AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+ </if>
+ <if test="nameCode != '' and nameCode != null">
+ AND nameCode LIKE concat(#{nameCode}, '%')
+ </if>
+ <if test="thirdId != '' and thirdId != null">
+ AND thirdId LIKE concat(#{thirdId}, '%')
+ </if>
+ <if test="uuid != '' and uuid != null">
+ AND basic_udirel.uuid = #{uuid}
+ </if>
+ <if test="id != '' and id != null">
+ AND basic_udirel.id = #{id}
+ </if>
+ <if test="udplatCode != '' and udplatCode != null">
+ AND basic_udirel.udplatCode = #{udplatCode}
+ </if>
+ <if test="diType != null">
+ AND basic_products.diType = #{diType}
+ </if>
+
+ <if test="lockStatus != '' and lockStatus != null">
+ AND basic_udirel.lockStatus = #{lockStatus}
+ </if>
+ <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+ AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+ </if>
+ <if test="lastUpdateTime != null and lastUpdateTime != ''">
+ <![CDATA[
+ and DATE_FORMAT(basic_udirel.updateTime, '%Y-%m-%d %H:%i:%S') >=
+ DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+ ]]>
+ </if>
+ <if test="mainId != '' and mainId != null">
+ AND mainId = #{mainId}
+ </if>
+ <if test="unionFilterStr != '' and unionFilterStr != null">
+ or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
+ or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
+ or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
+ or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
+ </if>
+ <if test="isAdavence != '' and isAdavence != null">
+ AND isAdavence = #{isAdavence}
+ </if>
+ <if test="uniqueNameCode != '' and uniqueNameCode != null">
+ AND nameCode = #{uniqueNameCode}
+ </if>
+ </where>
+ <choose>
+ <when test="key != null and key != ''">
+ GROUP BY basic_udirel.id
+ </when>
+ </choose>
+ </select>
<select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
@@ -1043,7 +1163,7 @@
isLock,
lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
updateUser,
- remark, useExpireTime, dispatch, groupBuy,needCert)
+ remark, useExpireTime, dispatch, groupBuy, needCert)
values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@@ -1069,7 +1189,7 @@
#{item.modifyTime},
#{item.createUser},
#{item.updateUser},
- #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert})
+ #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
</foreach>
</insert>
diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql
new file mode 100644
index 00000000..64970840
--- /dev/null
+++ b/src/main/resources/schemas/schema_v2.3.sql
@@ -0,0 +1,603 @@
+# # 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
+#
+#
+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);
+
+# 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('io_order_detail_code', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'updateTime', 'datetime ', 1);
+
+call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE');
+
+
+CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'cgzmraqxgxx', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'sfbjwycxsy', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'zdcfsycs', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'sfwwjbz', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1);
+
+INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+ `paramType`,
+ `paramExplain`, `updateTime`)
+VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);
+
+
+CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
+ 'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);
+CREATE TABLE IF NOT EXISTS `sync_edit_log`
+(
+ `id` int NOT NULL AUTO_INCREMENT,
+ `recordCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '日志记录号',
+ `operType` tinyint NULL DEFAULT NULL COMMENT '操作类型（1:增；2:删，3:改，4:查)',
+ `dataType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作数据类型',
+ `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接口地址',
+ `param` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '请求参数',
+ `jsonResult` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '请求结果',
+ `directType` tinyint NULL DEFAULT NULL COMMENT '1:本地操作；2：对方操作',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明',
+ `operUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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
+ ROW_FORMAT = Dynamic;
+
+
+CREATE TABLE IF NOT EXISTS `sync_edit_type`
+(
+ `id` int NOT NULL AUTO_INCREMENT,
+ `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作类型',
+ `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作类型名称',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ CHARACTER SET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci
+ ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+# 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
+
+CREATE TABLE IF NOT EXISTS `device_inspect_task`
+(
+ `id` int NOT NULL AUTO_INCREMENT,
+ `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务单号',
+ `planOrderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检计划单号（外键）',
+ `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 '仓库',
+ `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
+ `status` int NULL DEFAULT NULL COMMENT '状态',
+ `type` int NULL DEFAULT NULL COMMENT '类型',
+ `inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
+ `remindTime` datetime(0) NULL DEFAULT NULL COMMENT '提醒时间',
+ `remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检备注',
+ `strartTime` datetime(0) NULL DEFAULT NULL COMMENT '任务开始时间',
+ `endTime` datetime(0) NULL DEFAULT NULL COMMENT '任务结束时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `expectedTime` datetime(0) NULL DEFAULT NULL COMMENT '预期结束时间',
+ `repairType` int NULL DEFAULT NULL COMMENT '报修类型',
+ `level` int NULL DEFAULT NULL COMMENT '紧急程度',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ CHARACTER SET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci
+ ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for device_inspect_task_detail
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `device_inspect_task_detail`
+(
+ `id` int NOT NULL AUTO_INCREMENT,
+ `projectCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检项目编码',
+ `projectContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检内容',
+ `status` int NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
+ `result` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检结果备注',
+ `inspectImage` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检图片',
+ `inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
+ `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `taskOrderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检任务ID外键',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ CHARACTER SET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci
+ ROW_FORMAT = Dynamic;
+
+
+CREATE TABLE IF NOT EXISTS `dept_device_detail`
+(
+ `id` int(0) NOT NULL AUTO_INCREMENT,
+ `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 '仓库编码',
+ `originCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '原始码',
+ `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
+ `relId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '耗材字典编码',
+ `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备名称',
+ `ggxh` 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 '批次号',
+ `serialNo` 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 '失效日期',
+ `manufactory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产厂家',
+ `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位',
+ `zczbhhzbapzbh` 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 '供应商ID',
+ `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商名称',
+ `status` tinyint(0) NULL DEFAULT NULL COMMENT '状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废）',
+ `addType` tinyint(0) NULL DEFAULT NULL COMMENT '添加方式（1：领用添加；2：手动添加）',
+ `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '添加人',
+ `manager` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '负责人',
+ `maTime` datetime(0) NULL DEFAULT NULL COMMENT '最后养护时间',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '添加时间',
+ `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 33
+ CHARACTER SET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci COMMENT = '科室设备明细表'
+ ROW_FORMAT = Dynamic;
+
+CREATE TABLE IF NOT EXISTS `device_project_set`
+(
+ `id` int(0) NOT NULL AUTO_INCREMENT,
+ `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编号',
+ `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目内容',
+ `type` int(0) NULL DEFAULT NULL COMMENT '项目类型：1：巡检；2：养护',
+ `remak` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ `udpateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `updateUser` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+ `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 3
+ CHARACTER SET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci
+ ROW_FORMAT = Dynamic;
+
+
+CALL Pro_Temp_ColumnWork('device_inspect_task', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('device_inspect_task_detail', 'id', 'bigint', 2);
+
+
+INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+ `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
+ `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (1888, '任务查询', 2004, 9, 'inventory/DeviceInspectTakeSelect', 'inventory/DeviceInspectTakeSelect', NULL, 1, 0,
+ 'C', '0', '0', NULL, NULL, '超级用户', '2023-08-07 16:02:36', NULL, NULL, NULL);
+INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+ `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
+ `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (1889, '我的任务', 2004, 4, 'inventory/DeviceInspectTake', 'inventory/DeviceInspectTake', NULL, 1, 0, 'C', '0', '0',
+ NULL, NULL, '超级用户', '2023-08-08 14:50:39', NULL, NULL, NULL);
+INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+ `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
+ `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (2004, '任务管理', 1703, 5, 'taskManage', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-08-18 14:40:53',
+ NULL, NULL, NULL);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'editType', 'tinyint', 1);