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

feat: 审核开关

Browse Source
dev_fifo1.0
chenhc 2 years ago
parent afd1e7fb7d
commit 9acdef9af4
21 changed files with 244 additions and 28 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.basic.SubmitApprovalFlowRequest;
import com.glxp.api.res.basic.SysApprovalFlowDetailResponse;
import com.glxp.api.service.basic.SysApprovalFlowService;
import com.glxp.api.service.system.SystemParamConfigService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@ -19,6 +20,8 @@ public class SysApprovalFlowController {
@Resource
private SysApprovalFlowService sysApprovalFlowService;
@Resource
private SystemParamConfigService systemParamConfigService;
@ApiOperation(value = "获取流程审批过程")
@GetMapping("/udiwms/sysApprovalFlow/approvalFlowDetailList/{approvalFlowId}")
@ -34,4 +37,11 @@ public class SysApprovalFlowController {
return ResultVOUtils.success();
}
@ApiOperation(value = "获取流程审批开关参数")
@GetMapping("/udiwms/sysApprovalFlow/config")
public BaseResponse getConfig() {
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
return ResultVOUtils.success(sys_approval_flow);
}
}

18
src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
Unescape Escape View File

@ -1,9 +1,12 @@
package com.glxp.api.controller.purchase;
import com.glxp.api.service.basic.SysApprovalFlowService;
import com.glxp.api.service.purchase.impl.PurApplyDetailService;
import com.glxp.api.service.purchase.impl.PurApplyService;
import com.glxp.api.service.purchase.impl.PurOrderDetailService;
import com.glxp.api.service.purchase.impl.PurPlanDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.IntUtil;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@ -82,6 +85,12 @@ public class PurApplyController {
IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
@Resource
SysApprovalFlowService sysApprovalFlowService;
@Resource
SystemParamConfigService systemParamConfigService;
final String type = "sg";
/**
* 新增申购单
@ -102,6 +111,15 @@ public class PurApplyController {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purApplyEntity.setBillNo(billNo);
}
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
Integer editStatus = postPurApplyRequest.getEditStatus();
if (editStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purApplyEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purApplyEntity.getBillNo(),type);
}
if (purApplyEntity.getId() == null) {
purApplyService.insert(purApplyEntity);
} else {

16
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -1,7 +1,9 @@
package com.glxp.api.controller.purchase;
import com.glxp.api.service.basic.SysApprovalFlowService;
import com.glxp.api.service.purchase.impl.PurOrderDetailService;
import com.glxp.api.service.purchase.impl.PurPlanDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
@ -70,6 +72,12 @@ public class PurOrderController {
IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
@Resource
SysApprovalFlowService sysApprovalFlowService;
@Resource
SystemParamConfigService systemParamConfigService;
final String type = "cgdd";
/**
* 新增采购计划
@ -96,6 +104,14 @@ public class PurOrderController {
purOrderEntity.setBillNo(billNo);
}
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
Integer editStatus = postPurOrderRequest.getEditStatus();
if (editStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purOrderEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purOrderEntity.getBillNo(),type);
}
if (purOrderEntity.getId() == null) {
purOrderService.insert(purOrderEntity);
} else {

9
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -59,6 +59,7 @@ import com.glxp.api.service.purchase.impl.PurApplyDetailService;
import com.glxp.api.service.purchase.impl.PurApplyService;
import com.glxp.api.service.purchase.impl.PurOrderDetailService;
import com.glxp.api.service.purchase.impl.PurPlanDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.*;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult;
@ -116,6 +117,8 @@ public class PurOrderReceiveController extends BaseController {
InvProductController invProductController;
@Resource
SysApprovalFlowService sysApprovalFlowService;
@Resource
SystemParamConfigService systemParamConfigService;
final String type = "ly";
@ -150,8 +153,9 @@ public class PurOrderReceiveController extends BaseController {
Long userId = customerService.getUserId();
purReceiveEntity.setStatus(purReceiveEntity.getStatus());
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
Integer editStatus = purReceiveEntity.getStatus();
if (editStatus == 2){//提交审核
if (editStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purReceiveEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purReceiveEntity.getBillNo(),type);
@ -178,6 +182,9 @@ public class PurOrderReceiveController extends BaseController {
// filterReceiveRequest.setTargetInvCode("1000000");
}
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
filterReceiveRequest.setSysApprovalFlow(sys_approval_flow);
List<ReceiveResponse> data = receiveService.filterList(filterReceiveRequest);
PageInfo<ReceiveResponse> pageInfo = new PageInfo<>(data);
PageSimpleResponse<ReceiveResponse> pageSimpleResponse = new PageSimpleResponse<>();

16
src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -1,9 +1,11 @@
package com.glxp.api.controller.purchase;
import com.glxp.api.service.basic.SysApprovalFlowService;
import com.glxp.api.service.purchase.impl.PurApplyDetailService;
import com.glxp.api.service.purchase.impl.PurApplyService;
import com.glxp.api.service.purchase.impl.PurOrderDetailService;
import com.glxp.api.service.purchase.impl.PurPlanDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
@ -82,6 +84,12 @@ public class PurPlanController {
PurOrderDetailService purOrderDetailService;
@Resource
IoPurChangeService purChangeService;
@Resource
SysApprovalFlowService sysApprovalFlowService;
@Resource
SystemParamConfigService systemParamConfigService;
final String type = "cgjh";
/**
* 新增采购计划
@ -105,6 +113,14 @@ public class PurPlanController {
purPlanEntity.setBillNo(billNo);
}
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
Integer editStatus = postPurPlanRequest.getEditStatus();
if (editStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purPlanEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purPlanEntity.getBillNo(),type);
}
if (purPlanEntity.getId() == null) {
purPlanService.insert(purPlanEntity);
} else {

6
src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java
Unescape Escape View File

@ -131,6 +131,12 @@ public class PurApplyEntity {
@TableField(value = "arrivalTime")
private Date arrivalTime;
/**
* 审批表主键
*/
@TableField(value = "approvalFlowId")
private String approvalFlowId;
public static final String COL_ID = "id";
public static final String COL_BILLNO = "billNo";

5
src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
Unescape Escape View File

@ -148,6 +148,11 @@ public class PurOrderEntity {
@TableField(value = "arrivalTime")
private Date arrivalTime;
/**
* 审批表主键
*/
@TableField(value = "approvalFlowId")
private String approvalFlowId;
public static final String COL_ID = "id";

7
src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java
Unescape Escape View File

@ -144,6 +144,13 @@ public class PurPlanEntity {
@TableField(value = "arrivalTime")
private Date arrivalTime;
/**
* 审批表主键
*/
@TableField(value = "approvalFlowId")
private String approvalFlowId;
public static final String COL_ID = "id";
public static final String COL_BILLNO = "billNo";

8
src/main/java/com/glxp/api/enums/ApprovalFlowEnum.java
Unescape Escape View File

@ -9,10 +9,10 @@ import lombok.Getter;
@AllArgsConstructor
public enum ApprovalFlowEnum {
DSH(1, "待审核"),
TG(2, "通过"),
BH(3, "驳回"),
CX(4, "撤销")
CG(1, "草稿"),
DSH(2, "待审核"),
TG(3, "通过"),
BH(4, "拒绝")
;

2
src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
Unescape Escape View File

@ -41,5 +41,7 @@ public class FilterReceiveRequest extends ListPageRequest {
private Boolean isInvCode;
private String createUser;
private Boolean sysApprovalFlow;
}

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

@ -42,8 +42,6 @@ public class BasicSkProjectResponse {
*/
private String remark;
private BigDecimal price;
private Date createTime;
private String createUser;

11
src/main/java/com/glxp/api/res/inout/ReceiveResponse.java
Unescape Escape View File

@ -106,4 +106,15 @@ public class ReceiveResponse {
*/
private String approvalFlowId;
/**
* 状态（1.草稿，2.未审核，3.已审核，4.拒绝）
*/
private int flowStatus;
/**
* 审核时间
*/
private Date flowAuditTime;
}

11
src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java
Unescape Escape View File

@ -81,4 +81,15 @@ public class PurApplyResponse {
private Integer emergency;
private Date arrivalTime;
/**
* 状态（1.草稿，2.未审核，3.已审核，4.拒绝）
*/
private int flowStatus;
/**
* 审核时间
*/
private Date flowAuditTime;
}

12
src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
Unescape Escape View File

@ -76,4 +76,16 @@ public class PurOrderResponse {
private Date arrivalTime;
private String supId;
private String supName;
/**
* 状态（1.草稿，2.未审核，3.已审核，4.拒绝）
*/
private int flowStatus;
/**
* 审核时间
*/
private Date flowAuditTime;
}

12
src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
Unescape Escape View File

@ -75,4 +75,16 @@ public class PurPlanResponse {
private String auditUserName;
private Integer emergency;
private Date arrivalTime;
/**
* 状态（1.草稿，2.未审核，3.已审核，4.拒绝）
*/
private int flowStatus;
/**
* 审核时间
*/
private Date flowAuditTime;
}

2
src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
sysApprovalFlow.setStatus(ApprovalFlowEnum.DSH.getCode());
Long userId = customerService.getUserId();
String userName = customerService.getUserName();
String userName = customerService.getUserBean().getEmployeeName();
Date date = new Date();
sysApprovalFlow.setUserId(userId + "");

31
src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
<select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
select IFNULL(saf.status,0) as status,saf.updateTime as auditTime,
select IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,
io.*,
( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) billTypeName,
(select name from auth_dept ad where ad.code = io.deptCode) deptName,
@ -48,18 +48,33 @@
<if test="endTime != null and endTime != '' and (startTime == null or startTime == '')">
AND date_format(createTime, '%Y-%m-%d') &lt;= date_format(#{endTime}, '%Y-%m-%d')
</if>
<if test="status != null">
<if test="sysApprovalFlow and status != null">
AND saf.status = #{status}
</if>
<if test="type == 1">
AND (saf.status is null or saf.status=0 or saf.status=1 or saf.status=3)
<if test="sysApprovalFlow and type == 1">
AND (saf.status is null or saf.status=1 or saf.status=2 or saf.status=4)
</if>
<if test="type == 2">
AND (saf.status=1)
<if test=" sysApprovalFlow and type == 2">
AND (saf.status=2)
</if>
<if test="type == 3">
AND (saf.status=2 or saf.status=3)
<if test="sysApprovalFlow and type == 3">
AND (saf.status=3 or saf.status=4)
</if>
<if test="!sysApprovalFlow and status != null">
AND io.status = #{status}
</if>
<if test="!sysApprovalFlow and type == 1">
AND (io.status is null or io.status=1 or io.status=2 or io.status=4)
</if>
<if test="!sysApprovalFlow and type == 2">
AND (io.status=2)
</if>
<if test="!sysApprovalFlow and type == 3">
AND (io.status=3 or io.status=4)
</if>
</where>
<choose>

13
src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml
Unescape Escape View File

@ -4,7 +4,8 @@
<mapper namespace="com.glxp.api.dao.purchase.PurApplyDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyRequest"
resultType="com.glxp.api.res.purchase.PurApplyResponse">
SELECT pur_apply.*,
SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,
pur_apply.*,
cb.employeeName createByName,
ab.employeeName auditByName,
auth_warehouse.`name` targetInvName,
@ -18,6 +19,7 @@
LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
LEFT JOIN auth_warehouse aw1 ON pur_apply.invCode = aw1.`code`
LEFT JOIN auth_dept ad1 ON ad1.`code` = pur_apply.deptCode
Left Join sys_approval_flow as saf ON pur_apply.approvalFlowId = saf.id
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
@ -46,13 +48,13 @@
and pur_apply.status = #{status}
</if>
<if test="status == 10">
and (pur_apply.status = 3 or pur_apply.status = 2 or pur_apply.status = 4)
and (saf.status=2 or saf.status=1 or saf.status=3)
</if>
<if test="status == 11">
and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
and (saf.status is null or saf.status=0 or saf.status=1 or saf.status=3)
</if>
<if test="status == 12">
and (pur_apply.status = 3 or pur_apply.status = 4)
and (saf.status=2 or saf.status=3)
</if>
<if test="deptCode != '' and deptCode != null">
AND deptCode = #{deptCode}
@ -168,6 +170,9 @@
<if test="arrivalTime != null">
arrivalTime=#{arrivalTime},
</if>
<if test="approvalFlowId != null">
approvalFlowId=#{approvalFlowId},
</if>
</trim>
WHERE id = #{id}
</update>

4
src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
Unescape Escape View File

@ -42,7 +42,8 @@
auth_warehouse.NAME invName,
aw1.name applyInvName,
auth_dept.`name` deptName,
basic_corp.name supName
basic_corp.name supName,
IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime
FROM pur_order
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
@ -51,6 +52,7 @@
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
left join basic_corp on pur_order.supId = basic_corp.erpId
left join auth_warehouse aw1 on pur_order.applyInv = aw1.`code`
Left Join sys_approval_flow as saf ON pur_order.approvalFlowId = saf.id
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}

7
src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
Unescape Escape View File

@ -4,13 +4,15 @@
<mapper namespace="com.glxp.api.dao.purchase.PurPlanDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurPlanRequest"
resultType="com.glxp.api.res.purchase.PurPlanResponse">
SELECT pur_plan.*,
SELECT IFNULL(saf.status,0) as flowStatus,saf.updateTime as flowAuditTime,
pur_plan.*,
cb.employeeName createUserName,
ab.employeeName auditUserName,
db.employeeName applyCreateBy,
auth_warehouse.NAME invName,
aw1.name applyInvName,
auth_dept.`name` deptName
auth_dept.`name` deptName,
FROM pur_plan
LEFT JOIN auth_user cb ON pur_plan.createUser = cb.id
LEFT JOIN auth_user ab ON pur_plan.auditUser = ab.id
@ -18,6 +20,7 @@
LEFT JOIN auth_warehouse ON pur_plan.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_plan.deptCode
left join auth_warehouse aw1 on pur_plan.applyInv = aw1.`code`
Left Join sys_approval_flow as saf ON pur_plan.approvalFlowId = saf.id
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}

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

@ -837,15 +837,20 @@ VALUES ('4', 'cgdd', '采购订单单据', 4, NULL, NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('pur_receive', 'approvalFlowId',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''审批表主键(关联审批流程主表)'' ',
1);
INSERT IGNORE INTO sys_param_config(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`)
VALUES (200324, 0, '是否开启审批流程配置', 'sys_approval_flow', '0', 1, 0, '0：否；1：是', '2024-03-13 11:04:02');
UPDATE sys_custom_config_detail
SET `configId` = 21, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = 120, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 234;
UPDATE sys_custom_config_detail
SET `configId` = 23, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 256;
@ -868,7 +873,7 @@ CALL Pro_Temp_ColumnWork('basic_sk_project', 'price',
UPDATE sys_custom_config_detail
SET `configId` = 19, `type` = '1', `isShow` = 1, `columnName` = 'oper', `columnDesc` = '操作', `columnType` = 'button',
`colorRule` = '', `sort` = NULL, `lableRule` = '', `width` = 500, `tooltip` = NULL,
`buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"编辑\",\"clickFuc\":\"newDistributionForm\",\"disabledFuc\":\"row.status==2\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"打印\",\"clickFuc\":\"printOrder\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteDialog\"}]',
`buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"编辑\",\"clickFuc\":\"newDistributionForm\",\"disabledFuc\":\"row.status==3\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"打印\",\"clickFuc\":\"printOrder\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteDialog\"}]',
`number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL,
`inputType` = NULL, `disabledFuc` = NULL, `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 215;
UPDATE sys_custom_config_detail
@ -880,14 +885,69 @@ SET `configId` = 25, `type` = '1', `isShow` = 1, `columnName` = 'auditRemark', `
UPDATE sys_custom_config_detail
SET `configId` = 25, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 2711;
UPDATE sys_custom_config_detail
SET `configId` = 19, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 212;
CALL Pro_Temp_ColumnWork('pur_apply', 'approvalFlowId',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''审批表主键(关联审批流程主表)'' ',
1);
CALL Pro_Temp_ColumnWork('pur_plan', 'approvalFlowId',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''审批表主键(关联审批流程主表)'' ',
1);
CALL Pro_Temp_ColumnWork('pur_order', 'approvalFlowId',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''审批表主键(关联审批流程主表)'' ',
1);
UPDATE sys_custom_config_detail
SET `configId` = 29, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 2769;
UPDATE sys_custom_config_detail
SET `configId` = 31, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 2799;
UPDATE sys_custom_config_detail
SET `configId` = 33, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
`colorRule` = '', `sort` = NULL, `lableRule` = '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}',
`width` = NULL, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 2827;
INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
VALUES (38001, 19, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', 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`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `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, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
VALUES (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`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `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, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
VALUES (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`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `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, NULL, NULL, NULL, NULL, NULL, NULL);

Write Preview
Loading…
Cancel
Save