Merge remote-tracking branch 'origin/dev_price' into dev_price

dengbao
wj 2 years ago
commit ac7fea97d9

@ -37,10 +37,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@RestController
@ -108,6 +106,8 @@ public class BasicOrderPrintController {
List<Object> list = new ArrayList<>();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
String printThird = systemParamConfigService.selectValueByParamKey("order_print_by_thrproduct");
String value = systemParamConfigService.selectValueByParamKey("order_detail_visible");
//查询打印格式
BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction());
//根据批次号打印
@ -116,8 +116,15 @@ public class BasicOrderPrintController {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
//查询业务单详情
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
if (IntUtil.value(value) == 1) {
ioOrderDetailBizEntityList = ioOrderDetailBizEntityList.stream()
.sorted(Comparator.comparing(IoOrderDetailBizEntity::getNameCode))
.collect(Collectors.toList());
}
int i = 1;
if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) {
for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) {
@ -127,6 +134,7 @@ public class BasicOrderPrintController {
Map<String, Object> bizData = new HashMap<>();
bizData.put("index", i);
bizData.put("corpName", ioOrderResponse.getFromName() == null ? ' ' : ioOrderResponse.getFromName());
bizData.put("orderRemark", ioOrderResponse.getRemark() == null ? ' ' : ioOrderResponse.getRemark());
bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName());
bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo());
bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
@ -171,6 +179,11 @@ public class BasicOrderPrintController {
IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
//查询扫码单详情
List<IoCodeEntity> ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
if (IntUtil.value(value) == 1) {
ioCodeEntityList = ioCodeEntityList.stream()
.sorted(Comparator.comparing(IoCodeEntity::getNameCode))
.collect(Collectors.toList());
}
//查询业务单据表
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
int i = 1;
@ -214,6 +227,7 @@ public class BasicOrderPrintController {
bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
bizData.put("orderRemark", ioOrderResponse.getRemark() == null ? ' ' : ioOrderResponse.getRemark());
if (IntUtil.value(printThird) == 1) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(obj.getRelId());

@ -60,10 +60,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
*
@ -526,6 +524,12 @@ public class IoOrderDetailBizController extends BaseController {
@GetMapping("/udiwms/inout/bizDetail/filterList")
public BaseResponse filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
String value = systemParamConfigService.selectValueByParamKey("order_detail_visible");
if (IntUtil.value(value) == 1) {
list = list.stream()
.sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode))
.collect(Collectors.toList());
}
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);

