diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 93ec4ad8a..8e3efb802 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -2,14 +2,19 @@ package com.glxp.api.controller.collect; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.IoCollectCodeBackup; import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.entity.collect.IoCollectOrderBackup; +import com.glxp.api.entity.collect.IoCollectOrderCheckCode; import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; @@ -18,11 +23,10 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; -import com.glxp.api.service.collect.IoCollectCodeBackService; -import com.glxp.api.service.collect.IoCollectOrderCodeAutoService; -import com.glxp.api.service.collect.IoCollectOrderCodeManService; -import com.glxp.api.service.collect.IoCollectOrderService; +import com.glxp.api.service.collect.*; +import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; +import org.aspectj.weaver.ast.Var; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -45,12 +49,16 @@ public class IoCollectCodeBackupController extends BaseController { @Resource IoCollectOrderService collectOrderService; + @Resource + IoCollectOrderBackupService ioCollectOrderBackupService; @Resource IoCollectOrderCodeAutoService ioCollectOrderCodeAutoService; @Resource IoCollectOrderCodeManService ioCollectOrderCodeManService; + @Resource + IoCollectOrderCheckCodeService ioCollectOrderCheckCodeService; /** * 追溯码备份查询 @@ -118,26 +126,39 @@ public class IoCollectCodeBackupController extends BaseController { @GetMapping("/udiwms/basic/collect/ioCollectCode/endList") public BaseResponse filterList(IoCollectCodeRequest request) { + IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo()); + if (order.getCheckCodeStatus() != 1){ + List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); + if (list.size() > 0){ + ioCollectOrderCheckCodeService.removeBatchByIds(list); + } + } List ioCollectCodeResponses = ioCollectCodeBackService.filterList(request); for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){ - CollectOrderCodeAutoRequest collectOrderCodeAutoRequest = new CollectOrderCodeAutoRequest(); - collectOrderCodeAutoRequest.setOrderIdFk(request.getBillNo()); - collectOrderCodeAutoRequest.setUdiCode(ioCollectCodeResponse.getCode()); - List collectOrderCodeAutoResponses = ioCollectOrderCodeAutoService.filterList(collectOrderCodeAutoRequest); - if (collectOrderCodeAutoResponses.size() >0){ - CollectOrderCodeAutoResponse collectOrderCodeAutoResponse = collectOrderCodeAutoResponses.get(0); - ioCollectCodeResponse.setSerialNo(collectOrderCodeAutoResponse.getSerialNo()); - }else { - CollectOrderCodeManRequest collectOrderCodeManRequest = new CollectOrderCodeManRequest(); - collectOrderCodeManRequest.setUdiCode(ioCollectCodeResponse.getCode()); - collectOrderCodeManRequest.setOrderIdFk(request.getBillNo()); - List collectOrderCodeManResponses = ioCollectOrderCodeManService.filterList(collectOrderCodeManRequest); - if (collectOrderCodeManResponses.size() > 0){ - CollectOrderCodeManResponse collectOrderCodeManResponse = collectOrderCodeManResponses.get(0); - ioCollectCodeResponse.setSerialNo(collectOrderCodeManResponse.getSerialNo()); - } - } + UdiEntity udiEntity = FilterUdiUtils.getUdi(ioCollectCodeResponse.getCode()); + ioCollectCodeResponse.setSerialNo(udiEntity.getSerialNo()); + ioCollectCodeResponse.setProductDate(udiEntity.getProduceDate()); + ioCollectCodeResponse.setExpireDate(udiEntity.getExpireDate()); } +// for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){ +// CollectOrderCodeAutoRequest collectOrderCodeAutoRequest = new CollectOrderCodeAutoRequest(); +// collectOrderCodeAutoRequest.setOrderIdFk(request.getBillNo()); +// collectOrderCodeAutoRequest.setUdiCode(ioCollectCodeResponse.getCode()); +// List collectOrderCodeAutoResponses = ioCollectOrderCodeAutoService.filterList(collectOrderCodeAutoRequest); +// if (collectOrderCodeAutoResponses.size() >0){ +// CollectOrderCodeAutoResponse collectOrderCodeAutoResponse = collectOrderCodeAutoResponses.get(0); +// ioCollectCodeResponse.setSerialNo(collectOrderCodeAutoResponse.getSerialNo()); +// }else { +// CollectOrderCodeManRequest collectOrderCodeManRequest = new CollectOrderCodeManRequest(); +// collectOrderCodeManRequest.setUdiCode(ioCollectCodeResponse.getCode()); +// collectOrderCodeManRequest.setOrderIdFk(request.getBillNo()); +// List collectOrderCodeManResponses = ioCollectOrderCodeManService.filterList(collectOrderCodeManRequest); +// if (collectOrderCodeManResponses.size() > 0){ +// CollectOrderCodeManResponse collectOrderCodeManResponse = collectOrderCodeManResponses.get(0); +// ioCollectCodeResponse.setSerialNo(collectOrderCodeManResponse.getSerialNo()); +// } +// } +// } PageInfo pageInfo = new PageInfo<>(ioCollectCodeResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -145,5 +166,28 @@ public class IoCollectCodeBackupController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCode") + public BaseResponse scanCheckCode(@RequestBody IoCollectCodeRequest filterCodeRequest){ + BaseResponse response = ioCollectCodeBackService.scanCheckCode(filterCodeRequest); + return response; + } + + + @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCodeReplace") + public BaseResponse replaceScanCode(@RequestBody IoCollectCodeRequest filterCodeRequest){ + BaseResponse response = ioCollectCodeBackService.replaceScanCode(filterCodeRequest); + return response; + } + + + + @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/commitCheckCodeOrder") + public BaseResponse commitCheckCodeOrder(@RequestBody IoCollectCodeRequest filterCodeRequest){ + BaseResponse response = ioCollectCodeBackService.commitCheckCodeOrder(filterCodeRequest); + return response; + } + + + } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 20c213e0d..e13ec569f 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -355,4 +355,6 @@ public class IoCollectOrderCodeManController extends BaseController { return response; } + + } diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCheckCodeMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCheckCodeMapper.java new file mode 100644 index 000000000..c588ca398 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCheckCodeMapper.java @@ -0,0 +1,17 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoCollectOrderCheckCode; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author : zhangsan + * @date : 2024/12/11 10:15 + * @modyified By : + */ + +@Mapper +public interface IoCollectOrderCheckCodeMapper extends BaseMapper { + Integer getCountByRelIdAndBillNo(@Param("relId") Long relId,@Param("billNo") String billNo); +} diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java index 2624f5754..102c307f9 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java @@ -258,5 +258,23 @@ public class IoCollectOrderBackup implements Serializable { @TableField(value = "thrBusType") @ApiModelProperty(value = "第三方单据类型编码") private String thrBusType; + + /** + * 扫码校验单据状态 0:未校验 1:校验完成 + */ + @TableField(value = "checkCodeStatus") + @ApiModelProperty(value = "扫码校验状态") + private Integer checkCodeStatus; + + + /** + * 是否需要扫码校验 0:不需要校验 1:需要校验 + */ + @TableField(value = "checkCodeConfirm") + @ApiModelProperty(value = "是否需要扫码校验 0:不需要校验 1:需要校验") + private Integer checkCodeConfirm; + + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java new file mode 100644 index 000000000..4cf9e48ff --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java @@ -0,0 +1,146 @@ +package com.glxp.api.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderCheckCode") +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +@TableName(value = "io_collect_order_check_code") +public class IoCollectOrderCheckCode implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 追溯码(UDI.药品) + */ + @TableField(value = "code") + @ApiModelProperty(value = "追溯码(UDI.药品)") + private String code; + + /** + * 单据来源 + */ + @TableField(value = "fromType") + @ApiModelProperty(value = "单据来源") + private String fromType; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "单据类型") + private String busType; + + /** + * 单据号 + */ + @TableField(value = "billNo") + @ApiModelProperty(value = "单据号") + private String billNo; + + /** + * 往来单位 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value = "往来单位") + private String fromCorp; + + /** + * 操作时间 + */ + @TableField(value = "operTime") + @ApiModelProperty(value = "操作时间") + private Date operTime; + + /** + * 操作人 + */ + @TableField(value = "operUser") + @ApiModelProperty(value = "操作人") + private String operUser; + + /** + * 采集点 + */ + @TableField(value = "collectCode") + @ApiModelProperty(value = "采集点") + private String collectCode; + + /** + * 采集点负责人 + */ + @TableField(value = "collectUser") + @ApiModelProperty(value = "采集点负责人") + private String collectUser; + + /** + * 工位 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value = "工位") + private Long workPlaceCode; + + /** + * 工位负责人 + */ + @TableField(value = "workPlaceUser") + @ApiModelProperty(value = "工位负责人") + private String workPlaceUser; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + + /** + * 赋码方式 1:自动拆零赋码;2:自动整取赋码;3.手动赋码 + */ + @TableField(value = "fifoSplit") + @ApiModelProperty(value = "") + private Integer fifoSplit; + + /** + * 出入库类型(1:入库;2:出库) + */ + @TableField(value = "inoutType") + @ApiModelProperty(value = "出入库类型") + private Integer inoutType; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value = "出入库类型") + private Integer scanCount; + + + /** + * 耗材字典外键id + */ + @TableField(value = "relId") + @ApiModelProperty(value = "耗材字典外键id") + private Long relId; + + private static final long serialVersionUID = 1L; +} + diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderCheckCodeResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderCheckCodeResponse.java new file mode 100644 index 000000000..294364599 --- /dev/null +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderCheckCodeResponse.java @@ -0,0 +1,107 @@ +package com.glxp.api.res.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhuzhu + * @date : 2024/12/11 10:18 + * @modyified By : + */ + +@Data +public class IoCollectOrderCheckCodeResponse { + + + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Integer id; + + @TableField(value = "orderIdFk") + @ApiModelProperty(value = "") + private String orderIdFk; + + /** + * 绑定业务表ID + */ + @TableField(value = "bizIdFk") + @ApiModelProperty(value = "") + private Long bizIdFk; + + @TableField(value = "udiCode") + @ApiModelProperty(value = "") + private String udiCode; + + @TableField(value = "relId") + @ApiModelProperty(value = "") + private Long relId; + + @TableField(value = "nameCode") + @ApiModelProperty(value = "") + private String nameCode; + + + @TableField(value = "productDate") + @ApiModelProperty(value = "") + private String productDate; + @TableField(value = "expireDate") + @ApiModelProperty(value = "") + private String expireDate; + @TableField(value = "batchNo") + @ApiModelProperty(value = "") + private String batchNo; + @TableField(value = "serialNo") + @ApiModelProperty(value = "") + private String serialNo; + + @TableField(value = "scanCount") + @ApiModelProperty(value = "") + private Integer scanCount; + + + @TableField(value = "scanActCount") + @ApiModelProperty(value = "") + private Integer scanActCount; + + + @TableField(value = "remark") + @ApiModelProperty(value = "") + private String remark; + + @TableField(value = "createTime") + @ApiModelProperty(value = "") + private Date createTime; + + @TableField(value = "`createUser`") + @ApiModelProperty(value = "") + private Long createUser; + + @TableField(value = "updateTime") + @ApiModelProperty(value = "") + private Date updateTime; + + @TableField(value = "updateUser") + @ApiModelProperty(value = "") + private Long updateUser; + + @TableField(value = "isSplitCode") + @ApiModelProperty(value = "是否拆零码") + private Boolean isSplitCode; + + /** + * 父级编码 + */ + @TableField(value = "parentCode") + private String parentCode; + + /** + * 爷级编码 + */ + @TableField(value = "grantPaCode") + private String grantPaCode; +} diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 074f54eec..3953acd74 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -178,6 +178,12 @@ public class IoCollectOrderResponse { private String shipperName; private String thrBusType; + /** + * 0:未校验 1:校验完成 + */ + private Integer checkCodeStatus; + + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index 6c823d7e1..5728f00e7 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -1,6 +1,8 @@ package com.glxp.api.service.collect; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,10 +10,13 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; @@ -20,6 +25,7 @@ import com.glxp.api.res.inout.AddEnterCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -27,11 +33,31 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service public class IoCollectCodeBackService extends ServiceImpl { + @Resource + IoCollectCodeBackMapper ioCollectCodeBackMapper; + + @Resource + IoCollectOrderBackupService ioCollectOrderBackupService; + + @Resource + UdiRelevanceService udiRelevanceService; + + @Resource + IoCollectOrderBizBackupService ioCollectOrderBizBackupService; + + @Resource + IoCollectOrderCheckCodeService ioCollectOrderCheckCodeService; + + @Resource + IoSplitFifoCodeService ioSplitFifoCodeService; + /** * 追溯码查询 @@ -51,5 +77,200 @@ public class IoCollectCodeBackService extends ServiceImpl().eq(IoCollectOrderCheckCode::getCode, filterCodeRequest.getCode())); + if (one != null) { + return ResultVOUtils.error(500, "该追溯码已被其他单据校验"); + } + //判断 + if (StrUtil.isNotEmpty(filterCodeRequest.getCode())) { + IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper() + .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo()) + .eq(IoCollectCodeBackup::getCode, filterCodeRequest.getCode())); + if (ioCollectCodeBackup == null) { + BaseResponse response = new BaseResponse(); + response.setData(filterCodeRequest.getCode()); + response.setCode(503); + response.setMessage("追溯码不存在"); + return response; + } + List ioCollectOrderBizBackups = ioCollectOrderBizBackupService.listByBillNo(filterCodeRequest.getBillNo()); + UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode()); + UdiRelevanceResponse udiRelevanceResponse; + List udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(udiEntity.getUdi(), null); + if (CollUtil.isEmpty(udiRelevanceResponses)) throw new JsonException(500, "字典不存在此产品!"); + else udiRelevanceResponse = udiRelevanceResponses.get(0); + //校验是否本单产品 + IoCollectOrderBizBackup collectOrderBizBackup = vailByBatchNo(udiRelevanceResponses, ioCollectOrderBizBackups, udiEntity); + if (collectOrderBizBackup == null) { + return ResultVOUtils.error(500, "非此单产品"); + } + udiEntity.setCode(filterCodeRequest.getCode()); + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse); + IoCollectOrderCheckCode ioCollectOrderCheckCode = new IoCollectOrderCheckCode(); + BeanUtils.copyProperties(ioCollectCodeBackup, ioCollectOrderCheckCode); + orderBackup.setCheckCodeStatus(1); + ThreadUtil.execAsync(() -> { + ioCollectOrderCheckCodeService.save(ioCollectOrderCheckCode); +// ioCollectOrderBackupService.updateByBillNo(orderBackup); + }); + return ResultVOUtils.success(addEnterCodeResponse); + } else { + List vailCodeResultResponses = new ArrayList<>(); + for (String code : filterCodeRequest.getCodeList()) { + IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper() + .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo()) + .eq(IoCollectCodeBackup::getCode, code)); + VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); + if (ioCollectCodeBackup != null) { + vailCodeResultResponse.setStatus(1); + vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setSucMsg("校验成功"); + vailCodeResultResponses.add(vailCodeResultResponse); + } else { + vailCodeResultResponse.setStatus(2); + vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setErrMsg("追溯码不存在"); + vailCodeResultResponses.add(vailCodeResultResponse); + } + } + return ResultVOUtils.success(vailCodeResultResponses); + } + } + + public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) { + AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse(); + BeanUtils.copyProperties(udiEntity, addEnterCodeResponse); + addEnterCodeResponse.setBzgg(checkUdi.getBzgg()); + addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc()); + addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec()); + addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit()); + addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit()); + addEnterCodeResponse.setGgxh(checkUdi.getGgxh()); + return addEnterCodeResponse; + } + + + public IoCollectOrderBizBackup vailByBatchNo(List udiRelevanceResponses, List collectOrderBizBackups, UdiEntity udiEntity) { + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + for (IoCollectOrderBizBackup collectOrderBizBackup : collectOrderBizBackups) { + if (udiRelevanceResponse.getId().equals(collectOrderBizBackup.getRelId()) && (StrUtil.emptyIfNull(collectOrderBizBackup.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) { + return collectOrderBizBackup; + } + } + } + return null; + } + + + public BaseResponse replaceScanCode(IoCollectCodeRequest filterCodeRequest) { + BaseResponse response = null; + if (StrUtil.isNotEmpty(filterCodeRequest.getCode())) { + response = insert(filterCodeRequest); + } else { + List codeList = filterCodeRequest.getCodeList(); + for (String code : codeList) { + filterCodeRequest.setCode(code); + response = insert(filterCodeRequest); + } + } + return response; + } + + public BaseResponse insert(IoCollectCodeRequest filterCodeRequest) { + IoCollectOrderBackup orderBackup = ioCollectOrderBackupService.getByBillNo(filterCodeRequest.getBillNo()); + if (orderBackup.getCheckCodeConfirm() == 0 || orderBackup.getCheckCodeConfirm() == null){ + orderBackup.setCheckCodeConfirm(1); + ioCollectOrderBackupService.updateByBillNo(orderBackup); + } + IoCollectOrderCheckCode one = ioCollectOrderCheckCodeService.getOne(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getCode, filterCodeRequest.getCode())); + if (one != null) { + return ResultVOUtils.error(500, "该追溯码已被其他单据校验"); + } + if (orderBackup == null) { + return ResultVOUtils.error(500, "订单不存在"); + } + UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode()); + if (udiEntity == null) { + return ResultVOUtils.error(500, "产品不存在"); + } + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + //吗替换的接口 替换哪个码 + IoCollectOrderCheckCode ioCollectOrderCheckCode = + IoCollectOrderCheckCode.builder() + .code(filterCodeRequest.getCode()) + .fifoSplit(3) + .relId(udiRelevanceResponse.getId()) + .operUser(orderBackup.getCreateUser()) + .busType(orderBackup.getBusType()) + .billNo(orderBackup.getBillNo()) + .fromType(orderBackup.getFromType()) + .fromCorp(orderBackup.getFromCorp()) + .workPlaceCode(orderBackup.getWorkPlaceCode()) + .operTime(new Date()) + .build(); + ioCollectOrderCheckCodeService.save(ioCollectOrderCheckCode); + return ResultVOUtils.success(orderBackup); + } + + public BaseResponse commitCheckCodeOrder(IoCollectCodeRequest filterCodeRequest) { + IoCollectOrderBackup orderBackup = ioCollectOrderBackupService.getByBillNo(filterCodeRequest.getBillNo()); + //已经完成单据码表 + List ioCollectCodeBackups = list(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo())); + //已经校验码表 + List ioCollectOrderCheckCodes = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, filterCodeRequest.getBillNo())); + List ioCollectOrderBizBackups = ioCollectOrderBizBackupService.listByBillNo(filterCodeRequest.getBillNo()); + for (IoCollectOrderBizBackup ioCollectOrderBizBackup : ioCollectOrderBizBackups) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(ioCollectOrderBizBackup.getNameCode()); + Integer checkCount = ioCollectOrderCheckCodeService.getCountByRelIdAndBillNo(udiRelevanceResponse.getId(), filterCodeRequest.getBillNo()); + if (checkCount != ioCollectOrderBizBackup.getScanCount()) { + return ResultVOUtils.error(500, ioCollectOrderBizBackup.getCpmctymc() + "追溯码未校验"); + } + } + + + + //校验处方码表与校验码表是否多出或者缺少 + // 使用流过滤出只在ioCollectCodeBackups中存在的code + List uniqueBackupsCodes = ioCollectCodeBackups.stream() + .map(IoCollectCodeBackup::getCode) + .filter(code -> !ioCollectOrderCheckCodes.stream() + .map(IoCollectOrderCheckCode::getCode) + .anyMatch(code::equals)) + .collect(Collectors.toList()); + //uniqueBackupsCodes 校验码表中不存在的码 + + List checkCodeList = ioCollectOrderCheckCodes.stream() + .map(IoCollectOrderCheckCode::getCode) + .filter(code -> !ioCollectCodeBackups.stream() + .map(IoCollectCodeBackup::getCode) + .anyMatch(code::equals)) + .collect(Collectors.toList()); + // 对比原始码表多出来的码 checkCodeList + + //检查码是否存在队列如果存在移除 + for (String code : checkCodeList){ + IoSplitFifoCodeEntity ioSplitFifoCodeEntity = ioSplitFifoCodeService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoCodeEntity::getCode, code)); + if (ioSplitFifoCodeEntity != null){ + ioSplitFifoCodeService.removeById(ioSplitFifoCodeEntity); + } + } + + boolean b = removeBatchByIds(ioCollectCodeBackups); + ArrayList collectCodeBackups = new ArrayList<>(); + for (IoCollectOrderCheckCode ioCollectOrderCheckCode : ioCollectOrderCheckCodes){ + IoCollectCodeBackup ioCollectCodeBackup = new IoCollectCodeBackup(); + BeanUtils.copyProperties(ioCollectOrderCheckCode,ioCollectCodeBackup); + collectCodeBackups.add(ioCollectCodeBackup); + } + saveBatch(collectCodeBackups); + orderBackup.setCheckCodeStatus(1); + ioCollectOrderBackupService.updateByBillNo(orderBackup); + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java index 5844ab1e3..64650e1f9 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; @@ -11,6 +12,7 @@ import com.glxp.api.dao.collect.IoCollectCodeMapper; import com.glxp.api.dao.collect.IoCollectOrderBizBackupMapper; import com.glxp.api.entity.collect.IoCollectCode; import com.glxp.api.entity.collect.IoCollectCodeBackup; +import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderBizBackup; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.collect.CollectOrderBizRequest; @@ -153,4 +155,13 @@ public class IoCollectOrderBizBackupService extends ServiceImpl listByBillNo(String billNo) { + List list = super.list(Wrappers.lambdaQuery(IoCollectOrderBizBackup.class) + .eq(IoCollectOrderBizBackup::getOrderIdFk, billNo) + ); + return list; + } + + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java new file mode 100644 index 000000000..e8fee83b3 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java @@ -0,0 +1,28 @@ +package com.glxp.api.service.collect; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.collect.IoCollectOrderBizMapper; +import com.glxp.api.dao.collect.IoCollectOrderCheckCodeMapper; +import com.glxp.api.entity.collect.IoCollectOrderBiz; +import com.glxp.api.entity.collect.IoCollectOrderCheckCode; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @author : zhuzhu + * @date : 2024/12/11 10:14 + * @modyified By : + */ + +@Service +public class IoCollectOrderCheckCodeService extends ServiceImpl { + + @Resource + IoCollectOrderCheckCodeMapper ioCollectOrderCheckCodeMapper; + + + public Integer getCountByRelIdAndBillNo(Long relId, String billNo) { + return ioCollectOrderCheckCodeMapper.getCountByRelIdAndBillNo(relId,billNo); + } +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 5f74f8616..db0b72927 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -869,6 +869,8 @@ public class IoCollectOrderService extends ServiceImpl group by iccb.id + order by bp.nameCode diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml index 9089dac07..e1bc35806 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml @@ -30,6 +30,7 @@ icob.orderTime, icob.uploadStatus, icob.uploadError, + icob.checkCodeStatus, icob.errorMsg, row_number() over ( order by case when icob.orderTime is null then icob.createTime diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCheckCodeMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCheckCodeMapper.xml new file mode 100644 index 000000000..d9080f8ef --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCheckCodeMapper.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 8f08f4db7..fee1ff544 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -964,12 +964,14 @@ CREATE TABLE IF NOT EXISTS `thr_inv_order_detail` 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 (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户', '2024-02-28 11:47:10', +VALUES (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户', + '2024-02-28 11:47:10', 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 (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C', '0', +VALUES (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C', + '0', '0', 'thirdSys:invOrder:thrInvOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL); UPDATE auth_menu @@ -996,19 +998,23 @@ WHERE `menu_id` = 2087; 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 (2088, '普耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvPhOrder', 'thirdSys/invOrder/thrInvPhOrder', NULL, 1, 0, 'C', +VALUES (2088, '普耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvPhOrder', 'thirdSys/invOrder/thrInvPhOrder', NULL, 1, + 0, 'C', '0', '0', 'thirdSys:invOrder:thrInvPhOrder', NULL, '超级用户', '2024-02-28 11:51:21', 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 (2089, '高耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvGhOrder', 'thirdSys/invOrder/thrInvGhOrder', NULL, 1, 0, 'C', +VALUES (2089, '高耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvGhOrder', 'thirdSys/invOrder/thrInvGhOrder', NULL, 1, + 0, 'C', '0', '0', 'thirdSys:invOrder:thrInvGhOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL); CALL Pro_Temp_ColumnWork('thr_inv_order', 'sourceType', ' int(0) NULL DEFAULT NULL COMMENT ''来源类型,1收费,2普耗,3高耗'' AFTER `remark`', 1); -CALL Pro_Temp_ColumnWork('thr_inv_order', 'exMsg', ' text NULL DEFAULT NULL COMMENT ''单据异常信息'' AFTER `remark`', 1); -CALL Pro_Temp_ColumnWork('thr_inv_order', 'skProject', ' int(0) NULL DEFAULT NULL COMMENT ''是否组套'' AFTER `remark`', 1); +CALL Pro_Temp_ColumnWork('thr_inv_order', 'exMsg', ' text NULL DEFAULT NULL COMMENT ''单据异常信息'' AFTER `remark`', + 1); +CALL Pro_Temp_ColumnWork('thr_inv_order', 'skProject', ' int(0) NULL DEFAULT NULL COMMENT ''是否组套'' AFTER `remark`', + 1); CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'udiCode', ' varchar(255) NULL DEFAULT NULL COMMENT ''udiCode'' AFTER `remark`', 1); CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'serialNo', @@ -1031,7 +1037,8 @@ CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'thrName', INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) -VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440, + NULL); INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (76, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); @@ -1047,7 +1054,8 @@ VALUES (79, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thi INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) -VALUES (90, '普耗出入库明细下载', 'invPhOrderUrl', '/udiwms/erp/inv/getInvPhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +VALUES (90, '普耗出入库明细下载', 'invPhOrderUrl', '/udiwms/erp/inv/getInvPhResult', 1, '1', '', 'thirdId', 1, 3, 1440, + NULL); INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (91, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); @@ -1064,7 +1072,8 @@ VALUES (94, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thi INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) -VALUES (95, '高耗出入库明细下载', 'invGhOrderUrl', '/udiwms/erp/inv/getInvGhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL); +VALUES (95, '高耗出入库明细下载', 'invGhOrderUrl', '/udiwms/erp/inv/getInvGhResult', 1, '1', '', 'thirdId', 1, 3, 1440, + NULL); INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (96, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL); @@ -1086,30 +1095,38 @@ CALL Pro_Temp_ColumnWork('inv_product', 'inBatchNo', ' varchar(30) NULL DEFAULT INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (200320, 0, '普耗/收费出库先进先出', 'phfee_batchno_fifo', '1', 1, 0, '第三方普耗/收费出库是否按照批号先进先出先进先出', '2024-03-07 15:20:35'); +VALUES (200320, 0, '普耗/收费出库先进先出', 'phfee_batchno_fifo', '1', 1, 0, + '第三方普耗/收费出库是否按照批号先进先出先进先出', '2024-03-07 15:20:35'); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo', 'tinyint NULL DEFAULT NULL COMMENT ''是否允许库存批次号先进先出''', 1); -CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); -CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); -CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1); +CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', + 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); +CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', + 1); +CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp', + 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1); CALL Pro_Temp_ColumnWork('thr_inv_order', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1); INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (200321, 0, '收费出库是否过滤高值耗材', 'fee_out_filter_hight', '0', 1, 0, '收费出库是否过滤高值耗材', '2024-03-13 09:50:48'); +VALUES (200321, 0, '收费出库是否过滤高值耗材', 'fee_out_filter_hight', '0', 1, 0, '收费出库是否过滤高值耗材', + '2024-03-13 09:50:48'); INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0', 1, 0, '收费出库是否过滤1对多的耗材', '2024-03-13 11:04:02'); +VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0', 1, 0, '收费出库是否过滤1对多的耗材', + '2024-03-13 11:04:02'); INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (200323, 0, '收费出库是否自动生成单据', 'fee_out_auto_gen', '0', 1, 0, '收费出库是否自动生成单据', '2024-03-13 11:04:02'); +VALUES (200323, 0, '收费出库是否自动生成单据', 'fee_out_auto_gen', '0', 1, 0, '收费出库是否自动生成单据', + '2024-03-13 11:04:02'); INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (200325, 0, '高耗出库是否自动生成单据', 'gh_out_auto_gen', '0', 1, 0, '高耗出库是否自动生成单据', '2024-03-20 10:23:42'); +VALUES (200325, 0, '高耗出库是否自动生成单据', 'gh_out_auto_gen', '0', 1, 0, '高耗出库是否自动生成单据', + '2024-03-20 10:23:42'); CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode', @@ -1198,7 +1215,8 @@ CREATE TABLE if not exists `sys_approval_flow_config_mx` 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 (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, 1, +VALUES (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, + 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-03-14 09:57:58', NULL, NULL, NULL); INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, @@ -1518,7 +1536,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38001, 19, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1528,7 +1547,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38002, 25, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1537,7 +1557,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38003, 25, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38003, 25, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1546,7 +1567,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38004, 21, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1555,7 +1577,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38005, 23, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38005, 23, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1564,7 +1587,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38006, 23, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1572,7 +1596,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38007, 27, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38007, 27, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1581,7 +1606,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38008, 27, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1589,7 +1615,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38009, 29, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38009, 29, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1598,7 +1625,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38010, 29, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1606,7 +1634,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38011, 31, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38011, 31, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1615,7 +1644,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38012, 31, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1623,7 +1653,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38013, 33, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38013, 33, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1632,7 +1663,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38014, 33, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1640,7 +1672,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38015, 33, '1', 1, 'flowAuditByName', '流程审核人', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38015, 33, '1', 1, 'flowAuditByName', '流程审核人', 'text', NULL, 1, 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`, @@ -1672,7 +1705,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38018, 35, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38018, 35, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1681,7 +1715,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38019, 35, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1689,7 +1724,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38021, 37, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38021, 37, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1698,7 +1734,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38020, 37, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1707,7 +1744,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38022, 39, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1715,7 +1753,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38023, 39, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38023, 39, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1724,7 +1763,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38024, 42, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1732,7 +1772,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38025, 42, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38025, 42, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1750,7 +1791,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38027, 44, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1758,7 +1800,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38028, 44, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38028, 44, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1767,7 +1810,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38029, 46, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, - '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', 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`, @@ -1775,7 +1819,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, 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`, @@ -1797,7 +1842,8 @@ CALL Pro_Temp_ColumnWork('device_change_order_item', 'remark', 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 (2091, '字典管理', 1, 8, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', 'system:dict:list', NULL, '超级用户', +VALUES (2091, '字典管理', 1, 8, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', 'system:dict:list', NULL, + '超级用户', '2024-03-19 14:58:35', NULL, NULL, NULL); @@ -1833,7 +1879,8 @@ VALUES (9, '相关人员类别', 'device_user_type', '0', 'admin', '2024-03-20 1 insert IGNORE into sys_dict_data values (11, 1, '维护员', '1', 'device_user_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '维护人员'); insert IGNORE into sys_dict_data -values (12, 2, '厂家技术支持', '2', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '厂家技术支持人员'); +values (12, 2, '厂家技术支持', '2', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, + '厂家技术支持人员'); insert IGNORE into sys_dict_data values (13, 3, '操作员', '3', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '操作人员'); @@ -1941,7 +1988,8 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'genStatus', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', + 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1); CALL Pro_Temp_ColumnWork('inv_count_order_detail', 'supId', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''供应商ID''', @@ -1981,7 +2029,8 @@ CREATE TABLE IF NOT EXISTS dept_material_category 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 (1866, '科室出库', 1655, 888, 'inout/IoDepartmentOrder', 'inout/IoDepartmentOrder', NULL, 1, 0, 'C', '0', '0', NULL, +VALUES (1866, '科室出库', 1655, 888, 'inout/IoDepartmentOrder', 'inout/IoDepartmentOrder', NULL, 1, 0, 'C', '0', '0', + NULL, NULL, '超级用户', '2023-06-14 15:00:11', NULL, NULL, NULL); @@ -1993,7 +2042,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, 'C', +VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-08 16:08:55', NULL, NULL, NULL); @@ -2032,7 +2082,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, +VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', + NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'destinyId', @@ -2460,7 +2511,8 @@ CALL Pro_Temp_ColumnWork('device_info', 'assetReserveType', ' varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''资产备用类型''', 1); -CALL Pro_Temp_ColumnWork('device_plan', 'status', 'tinyint NULL DEFAULT NULL COMMENT ''设备巡检计划状态 :1:草稿;2.已提交''', 1); +CALL Pro_Temp_ColumnWork('device_plan', 'status', + 'tinyint NULL DEFAULT NULL COMMENT ''设备巡检计划状态 :1:草稿;2.已提交''', 1); INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, @@ -2652,13 +2704,15 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3680, '待提交合同', 3679, 1, 'purchase/purContract/purContract', 'purchase/purContract/purContract', NULL, 1, 0, 'C', +VALUES (3680, '待提交合同', 3679, 1, 'purchase/purContract/purContract', 'purchase/purContract/purContract', NULL, 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-10 16:25:48', 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 (3689, '待审核合同', 3679, 2, 'purchase/purContract/purContractReviewed', 'purchase/purContract/purContractReviewed', +VALUES (3689, '待审核合同', 3679, 2, 'purchase/purContract/purContractReviewed', + 'purchase/purContract/purContractReviewed', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', 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`, @@ -2676,19 +2730,22 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3691, '申购管理', 1703, 13, 'purApply', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50', +VALUES (3691, '申购管理', 1703, 13, 'purApply', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', + '2023-02-08 17:01:50', 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 (3692, '计划管理', 1703, 14, 'purPlan', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-10 14:52:34', +VALUES (3692, '计划管理', 1703, 14, 'purPlan', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', + '2023-02-10 14:52:34', 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 (3693, '订单管理', 1703, 15, 'purOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-03-08 10:21:58', +VALUES (3693, '订单管理', 1703, 15, 'purOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', + '2023-03-08 10:21:58', 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`, @@ -2701,7 +2758,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3695, '新增申购单', 3691, 1, 'purchase/purApply/purApply', 'purchase/purApply/purApply', '{\"pageType\":2}', 1, 0, +VALUES (3695, '新增申购单', 3691, 1, 'purchase/purApply/purApply', 'purchase/purApply/purApply', '{\"pageType\":2}', 1, + 0, 'C', '0', '0', 'purchase:purApply:purApply', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, @@ -2710,7 +2768,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `update_by`, `update_time`, `remark`) VALUES (3696, '审核申购单', 3691, 2, 'purchase/purApply/pureApplyAudit', 'purchase/purApply/pureApplyAudit', '{\"pageType\":2}', - 1, 0, 'C', '0', '0', 'purchase:purApply:pureApplyAudit', NULL, '超级用户', '2023-02-10 13:54:03', NULL, NULL, NULL); + 1, 0, 'C', '0', '0', 'purchase:purApply:pureApplyAudit', NULL, '超级用户', '2023-02-10 13:54:03', 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`, @@ -2723,28 +2782,32 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3698, '新增采购计划', 3692, 1, 'purchase/purPlan/purPlan', 'purchase/purPlan/purPlan', '{\"pageType\":2}', 1, 0, 'C', +VALUES (3698, '新增采购计划', 3692, 1, 'purchase/purPlan/purPlan', 'purchase/purPlan/purPlan', '{\"pageType\":2}', 1, 0, + 'C', '0', '0', 'purchase:purPlan:purPlan', NULL, '超级用户', '2023-02-10 16:25:48', 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 (3699, '审核采购计划', 3692, 2, 'purchase/purPlan/purPlanAudit', 'purchase/purPlan/purPlanAudit', '{\"pageType\":2}', +VALUES (3699, '审核采购计划', 3692, 2, 'purchase/purPlan/purPlanAudit', 'purchase/purPlan/purPlanAudit', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', 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 (3700, '查询采购计划', 3692, 3, 'purchase/purPlan/purPlanSearch', 'purchase/purPlan/purPlanSearch', '{\"pageType\":2}', +VALUES (3700, '查询采购计划', 3692, 3, 'purchase/purPlan/purPlanSearch', 'purchase/purPlan/purPlanSearch', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:27:49', 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 (3701, '新增采购订单', 3693, 1, 'purchase/purOrder/purOrder', 'purchase/purOrder/purOrder', '{\"pageType\":2}', 1, 0, +VALUES (3701, '新增采购订单', 3693, 1, 'purchase/purOrder/purOrder', 'purchase/purOrder/purOrder', '{\"pageType\":2}', + 1, 0, 'C', '0', '0', NULL, '', '超级用户', '2023-03-08 10:32:25', NULL, NULL, NULL); INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, @@ -2765,20 +2828,23 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3704, '申购单明细', 3691, 4, 'details', 'purchase/purApply/pureApplySearchDetails', '{\"pageType\":2}', 1, 0, 'C', +VALUES (3704, '申购单明细', 3691, 4, 'details', 'purchase/purApply/pureApplySearchDetails', '{\"pageType\":2}', 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-04-04 09:30:27', 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 (3705, '采购计划明细', 3692, 4, 'details', 'purchase/purPlan/purPlanSearchDetails', '{\"pageType\":2}', 1, 0, 'C', '0', +VALUES (3705, '采购计划明细', 3692, 4, 'details', 'purchase/purPlan/purPlanSearchDetails', '{\"pageType\":2}', 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-04-04 09:32:00', 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 (3706, '采购订单明细', 3693, 4, 'details', 'purchase/purOrder/purOrderSearchDetails', '{\"pageType\":2}', 1, 0, 'C', +VALUES (3706, '采购订单明细', 3693, 4, 'details', 'purchase/purOrder/purOrderSearchDetails', '{\"pageType\":2}', 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-04-04 09:32:44', NULL, NULL, NULL); INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, @@ -2798,7 +2864,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3709, '待审核合同', 3694, 2, 'purchase/purContract/purContractReviewed', 'purchase/purContract/purContractReviewed', +VALUES (3709, '待审核合同', 3694, 2, 'purchase/purContract/purContractReviewed', + 'purchase/purContract/purContractReviewed', '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', NULL, NULL, NULL); INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, @@ -3366,7 +3433,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', +VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', + '0', NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL); CALL Pro_Temp_ColumnWork('io_order', 'confirmTime', 'datetime(0) NULL DEFAULT NULL COMMENT ''发票确认时间''', 1); @@ -3399,7 +3467,8 @@ VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, ' INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) -VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL, +VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, + NULL, NULL, NULL); CALL Pro_Temp_ColumnWork('device_repair', 'repairUserId', 'bigint DEFAULT NULL COMMENT''报修人id''', 1); @@ -3441,7 +3510,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50', +VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', + '2023-02-08 17:01:50', NULL, NULL, NULL); INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, @@ -3456,7 +3526,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed', 'purchase/purInquiry/purInquiryReviewed', +VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed', + 'purchase/purInquiry/purInquiryReviewed', '{\"pageType\":1}', 1, 0, 'C', '0', '0', 'purchase:purInquiry:purInquiryReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); @@ -3464,7 +3535,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish', 'purchase/purInquiry/purInquiryFinish', +VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish', + 'purchase/purInquiry/purInquiryFinish', '{\"pageType\":1}', 1, 0, 'C', '0', '0', 'purchase:purInquiry:purInquiryFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); @@ -3474,7 +3546,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `update_time`, `remark`) VALUES (3715, '待审核询价报价单', 3711, 5, 'purchase/purInquiryOffer/purInquiryOfferReviewed', 'purchase/purInquiryOffer/purInquiryOfferReviewed', '{\"pageType\":1}', 1, 0, 'C', - '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, + '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', 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`, @@ -3491,7 +3564,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `update_time`, `remark`) VALUES (3717, '待报价询价报价单', 3711, 4, 'purchase/purInquiryOffer/purInquiryOffer', 'purchase/purInquiryOffer/purInquiryOffer', '{\"pageType\":1}', 1, 0, 'C', - '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); + '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, + NULL); INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`) @@ -3748,12 +3822,14 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` `update_by`, `update_time`, `remark`) VALUES (3719, '论证明细', 3718, 1, 'purchase/purApplyArgument/purApplyArgument', 'purchase/purApplyArgument/purApplyArgument', '{\"pageType\":2}', 1, 0, 'C', - '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); + '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, + NULL); INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`, `remark`, `create_time`, `update_time`, `jrxmlPath`, `bussinessType`, `bussinessStatus`) -VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL, NULL); +VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL, + NULL); @@ -3792,7 +3868,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', 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', 'requireScanCode', @@ -3805,7 +3882,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', '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`, @@ -3813,7 +3891,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (41780, 94, '2', 1, 'corpName', '供应商', '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`, @@ -3847,7 +3926,8 @@ ALTER TABLE sup_evaluate_detail 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_products', 'bzgg', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''', @@ -4035,7 +4115,8 @@ INSERT IGNORE INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `editType`, `inPreInBack`, `deptNoInvType`, `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`, `vailProductAttributes`, `devInType`, `vailHcType`, `requireScanCode`, `codeCheck`) -VALUES (1816739249285963776, 'WareHouseOut', 'SC72197936495755', '科室拆零出库', 1, '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +VALUES (1816739249285963776, 'WareHouseOut', 'SC72197936495755', '科室拆零出库', 1, '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, '', 0, 0, 0, 1, '2024-07-26 15:36:05', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, NULL, 1, NULL, 0, 999, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, b'0', NULL); @@ -4045,7 +4126,8 @@ INSERT IGNORE INTO `basic_corp`(`id`, `erpId`, `name`, `spell`, `addr`, `status` `creditNo`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `thirdName`, `thirdName1`, `thirdName2`, `thirdName3`, `thirdName4`, `corpType`, `outType`, `createUser`, `createTime`, `updateUser`, `updateTime`, `remark`, `adSickNum`) -VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', NULL, '', '', '', '000', NULL, NULL, NULL, NULL, +VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', NULL, '', '', '', '000', NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, 4, 1, '', NULL, '', '2024-07-26 15:48:48', '', NULL); @@ -4799,33 +4881,32 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount', CALL Pro_Temp_ColumnWork('basic_products', 'detailSort', ' tinyint DEFAULT NULL COMMENT ''明细分类''', 1); -CREATE TABLE IF NOT EXISTS`third_ali_drug` +CREATE TABLE IF NOT EXISTS `third_ali_drug` ( - `id` int NOT NULL AUTO_INCREMENT, - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '药品类型', - `manufacturer`varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产企业', - `cpmctymc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称通用名称', - `form` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '剂型', - `formSpec` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '剂型规格', - `bzgg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '包装规格', - `spmc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '商品名称', - `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '层级标识', - `packRatio` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '包装比例', - `packLevel` 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 '更新时间', - `erpId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, - `approvalNum` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批准文号', + `id` int NOT NULL AUTO_INCREMENT, + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '药品类型', + `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产企业', + `cpmctymc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称通用名称', + `form` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '剂型', + `formSpec` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '剂型规格', + `bzgg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '包装规格', + `spmc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '商品名称', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '层级标识', + `packRatio` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '包装比例', + `packLevel` 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 '更新时间', + `erpId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `approvalNum` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批准文号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX`nameCode`(`nameCode`) USING BTREE, - INDEX`approvalNum`(`approvalNum`) USING BTREE, - INDEX`cpmctymc`(`cpmctymc`) USING BTREE - ) ENGINE = InnoDB - AUTO_INCREMENT = 8052 - CHARACTER SET = utf8mb4 - COLLATE = utf8mb4_0900_ai_ci - ROW_FORMAT = Dynamic; - + UNIQUE INDEX `nameCode` (`nameCode`) USING BTREE, + INDEX `approvalNum` (`approvalNum`) USING BTREE, + INDEX `cpmctymc` (`cpmctymc`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 8052 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = Dynamic; @@ -4841,9 +4922,12 @@ CALL Pro_Temp_ColumnWork('auth_company', 'refEntId', ' varchar(255) DEFAULT NULL COMMENT ''接口调用企业的唯一标识''', 1); -ALTER TABLE io_collect_order_origin MODIFY errorMsg text; -ALTER TABLE io_collect_order MODIFY errorMsg text; -ALTER TABLE io_collect_order_backup MODIFY errorMsg text; +ALTER TABLE io_collect_order_origin + MODIFY errorMsg text; +ALTER TABLE io_collect_order + MODIFY errorMsg text; +ALTER TABLE io_collect_order_backup + MODIFY errorMsg text; @@ -4883,22 +4967,63 @@ CALL Pro_Temp_ColumnWork('third_ali_drug', 'packUnitName', 1); -CREATE TABLE IF NOT EXISTS `auth_ali_user` ( - `id` bigint NOT NULL, - `erpId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '第三方ID', - `appKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '阿里KEY', - `appSecret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '阿里密钥', - `refEntId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '厂家标识', - `type` varchar(255) DEFAULT NULL COMMENT '1 为生成企业 2为零售药店', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +CREATE TABLE IF NOT EXISTS `auth_ali_user` +( + `id` bigint NOT NULL, + `erpId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '第三方ID', + `appKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '阿里KEY', + `appSecret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '阿里密钥', + `refEntId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '厂家标识', + `type` varchar(255) DEFAULT NULL COMMENT '1 为生成企业 2为零售药店', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci; 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 (6001, '医保上传统计', 5210, 999, 'inout/split/tag/stats', 'collect/CollectOrderStatsNew', NULL, 1, 0, 'C', '0', '0', NULL, '', '超级用户', '2024-11-18 17:46:08', NULL, NULL, NULL); +VALUES (6001, '医保上传统计', 5210, 999, 'inout/split/tag/stats', 'collect/CollectOrderStatsNew', NULL, 1, 0, 'C', '0', + '0', NULL, '', '超级用户', '2024-11-18 17:46:08', NULL, NULL, NULL); call Modify_UNIQUE_index('io_collect_order_biz', 'orderIdFk`, `relId`, `batchNo', 'sorts', 'BTREE'); + +CREATE TABLE IF NOT EXISTS `io_collect_order_check_code` +( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '追溯码(UDI.药品)', + `fromType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据来源', + `busType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据类型', + `billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号', + `fromCorp` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '往来单位', + `operTime` datetime NULL DEFAULT NULL COMMENT '操作时间', + `operUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作人', + `collectCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '采集点', + `collectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '采集点负责人', + `workPlaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工位', + `workPlaceUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工位负责人', + `fifoSplit` tinyint NULL DEFAULT NULL COMMENT '赋码方式 1:自动拆零赋码;2:自动整取赋码;3.手动赋码', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + `inoutType` tinyint NULL DEFAULT NULL COMMENT '出入库类型', + `scanCount` int NULL DEFAULT NULL COMMENT '扫码数量', + `relId` bigint NULL DEFAULT NULL COMMENT '耗材字典ID外键', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + COMMENT = '单据扫码校验码表' + ROW_FORMAT = Dynamic; + +CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'checkCodeStatus', + ' tinyint NULL DEFAULT b''0''COMMENT ''扫码校验单据状态 0:未校验 1:校验完成''', + 1); + + +CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'checkCodeConfirm', + ' tinyint NULL DEFAULT b''0''COMMENT ''是否需要扫码校验 0:不需要校验 1:需要校验''', + 1); + +