UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增是否组套，出入库明细改造，

Browse Source
dev_ksck_axxyy
anthonywj 8 months ago
parent c3898425e6
commit b3006e5870
28 changed files with 796 additions and 619 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
Unescape Escape View File

@ -217,7 +217,7 @@ public class BasicOrderPrintController {
for (IoCodeEntity obj : ioCodeEntityList) { for (IoCodeEntity obj : ioCodeEntityList) {
//查询业务表 //查询业务表
for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) { for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) {
if (StrUtil.trimToEmpty(ioObj.getBatchNo()).equals(StrUtil.trimToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) { if (StrUtil.nullToEmpty(ioObj.getBatchNo()).equals(StrUtil.nullToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) {
ioOrderDetailBizEntity = ioObj; ioOrderDetailBizEntity = ioObj;
break; break;
} }

3
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -738,6 +738,7 @@ public class UdiRelevanceController extends BaseController {
udiRelevanceEntity.setPurType(udiProductEntity.getPurType()); udiRelevanceEntity.setPurType(udiProductEntity.getPurType());
udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType()); udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType());
udiRelevanceEntity.setHcType(udiProductEntity.getHcType()); udiRelevanceEntity.setHcType(udiProductEntity.getHcType());
udiRelevanceEntity.setIsStack(udiProductEntity.getIsStack());
udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setUpdateTime(new Date());
boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
if (udiProductEntity.getRelSupId() != null) { if (udiProductEntity.getRelSupId() != null) {
@ -794,7 +795,7 @@ public class UdiRelevanceController extends BaseController {
BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> ybHcflDetail = erpBasicClient.getYbHcflDetail(ybHcflDetailFilterRequest); BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> ybHcflDetail = erpBasicClient.getYbHcflDetail(ybHcflDetailFilterRequest);
PageSimpleResponse<YbHcflEntityResponse> data = ybHcflDetail.getData(); PageSimpleResponse<YbHcflEntityResponse> data = ybHcflDetail.getData();
YbHcflEntityResponse entityResponse = new YbHcflEntityResponse(); YbHcflEntityResponse entityResponse = new YbHcflEntityResponse();
if (data.getList().size() > 0){ if (data.getList().size() > 0) {
entityResponse = data.getList().get(0); entityResponse = data.getList().get(0);
} }
return ResultVOUtils.success(entityResponse); return ResultVOUtils.success(entityResponse);

18
src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
Unescape Escape View File

@ -204,7 +204,7 @@ public class ThrProductsAddDiController {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
//更新产品信息 //更新产品信息
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtil.copyProperties(thrProductsAddDiEntity,udiProductEntity); BeanUtil.copyProperties(thrProductsAddDiEntity, udiProductEntity);
udiProductEntity.setUuid(thrProductsAddDiEntity.getUuid()); udiProductEntity.setUuid(thrProductsAddDiEntity.getUuid());
udiProductEntity.setCpmctymc(thrProductsAddDiEntity.getName()); udiProductEntity.setCpmctymc(thrProductsAddDiEntity.getName());
udiProductEntity.setNameCode(thrProductsAddDiEntity.getCode()); udiProductEntity.setNameCode(thrProductsAddDiEntity.getCode());
@ -234,15 +234,15 @@ public class ThrProductsAddDiController {
udiProductEntity.setMatrial(thrProductsAddDiEntity.getMatrial()); udiProductEntity.setMatrial(thrProductsAddDiEntity.getMatrial());
udiProductEntity.setDiType(1); udiProductEntity.setDiType(1);
BeanUtil.copyProperties(udiProductEntity,udiRelevanceEntity); BeanUtil.copyProperties(udiProductEntity, udiRelevanceEntity);
udiRelevanceEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy()); udiRelevanceEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy());
udiRelevanceEntity.setPurType(thrProductsAddDiEntity.getPurType()); udiRelevanceEntity.setPurType(thrProductsAddDiEntity.getPurType());
udiRelevanceEntity.setAttributeType(thrProductsAddDiEntity.getAttributeType()); udiRelevanceEntity.setAttributeType(thrProductsAddDiEntity.getAttributeType());
udiRelevanceEntity.setHcType(thrProductsAddDiEntity.getHcType()); udiRelevanceEntity.setHcType(thrProductsAddDiEntity.getHcType());
udiRelevanceEntity.setId(udiRelIdFk); udiRelevanceEntity.setId(udiRelIdFk);
udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setModifyTime(new Date());
udiRelevanceEntity.setThirdId(udiProductEntity.getCode()); // udiRelevanceEntity.setThirdId(udiProductEntity.getCode());
udiRelevanceEntity.setMainId(udiProductEntity.getCode()); // udiRelevanceEntity.setMainId(udiProductEntity.getCode());
udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setUuid(udiProductEntity.getUuid()); udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName()); udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName());
@ -277,7 +277,7 @@ public class ThrProductsAddDiController {
thrProductsAddDiEntity.setRemark(remark); thrProductsAddDiEntity.setRemark(remark);
thrProductsAddDiEntity.setStatus(status); thrProductsAddDiEntity.setStatus(status);
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
}else { } else {
// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); // ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
// BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity); // BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
// thrProductsService.insertThrProducts(thrProductsEntity); // thrProductsService.insertThrProducts(thrProductsEntity);
@ -332,11 +332,11 @@ public class ThrProductsAddDiController {
String flbm = thrProductsAddDiResponse.getFlbm(); String flbm = thrProductsAddDiResponse.getFlbm();
//是否需要扫码 初始化 //是否需要扫码 初始化
if (StrUtil.isNotEmpty(flbm)){ if (StrUtil.isNotEmpty(flbm)) {
ClassifyCodeEntity classifyCodeEntity = classifyCodeDao.ClassifyByCode(flbm); ClassifyCodeEntity classifyCodeEntity = classifyCodeDao.ClassifyByCode(flbm);
if (classifyCodeEntity != null){ if (classifyCodeEntity != null) {
udiProductEntity.setRequireScanCode(1); udiProductEntity.setRequireScanCode(1);
}else { } else {
udiProductEntity.setRequireScanCode(0); udiProductEntity.setRequireScanCode(0);
} }
} }
@ -476,7 +476,7 @@ public class ThrProductsAddDiController {
if (null == thrProductsAdddiEntity) if (null == thrProductsAdddiEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
String customerId = getCustomerId() + ""; String customerId = getCustomerId() + "";
String internalMaterialCode = thrProductsAddDiService.getInternalMaterialCode("10","66"); String internalMaterialCode = thrProductsAddDiService.getInternalMaterialCode("10", "66");
thrProductsAdddiEntity.setInternalMaterialCode(internalMaterialCode); thrProductsAdddiEntity.setInternalMaterialCode(internalMaterialCode);
thrProductsAdddiEntity.setCode(internalMaterialCode); thrProductsAdddiEntity.setCode(internalMaterialCode);
thrProductsAdddiEntity.setThirdSysFk("thirdId"); thrProductsAdddiEntity.setThirdSysFk("thirdId");

2
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -167,5 +167,5 @@ public class UdiProductEntity {
*/ */
private String bzgg; private String bzgg;
private Boolean isStack;
} }

6
src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -194,4 +194,10 @@ public class UdiRelevanceEntity {
@TableField(value = "newNeedUpload") @TableField(value = "newNeedUpload")
private Boolean newNeedUpload; private Boolean newNeedUpload;
/**
* 是否组套
*/
@TableField(value = "isStack")
private Boolean isStack;
} }

3
src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
Unescape Escape View File

@ -314,6 +314,9 @@ public class ThrProductsAddDiEntity {
@TableField(value = "hcType") @TableField(value = "hcType")
private Integer hcType; private Integer hcType;
@TableField(value = "isStack")
private Integer isStack;
/** /**
* 1第三方2自增 * 1第三方2自增
*/ */

1
src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
Unescape Escape View File

@ -316,7 +316,6 @@ public class BussinessTypeSaveRequest {
*/ */
private Integer vailHcType; private Integer vailHcType;
/** /**
* 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
*/ */

3
src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
* 产品分类高值 ：1：高值耗材；2.普通耗材 * 产品分类高值 ：1：高值耗材；2.普通耗材
*/ */
private Integer hcType; private Integer hcType;
private Boolean isStack;
private String corpId; private String corpId;
private String billType; private String billType;
private String manufactory; private String manufactory;
@ -91,7 +91,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
* 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材 * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
*/ */
private Integer vailHcType; private Integer vailHcType;
/** /**
* 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
*/ */

2
src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private Integer hcType; private Integer hcType;
private String corpId; private String corpId;
private String billType; private String billType;
private Boolean isStack;
private String ybbm; private String ybbm;
private String sptm; private String sptm;
private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询 private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询

2
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private Integer hcType; private Integer hcType;
private String corpId; private String corpId;
private String billType; private String billType;
private Boolean isStack;
private String ybbm; private String ybbm;
private String sptm; private String sptm;
private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询 private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询

4
src/main/java/com/glxp/api/req/basic/SupplementRequest.java
Unescape Escape View File

@ -34,12 +34,12 @@ public class SupplementRequest {
*/ */
private Integer hcType; private Integer hcType;
private Boolean isStack;
/** /**
* 一级分类名称(学科，品名） * 一级分类名称(学科，品名）
*/ */
@TableField(value = "catalogname1") @TableField(value = "catalogname1")
@ApiModelProperty(value="一级分类名称(学科，品名）") @ApiModelProperty(value = "一级分类名称(学科，品名）")
private String catalogname1; private String catalogname1;
/** /**

3
src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class UdiRelevanceRequest {
private String originUuid; private String originUuid;
private String price; private String price;
private String modifyTime; //修改时间 private String modifyTime; //修改时间
private Boolean isStack;
private Boolean useMuti; //是否多次使用 private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数 private Integer useNum; //最小包装单元可使用次数
@ -56,7 +56,6 @@ public class UdiRelevanceRequest {
//是否集采产品 //是否集采产品
private Integer isDateBy; private Integer isDateBy;
private Boolean needCert; //是否需要资质材料 private Boolean needCert; //是否需要资质材料
private String certIdFk; private String certIdFk;

3
src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class UdiRelevanceSaveRequest {
private String createUser; private String createUser;
private String updateUser; private String updateUser;
private String remark; private String remark;
private Boolean isStack;
//UdiInfoEntity //UdiInfoEntity
private String originUuid; private String originUuid;
private String nameCode; private String nameCode;
@ -114,7 +114,6 @@ public class UdiRelevanceSaveRequest {
private Boolean groupBuy; //是否集采产品 private Boolean groupBuy; //是否集采产品
private Boolean needCert; //是否需要资质材料 private Boolean needCert; //是否需要资质材料
private String certIdFk; private String certIdFk;
/** /**
* 一级分类名称(学科，品名） * 一级分类名称(学科，品名）
*/ */

4
src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
Unescape Escape View File

@ -50,6 +50,10 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
private String templateId; private String templateId;
private String manufacturer; private String manufacturer;
private String zczbhhzbapzbh; private String zczbhhzbapzbh;
private String invCode;
private Boolean isStack;
private String invoiceEncode;
private List<String> actions; private List<String> actions;
private List<IoOrderDetailResultResponse> list; private List<IoOrderDetailResultResponse> list;
} }

2
src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java
Unescape Escape View File

@ -57,6 +57,6 @@ public class AddThrDiProductsExcelVo {
// private String hcType; // private String hcType;
// @ExcelProperty("收费码") // @ExcelProperty("收费码")
// private String basicPrductRemak1; // private String basicPrductRemak1;
private Boolean isStack;
} }

2
src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class AddThrDiProductsRequest {
*/ */
private Integer hcType; private Integer hcType;
private Boolean isStack;
/** /**
* 一级分类名称(学科，品名） * 一级分类名称(学科，品名）

2
src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class FilterThrProductsRequest extends ListPageRequest {
* 产品分类高值 ：1：高值耗材；2.普通耗材 * 产品分类高值 ：1：高值耗材；2.普通耗材
*/ */
private Integer hcType; private Integer hcType;
private Boolean isStack;
private List<String> codes; private List<String> codes;
private Integer checkStatus; private Integer checkStatus;
private String customerId; private String customerId;

2
src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java
Unescape Escape View File

@ -96,4 +96,6 @@ public class CompanyProductRelevanceResponse {
private String basicPrductRemak8; private String basicPrductRemak8;
private String cphhhbh; private String cphhhbh;
private Boolean isStack;
} }

4
src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -145,13 +145,14 @@ public class UdiRelevanceResponse {
*/ */
private Boolean newNeedUpload; private Boolean newNeedUpload;
private Boolean isStack;
/** /**
* 一级分类名称(学科，品名） * 一级分类名称(学科，品名）
*/ */
@TableField(value = "catalogname1") @TableField(value = "catalogname1")
@ApiModelProperty(value="一级分类名称(学科，品名）") @ApiModelProperty(value = "一级分类名称(学科，品名）")
private String catalogname1; private String catalogname1;
/** /**
@ -182,7 +183,6 @@ public class UdiRelevanceResponse {
*/ */
private String bzgg; private String bzgg;
public int getBhzxxsbzsl() { public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1; return 1;

2
src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
Unescape Escape View File

@ -139,6 +139,6 @@ public class UdiRlSupResponse {
* 产品分类高值 ：1：高值耗材；2.普通耗材 * 产品分类高值 ：1：高值耗材；2.普通耗材
*/ */
private Integer hcType; private Integer hcType;
private Boolean isStack;
private Integer requireScanCode; private Integer requireScanCode;
} }

3
src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
Unescape Escape View File

@ -186,4 +186,7 @@ public class IoOrderDetailResultResponse {
private BigDecimal amount; private BigDecimal amount;
private String invoiceEncode;
} }

2
src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class UdiInfoResponse {
private String catalogname3; private String catalogname3;
private String matrial; private String matrial;
private Boolean isStack;
public Integer getId() { public Integer getId() {
return id; return id;

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -3,7 +3,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
hikari: hikari:

16
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -979,7 +979,7 @@
updateTime, modifyTime, updateTime, modifyTime,
createUser, createUser,
updateUser, updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload) remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload, isStack)
values (#{id}, values (#{id},
#{uuid}, #{uuid},
#{mainId}, #{mainId},
@ -1002,7 +1002,7 @@
#{modifyTime}, #{modifyTime},
#{createUser}, #{createUser},
#{updateUser}, #{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload}) #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload}, #{isStack})
</insert> </insert>
<insert id="insertUdiRelevanceignore" keyProperty="id" <insert id="insertUdiRelevanceignore" keyProperty="id"
@ -1016,7 +1016,7 @@
updateTime, modifyTime, updateTime, modifyTime,
createUser, createUser,
updateUser, updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert) remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
values (#{id}, values (#{id},
#{uuid}, #{uuid},
#{mainId}, #{mainId},
@ -1039,7 +1039,7 @@
#{modifyTime}, #{modifyTime},
#{createUser}, #{createUser},
#{updateUser}, #{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert},#{isStack})
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -1168,6 +1168,10 @@
<if test="needCert != null"> <if test="needCert != null">
needCert=#{needCert}, needCert=#{needCert},
</if> </if>
<if test="isStack != null">
isStack=#{isStack},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -1197,7 +1201,7 @@
updateTime, modifyTime, updateTime, modifyTime,
createUser, createUser,
updateUser, updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert) remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
values values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=","> <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@ -1223,7 +1227,7 @@
#{item.modifyTime}, #{item.modifyTime},
#{item.createUser}, #{item.createUser},
#{item.updateUser}, #{item.updateUser},
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert}) #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},#{item.isStack})
</foreach> </foreach>
</insert> </insert>

2
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -52,7 +52,7 @@
basic_udirel.lowStockNum, basic_udirel.lowStockNum,
basic_udirel.overStockNum, basic_udirel.overStockNum,
basic_udirel.recentDateTime, basic_udirel.recentDateTime,
basic_udirel.isDateBy, basic_udirel.isDateBy,basic_udirel.isStack,
bht.name classifyName, bht.name classifyName,
basic_products.id as PRId, basic_products.id as PRId,
basic_products.originUuid, basic_products.originUuid,

14
src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
Unescape Escape View File

@ -26,11 +26,15 @@
<select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse"> <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
SELECT a2.*, SELECT a2.*,
a1.mainAction, a1.mainAction,
GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') as invoiceCodes,
b1.NAME AS fromCorpName, b1.NAME AS fromCorpName,
(SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
FROM io_order_detail_result a2 FROM io_order_detail_result a2
LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
left join basic_udirel bu on a2.bindRlFk = bu.id
left join io_order_invoice ioi on a1.billNo = ioi.orderIdFk
<where> <where>
a1.status = 7 a1.status = 7
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
@ -42,6 +46,15 @@
<if test="nameCode != null and nameCode != ''"> <if test="nameCode != null and nameCode != ''">
AND a2.nameCode = #{nameCode} AND a2.nameCode = #{nameCode}
</if> </if>
<if test="isStack != null">
AND bu.isStack = #{isStack}
</if>
<if test="invCode != null and invCode != ''">
AND a1.invCode = #{invCode}
</if>
<if test="invoiceEncode != null and invoiceEncode != ''">
AND ioi.invoiceEncode = #{invoiceEncode}
</if>
<if test="spec != null and spec != ''"> <if test="spec != null and spec != ''">
AND a2.spec like concat('%', #{spec}, '%') AND a2.spec like concat('%', #{spec}, '%')
</if> </if>
@ -76,6 +89,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
group by a2.id
</select> </select>

3
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -872,3 +872,6 @@ END;
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType', CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',
'tinyint NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1); 'tinyint NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1);

371
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -2,7 +2,8 @@
# #
# #
CREATE TABLE IF NOT EXISTS `device_info` ( CREATE TABLE IF NOT EXISTS `device_info`
(
`deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码', `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码',
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
`status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.正常，2变更归属中，3.维修申请中 4.维修中 6.销毁/报废', `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.正常，2变更归属中，3.维修申请中 4.维修中 6.销毁/报废',
@ -51,12 +52,12 @@ CREATE TABLE IF NOT EXISTS `device_info` (
`invCode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '存储仓库', `invCode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '存储仓库',
`estimatedTotalHour` int(10) unsigned zerofill DEFAULT NULL COMMENT '预计总工时', `estimatedTotalHour` int(10) unsigned zerofill DEFAULT NULL COMMENT '预计总工时',
`dayHour` int(10) unsigned zerofill DEFAULT NULL COMMENT '单日工时', `dayHour` int(10) unsigned zerofill DEFAULT NULL COMMENT '单日工时',
`assetValue` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '单个资产价值', `assetValue` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '单个资产价值',
`ownFund` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '自有资金', `ownFund` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '自有资金',
`financialAppropriation` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '财政拨款', `financialAppropriation` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '财政拨款',
`educationFund` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '科教基金', `educationFund` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '科教基金',
`otherFund` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '其他资金', `otherFund` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '其他资金',
`nonPeerFinancialAppropriation` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '非同级财政拨款', `nonPeerFinancialAppropriation` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '非同级财政拨款',
`ybbm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '医疗器械分类编码', `ybbm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '医疗器械分类编码',
`catalogname1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '一级分类名称(学科，品名）', `catalogname1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '一级分类名称(学科，品名）',
`catalogname2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '二级分类名称(用途、品目）', `catalogname2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '二级分类名称(用途、品目）',
@ -67,7 +68,7 @@ CREATE TABLE IF NOT EXISTS `device_info` (
`catalogCode3` bigint DEFAULT NULL COMMENT '三级分类名称(部位、功能、品种）', `catalogCode3` bigint DEFAULT NULL COMMENT '三级分类名称(部位、功能、品种）',
`managementCategory` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '管理类别', `managementCategory` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '管理类别',
`endUser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '使用人', `endUser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '使用人',
`estimatedResidualValue` decimal(10,2) unsigned zerofill DEFAULT NULL COMMENT '预计残值', `estimatedResidualValue` decimal(10, 2) unsigned zerofill DEFAULT NULL COMMENT '预计残值',
`currencyType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '币种', `currencyType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '币种',
`purType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '采购类型', `purType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '采购类型',
`purchaseDate` date DEFAULT NULL COMMENT '购置日期', `purchaseDate` date DEFAULT NULL COMMENT '购置日期',
@ -99,10 +100,10 @@ CREATE TABLE IF NOT EXISTS `device_info` (
`assetReserveType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '资产备用类型', `assetReserveType` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '资产备用类型',
`updateTime` datetime DEFAULT NULL COMMENT '更改日期', `updateTime` datetime DEFAULT NULL COMMENT '更改日期',
PRIMARY KEY (`deviceCode`) USING BTREE PRIMARY KEY (`deviceCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备表' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备表'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE if not exists `device_check` CREATE TABLE if not exists `device_check`
( (
@ -126,14 +127,14 @@ CREATE TABLE if not exists `device_check`
`createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', `createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名',
`updateTime` datetime DEFAULT NULL, `updateTime` datetime DEFAULT NULL,
PRIMARY KEY (`taskId`) USING BTREE PRIMARY KEY (`taskId`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='巡检任务表' COLLATE = utf8mb4_0900_ai_ci COMMENT ='巡检任务表'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_check_detail` CREATE TABLE IF NOT EXISTS `device_check_detail`
( (
`taskId` bigint NOT NULL COMMENT '任务id', `taskId` bigint NOT NULL COMMENT '任务id',
`deviceCode` varbinary(255) NOT NULL COMMENT '设备编码', `deviceCode` varbinary(255) NOT NULL COMMENT '设备编码',
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
@ -163,11 +164,11 @@ CREATE TABLE IF NOT EXISTS `device_check_detail`
`suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检建议', `suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检建议',
`applyId` bigint DEFAULT NULL COMMENT '报修单id', `applyId` bigint DEFAULT NULL COMMENT '报修单id',
`updateTime` datetime DEFAULT NULL COMMENT '更改时间', `updateTime` datetime DEFAULT NULL COMMENT '更改时间',
PRIMARY KEY (`taskId`,`deviceCode`) USING BTREE PRIMARY KEY (`taskId`, `deviceCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='巡检任务明细' COLLATE = utf8mb4_0900_ai_ci COMMENT ='巡检任务明细'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_check_detail_item` CREATE TABLE IF NOT EXISTS `device_check_detail_item`
( (
@ -185,11 +186,11 @@ CREATE TABLE IF NOT EXISTS `device_check_detail_item`
`checkDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检部门', `checkDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检部门',
`checkDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检部门名称', `checkDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '巡检部门名称',
`updateTime` datetime DEFAULT NULL, `updateTime` datetime DEFAULT NULL,
PRIMARY KEY (`taskId`,`deviceCode`,`itemCode`) USING BTREE PRIMARY KEY (`taskId`, `deviceCode`, `itemCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备巡检项目' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备巡检项目'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_repair` CREATE TABLE IF NOT EXISTS `device_repair`
( (
@ -234,10 +235,10 @@ CREATE TABLE IF NOT EXISTS `device_repair`
`repairDeptCode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '维修部门', `repairDeptCode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '维修部门',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备维修单' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备维修单'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_repair_apply` CREATE TABLE IF NOT EXISTS `device_repair_apply`
( (
@ -260,10 +261,10 @@ CREATE TABLE IF NOT EXISTS `device_repair_apply`
`finishTime` datetime DEFAULT NULL COMMENT '完成时间', `finishTime` datetime DEFAULT NULL COMMENT '完成时间',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备报修单' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备报修单'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_repair_apply_detail` CREATE TABLE IF NOT EXISTS `device_repair_apply_detail`
@ -299,11 +300,11 @@ CREATE TABLE IF NOT EXISTS `device_repair_apply_detail`
`confirmDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '确认部门名称', `confirmDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '确认部门名称',
`finishTime` datetime DEFAULT NULL COMMENT '完成时间', `finishTime` datetime DEFAULT NULL COMMENT '完成时间',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`applyId`,`deviceCode`) USING BTREE PRIMARY KEY (`applyId`, `deviceCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备报修单明细' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备报修单明细'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_plan` CREATE TABLE IF NOT EXISTS `device_plan`
( (
@ -320,22 +321,22 @@ CREATE TABLE IF NOT EXISTS `device_plan`
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`status` tinyint DEFAULT NULL COMMENT '设备巡检计划状态 ：1：草稿；2.已提交', `status` tinyint DEFAULT NULL COMMENT '设备巡检计划状态 ：1：草稿；2.已提交',
PRIMARY KEY (`planId`) USING BTREE PRIMARY KEY (`planId`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备巡检计划' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备巡检计划'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_plan_detail` CREATE TABLE IF NOT EXISTS `device_plan_detail`
( (
`planId` bigint NOT NULL COMMENT '计划id', `planId` bigint NOT NULL COMMENT '计划id',
`deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编号', `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编号',
`productId` bigint NOT NULL COMMENT '产品id', `productId` bigint NOT NULL COMMENT '产品id',
PRIMARY KEY (`planId`,`deviceCode`) USING BTREE, PRIMARY KEY (`planId`, `deviceCode`) USING BTREE,
UNIQUE KEY `uk_planId_productId` (`planId`,`deviceCode`) USING BTREE UNIQUE KEY `uk_planId_productId` (`planId`, `deviceCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='巡检计划明细' COLLATE = utf8mb4_0900_ai_ci COMMENT ='巡检计划明细'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_plan_detail_item` CREATE TABLE IF NOT EXISTS `device_plan_detail_item`
( (
@ -345,12 +346,12 @@ CREATE TABLE IF NOT EXISTS `device_plan_detail_item`
`deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目名称', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目名称',
`content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目内容', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目内容',
PRIMARY KEY (`planId`,`productId`,`itemCode`) USING BTREE, PRIMARY KEY (`planId`, `productId`, `itemCode`) USING BTREE,
UNIQUE KEY `uk_planId_deviceCode_itemCode` (`planId`,`itemCode`,`deviceCode`) USING BTREE UNIQUE KEY `uk_planId_deviceCode_itemCode` (`planId`, `itemCode`, `deviceCode`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='巡检设备的项目' COLLATE = utf8mb4_0900_ai_ci COMMENT ='巡检设备的项目'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_check_item_dict` CREATE TABLE IF NOT EXISTS `device_check_item_dict`
( (
@ -361,10 +362,10 @@ CREATE TABLE IF NOT EXISTS `device_check_item_dict`
`createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人名称', `createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人名称',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`code`) USING BTREE PRIMARY KEY (`code`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='巡检项目字典' COLLATE = utf8mb4_0900_ai_ci COMMENT ='巡检项目字典'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_change_log` CREATE TABLE IF NOT EXISTS `device_change_log`
( (
@ -385,12 +386,13 @@ CREATE TABLE IF NOT EXISTS `device_change_log`
`createUser` bigint NOT NULL COMMENT '操作人id', `createUser` bigint NOT NULL COMMENT '操作人id',
`createTime` datetime NOT NULL COMMENT '操作时间', `createTime` datetime NOT NULL COMMENT '操作时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备变更日志表' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备变更日志表'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `device_change_order` ( CREATE TABLE IF NOT EXISTS `device_change_order`
(
`orderId` bigint NOT NULL COMMENT '编码', `orderId` bigint NOT NULL COMMENT '编码',
`type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'add:新增入库，change:变更归属', `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'add:新增入库，change:变更归属',
`status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.待目标部门接收 ，2.完成(目标确认接收) ，3.目标部门拒收，4.取消', `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.待目标部门接收 ，2.完成(目标确认接收) ，3.目标部门拒收，4.取消',
@ -405,31 +407,30 @@ CREATE TABLE IF NOT EXISTS `device_change_order` (
`createUser` bigint DEFAULT NULL COMMENT '创建人id', `createUser` bigint DEFAULT NULL COMMENT '创建人id',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`orderId`) USING BTREE PRIMARY KEY (`orderId`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='设备变更单' COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备变更单'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceInfo', CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceInfo',
' tinyint NULL DEFAULT NULL COMMENT ''设备管理数据''', ' tinyint NULL DEFAULT NULL COMMENT ''设备管理数据''',
1); 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceCheck', CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceCheck',
' tinyint NULL DEFAULT NULL COMMENT ''巡检管理数据''', ' tinyint NULL DEFAULT NULL COMMENT ''巡检管理数据''',
1); 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceRepairApply', CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceRepairApply',
' tinyint NULL DEFAULT NULL COMMENT ''报修单数据''', ' tinyint NULL DEFAULT NULL COMMENT ''报修单数据''',
1); 1);
CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription', CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription',
' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''', ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''',
1); 1);
CREATE TABLE IF NOT EXISTS `thr_manufacturer` CREATE TABLE IF NOT EXISTS `thr_manufacturer`
@ -449,14 +450,12 @@ CREATE TABLE IF NOT EXISTS `thr_manufacturer`
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '备注', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `unique` (`unitId`,`thirdSysFk`) USING BTREE UNIQUE KEY `unique` (`unitId`, `thirdSysFk`) USING BTREE
) ENGINE=InnoDB ) ENGINE = InnoDB
AUTO_INCREMENT=1001 AUTO_INCREMENT = 1001
DEFAULT CHARSET=utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='第三方往来单位类型' COLLATE = utf8mb4_0900_ai_ci COMMENT ='第三方往来单位类型'
ROW_FORMAT=Dynamic; ROW_FORMAT = Dynamic;
@ -472,8 +471,8 @@ CALL Pro_Temp_ColumnWork('device_plan_detail_item', 'type',
1); 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'produceBusiness', CALL Pro_Temp_ColumnWork('sync_data_set', 'produceBusiness',
' tinyint NULL DEFAULT NULL COMMENT ''生产企业信息''', ' tinyint NULL DEFAULT NULL COMMENT ''生产企业信息''',
1); 1);
CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath', CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath',
'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''', 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''',
1); 1);
@ -590,7 +589,8 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item`
COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目' COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目'
ROW_FORMAT = Dynamic; ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `thr_medical_product_category` ( CREATE TABLE IF NOT EXISTS `thr_medical_product_category`
(
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`materialId` int DEFAULT NULL COMMENT '物资分类编码', `materialId` int DEFAULT NULL COMMENT '物资分类编码',
`materialName` varchar(255) DEFAULT NULL COMMENT '物资分类的名称', `materialName` varchar(255) DEFAULT NULL COMMENT '物资分类的名称',
@ -601,7 +601,10 @@ CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
`managementType` int DEFAULT NULL COMMENT '管理类别 ', `managementType` int DEFAULT NULL COMMENT '管理类别 ',
`materialCode` varchar(255) DEFAULT NULL COMMENT '标识', `materialCode` varchar(255) DEFAULT NULL COMMENT '标识',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医疗产品分类标识'; ) ENGINE = InnoDB
AUTO_INCREMENT = 160
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT ='医疗产品分类标识';
CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode', CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
@ -668,23 +671,109 @@ INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
VALUES (2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi', VALUES (2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi',
NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL); NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL);
UPDATE sys_custom_config SET `businessType` = 'supProductsAddDi', `remark` = '新增入院产品', `type` = '1', `handleChangeFuc` = NULL WHERE `id` = 22; UPDATE sys_custom_config
INSERT ignore INTO sys_custom_config(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`) VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL); SET `businessType` = 'supProductsAddDi',
`remark` = '新增入院产品',
`type` = '1',
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `handleChangeFuc` = NULL
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2106, 84, '2', 1, 'name', '物资名称', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); WHERE `id` = 22;
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2107, 84, '2', 1, 'spec', '规格型号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`)
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2109, 84, '2', 1, 'checkStatus', '审核状态', 'select', NULL, NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2110, 84, '1', 1, 'index', '序号', 'id', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `dataFuc`, `isShowXx`)
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2117, 84, '1', 1, 'oper', '操作', 'button', '', NULL, '', 120, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"详情\",\"clickFuc\":\"detail\",\"disabledFuc\":\"\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteProduct\",\"disabledFuc\":\"row.status == 2\",\"hasPermi\":\"\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2106, 84, '2', 1, 'name', '物资名称', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2107, 84, '2', 1, 'spec', '规格型号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2109, 84, '2', 1, 'checkStatus', '审核状态', 'select', NULL, NULL,
'{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2110, 84, '1', 1, 'index', '序号', 'id', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1,
'', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2117, 84, '1', 1, 'oper', '操作', 'button', '', NULL, '', 120, NULL,
'[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"详情\",\"clickFuc\":\"detail\",\"disabledFuc\":\"\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteProduct\",\"disabledFuc\":\"row.status == 2\",\"hasPermi\":\"\"}]',
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('thr_products_add_di', 'sourceType', CALL Pro_Temp_ColumnWork('thr_products_add_di', 'sourceType',
@ -695,15 +784,67 @@ CALL Pro_Temp_ColumnWork('thr_products_add_di', 'sourceType',
CALL Pro_Temp_ColumnWork('thr_products_add_di', 'internalMaterialCode', CALL Pro_Temp_ColumnWork('thr_products_add_di', 'internalMaterialCode',
'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''内部物资编码''', 'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''内部物资编码''',
1); 1);
UPDATE sys_custom_config_detail SET `configId` = 22, `type` = '1', `isShow` = 1, `columnName` = 'internalMaterialCode', `columnDesc` = '内部物资编码', `columnType` = 'text', `colorRule` = NULL, `sort` = NULL, `lableRule` = NULL, `width` = NULL, `tooltip` = 1, `buttonRule` = NULL, `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL, `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 275; UPDATE sys_custom_config_detail
SET `configId` = 22,
INSERT ignore INTO sys_custom_config_detail (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `type` = '1',
INSERT ignore INTO sys_param_config (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (1070, 0, '开启内部物资编码', 'internal_material_code', '1', 1, 0, '开启内部物资编码 0：否；1：是', NULL); `isShow` = 1,
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `columnName` = 'internalMaterialCode',
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `columnDesc` = '内部物资编码',
`columnType` = 'text',
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); `colorRule` = NULL,
`sort` = NULL,
`lableRule` = NULL,
`width` = NULL,
`tooltip` = 1,
`buttonRule` = NULL,
`number` = NULL,
`lineNumber` = NULL,
`clickFuc` = NULL,
`size` = NULL,
`style` = NULL,
`disabled` = NULL,
`checkRules` = NULL,
`inputType` = NULL,
`disabledFuc` = NULL,
`expression` = NULL,
`dataFuc` = NULL,
`isShowXx` = NULL
WHERE `id` = 275;
INSERT ignore INTO sys_custom_config_detail (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_param_config (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`, `updateTime`)
VALUES (1070, 0, '开启内部物资编码', 'internal_material_code', '1', 1, 0, '开启内部物资编码 0：否；1：是', NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
`columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
`buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
`disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
`dataFuc`, `isShowXx`)
VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck', CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck',
'tinyint NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''', 1); 'tinyint NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save