@ -12,11 +12,15 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderDetailCodeService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.IntUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
*
@ -30,7 +34,8 @@ public class IoOrderDetailCodeController {
private IoCheckInoutService ioCheckInoutService;
@Resource
private IoOrderDetailBizService orderDetailBizService;
@Resource
SystemParamConfigService systemParamConfigService;
//获取新增扫码单据详情---临时接口查询
@AuthRuleAnnotation("")
@ -53,6 +58,12 @@ public class IoOrderDetailCodeController {
@GetMapping("udiwms/inout/codeDetail/filterList")
public BaseResponse filterList(FilterOrderDetailCodeRequest detailCodeRequest) {
List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.filterList(detailCodeRequest);
String value = systemParamConfigService.selectValueByParamKey("order_detail_visible");
if (IntUtil.value(value) == 1) {
list = list.stream()
.sorted(Comparator.comparing(IoOrderDetailCodeResponse::getNameCode))
.collect(Collectors.toList());
}
List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(detailCodeRequest.getOrderIdFk());
ioCheckInoutService.codeOrderCheck2(list, orderDetailBizEntities);
PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(list);

@ -98,6 +98,7 @@ public class SupManufacturerController {
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
supManufacturerEntity.setCompanyName(StrUtil.trimToEmpty(supManufacturerEntity.getCompanyName()));
String customerId = getCustomerId();
supManufacturerEntity.setCustomerId(customerId);
//判断用户名和社会信用代码不能重复

@ -0,0 +1,46 @@
package com.glxp.api.controller.thrsys;
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.entity.thrsys.ThrHslbEntity;
import com.glxp.api.req.thrsys.FilterThrHslbRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.thrsys.ThrHslbService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@RestController
public class ThrHslbController {
@Resource
ThrHslbService thrHslbService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/thrsys/getHslbs")
public BaseResponse getHslbs(FilterThrHslbRequest filterThrHslbRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrHslbEntity> thrHslbEntities
= thrHslbService.getHslbs(filterThrHslbRequest);
PageInfo<ThrHslbEntity> pageInfo;
pageInfo = new PageInfo<>(thrHslbEntities);
PageSimpleResponse<ThrHslbEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrHslbEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -292,12 +292,12 @@ public class ThrProductsAddDiController {
/**
* DI
*
* @param uuid
* @param devKey
* @return
*/
@GetMapping("udiwms/thrsys/getDiProductDetail")
public BaseResponse getDiProductDetail(String uuid) {
UdiInfoResponse udiInfoResponse = thrProductsAddDiService.getDiProductDetail(uuid);
public BaseResponse getDiProductDetail(String devKey) {
UdiInfoResponse udiInfoResponse = thrProductsAddDiService.getDiProductDetail(devKey);
return ResultVOUtils.success(udiInfoResponse);
}

@ -0,0 +1,15 @@
package com.glxp.api.dao.thrsys;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.thrsys.ThrHslbEntity;
import com.glxp.api.req.thrsys.FilterThrHslbRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface ThrHslbMapper extends BaseMapper<ThrHslbEntity> {
List<ThrHslbEntity> getHslbs(FilterThrHslbRequest filterThrHslbRequest);
}

@ -440,4 +440,12 @@ public class BasicBussinessTypeEntity {
*/
@TableField(value = "editType")
private Integer editType;
/**
* , 12
*/
@TableField(value = "inPreInBack")
private Integer inPreInBack;
}

@ -174,6 +174,19 @@ public class IoOrderDetailBizEntity {
@TableField(value = "remark5")
private String remark5;
/**
*
*/
@TableField(value = "sterBatchNo")
private String sterBatchNo;
/**
*
*/
@TableField(value = "sterDate")
private String sterDate;
@TableField(value = "bindRlIds")
private String bindRlIds;
@ -196,8 +209,6 @@ public class IoOrderDetailBizEntity {
private String checkColdFileName;
@TableField(exist = false)
private boolean checkSuccess;

@ -191,6 +191,18 @@ public class IoOrderDetailCodeEntity implements Serializable {
@TableField(value = "remark5")
private String remark5;
/**
*
*/
@TableField(value = "sterBatchNo")
private String sterBatchNo;
/**
*
*/
@TableField(value = "sterDate")
private String sterDate;
@TableField(exist = false)
private boolean checkSuccess;

@ -182,4 +182,17 @@ public class IoOrderDetailResultEntity {
@TableField(value = "remark5")
private String remark5;
/**
*
*/
@TableField(value = "sterBatchNo")
private String sterBatchNo;
/**
*
*/
@TableField(value = "sterDate")
private String sterDate;
}

@ -0,0 +1,43 @@
package com.glxp.api.entity.thrsys;
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 lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "thr_hslb")
public class ThrHslbEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
@TableField(value = "hslb")
private String hslb;
@TableField(value = "hsmc")
private String hsmc;
@TableField(value = "hsbm")
private String hsbm;
@TableField(value = "remark")
private String remark;
@TableField(value = "updateTime")
private Date updateTime;
@TableField(value = "createTime")
private Date createTime;
private static final long serialVersionUID = 1L;
}

@ -296,14 +296,19 @@ public class ThrProductsAddDiEntity {
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String thirdName;
@TableField(exist = false)
private boolean isChecked;
@TableField(exist = false)
private String corpName;
//添加字段
@TableField(exist = false)
private Integer checkStatus;
@TableField(exist = false)
private String thirdSys;
@TableField(exist = false)
private String nameCode;

@ -308,4 +308,5 @@ public class BussinessTypeSaveRequest {
* , 12
*/
private Integer editType;
private Integer inPreInBack;
}

@ -119,4 +119,6 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
* , 12
*/
private Integer editType;
private Integer inPreInBack;
}

@ -23,6 +23,7 @@ public class ProductInfoFilterRequest extends ListPageRequest {
private Integer isNewest;
private String zczbhhzbapzbh;
private String updateTime;
private String originUuid;
public String toCacheKey() {
return nameCode + deviceRecordKey + uuid + cpmctymc + ylqxzcrbarmc + ggxh + tyshxydm + diType + zczbhhzbapzbh + updateTime;

@ -195,4 +195,7 @@ public class FilterOrderRequest extends ListPageRequest {
//联合备注字段查询
private String unionRemark;
private Integer inPreInBack;
}

@ -0,0 +1,12 @@
package com.glxp.api.req.thrsys;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class FilterThrHslbRequest extends ListPageRequest {
private String key;
private String code;
}

@ -171,4 +171,7 @@ public class BasicBussinessTypeResponse {
* , 12
*/
private Integer editType;
private Integer inPreInBack;
}

@ -151,7 +151,15 @@ public class IoOrderDetailBizResponse {
* 5
*/
private String remark5;
/**
*
*/
private String sterBatchNo;
/**
*
*/
private String sterDate;
//扫码数量
private int scanCount;
@ -174,5 +182,4 @@ public class IoOrderDetailBizResponse {
private String checkColdFileName;
}

@ -154,7 +154,15 @@ public class IoOrderDetailCodeResponse {
private String remark5;
private boolean checkSuccess;
/**
*
*/
private String sterBatchNo;
/**
*
*/
private String sterDate;
/**
*
*/

@ -156,6 +156,17 @@ public class IoOrderDetailResultResponse {
* 5
*/
private String remark5;
/**
*
*/
private String sterBatchNo;
/**
*
*/
private String sterDate;
private int acceptCount;
private String fromCorpName;
private String billTypeName;
@ -163,7 +174,6 @@ public class IoOrderDetailResultResponse {
private Date auditTime;
private int orderCount;
private String invoiceCodes;

@ -86,6 +86,7 @@ public class UdiInfoResponse {
private String basicPrductRemak7;
private String basicPrductRemak8;
private String remark;
private String hslbName;
public Integer getId() {
return id;

@ -0,0 +1,32 @@
package com.glxp.api.service.thrsys;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.thrsys.ThrHslbMapper;
import com.glxp.api.entity.thrsys.ThrHslbEntity;
import com.glxp.api.req.thrsys.FilterThrHslbRequest;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class ThrHslbService extends ServiceImpl<ThrHslbMapper, ThrHslbEntity> {
@Resource
ThrHslbMapper thrHslbMapper;
public List<ThrHslbEntity> getHslbs(FilterThrHslbRequest filterThrHslbRequest) {
if (filterThrHslbRequest == null) {
return Collections.emptyList();
}
if (filterThrHslbRequest.getPage() != null) {
int offset = (filterThrHslbRequest.getPage() - 1) * filterThrHslbRequest.getLimit();
PageHelper.offsetPage(offset, filterThrHslbRequest.getLimit());
}
List<ThrHslbEntity> data = thrHslbMapper.getHslbs(filterThrHslbRequest);
return data;
}
}

@ -8,15 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.AuthCompanyMapper;
import com.glxp.api.dao.thrsys.ThrHslbMapper;
import com.glxp.api.dao.thrsys.ThrProductsAddDiDao;
import com.glxp.api.entity.auth.AuthCompany;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.thrsys.ThrHslbEntity;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
import com.glxp.api.req.thrsys.AddThrDiProductsRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
import com.glxp.api.res.thrsys.UdiInfoResponse;
import com.glxp.api.service.basic.ProductInfoService;
import com.glxp.api.service.thrsys.ThrHslbService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -117,6 +120,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
thrProductsAddDiEntity.setSpec(productInfoEntity.getGgxh());
thrProductsAddDiEntity.setRegisterNo(productInfoEntity.getZczbhhzbapzbh());
thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
thrProductsAddDiEntity.setDeviceRecordKey(productInfoEntity.getDeviceRecordKey());
thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
//设置编辑区参数
@ -138,9 +142,13 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
}
public UdiInfoResponse getDiProductDetail(String uuid) {
ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid);
@Resource
ThrHslbMapper thrHslbMapper;
public UdiInfoResponse getDiProductDetail(String devKey) {
ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.selectOne(new QueryWrapper<ThrProductsAddDiEntity>().eq("deviceRecordKey", devKey).last("limit 1"));
UdiInfoResponse udiInfoResponse = new UdiInfoResponse();
BeanUtil.copyProperties(thrProductsAddDiEntity, udiInfoResponse);
if (udiInfoResponse != null) {
udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
@ -157,6 +165,10 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
udiInfoResponse.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6());
udiInfoResponse.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7());
udiInfoResponse.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8());
if (StrUtil.isNotEmpty(thrProductsAddDiEntity.getBasicPrductRemak8())) {
ThrHslbEntity thrHslbEntity = thrHslbMapper.selectOne(new QueryWrapper<ThrHslbEntity>().eq("hsbm", thrProductsAddDiEntity.getBasicPrductRemak8()).last("limit 1"));
udiInfoResponse.setHslbName(thrHslbEntity.getHsmc());
}
}
return udiInfoResponse;
}

@ -19,6 +19,9 @@
<if test="uuid != '' and uuid != null">
AND uuid = #{uuid}
</if>
<if test="originUuid != '' and originUuid != null">
AND uuid = #{originUuid}
</if>
<if test="deviceRecordKey != '' and deviceRecordKey != null">
AND deviceRecordKey = #{deviceRecordKey}
</if>

@ -41,7 +41,7 @@
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="nameCode != null and nameCode != ''">
AND ip.nameCode like concat('%', #{nameCode}, '%')
AND bp.nameCode like concat('%', #{nameCode}, '%')
</if>
<if test="relIdFk != null and relIdFk != ''">
AND ip.relIdFk = #{relIdFk}

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrHslbMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrHslbEntity">
<!--@mbg.generated-->
<!--@Table thr_hslb-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="hslb" jdbcType="VARCHAR" property="hslb"/>
<result column="hsmc" jdbcType="VARCHAR" property="hsmc"/>
<result column="hsbm" jdbcType="VARCHAR" property="hsbm"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, hslb, hsmc, hsbm, remark, updateTime, createTime
</sql>
<select id="getHslbs" parameterType="com.glxp.api.req.thrsys.FilterThrHslbRequest"
resultType="com.glxp.api.entity.thrsys.ThrHslbEntity">
SELECT *
FROM thr_hslb
<where>
<if test="key != '' and key != null">
AND (hslb LIKE concat('%', #{key}, '%') or hsmc LIKE concat('%', #{key}, '%') or
hsbm LIKE concat('%', #{key}, '%'))
</if>
<if test="code != '' and code != null">
AND hsbm = #{code}
</if>
</where>
</select>
</mapper>

@ -656,3 +656,42 @@ VALUES (2011, '待审核单据·', 2006, 5, NULL, NULL, NULL, 1, 0, 'F', '0', '0
'2023-11-17 09:36:26', NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inPreInBack', 'tinyint', 1);
INSERT ignore INTO sys_param_config(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`, `updateTime`)
VALUES (20088, 0, '单据详情展示方式', 'order_detail_visible', '1', 0, 0, '1:按DI统一排序2按扫码或录入时间排序', NULL);
CREATE TABLE IF NOT EXISTS `sys_msg_todo`
(
`id` int NOT NULL AUTO_INCREMENT,
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '消息编码',
`msgType` tinyint NULL DEFAULT NULL COMMENT '消息类型1:入院物资申请2:单据审核3单据发票确认5.资质审核;6领用单审核7:申购单审核8采购订单审核',
`msgContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '消息内容',
`dealStatus` tinyint NULL DEFAULT NULL COMMENT '处理状态',
`pushStatus` tinyint NULL DEFAULT NULL COMMENT '推送小程序状态1未推送2:推送成功3推送失败',
`toUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '跳转地址',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属仓库',
`invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属仓库',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 1
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'sterBatchNo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'sterDate', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterBatchNo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterDate', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);

Loading…
Cancel
Save