fix:修复

lh_dev_fifo
chenhc 4 months ago
parent 9fad948fce
commit 091bd6a929

@ -41,6 +41,12 @@ public class PurContractEntityResponse implements Serializable {
@TableField(value = "fromCorp") @TableField(value = "fromCorp")
private String fromCorp; private String fromCorp;
/**
* /
*/
private String fromCorpName;
private String invCodeName;
/** /**
* *
*/ */

@ -94,8 +94,10 @@
pc.id, pc.code, pc.`name`, pc.fromCorp, pc.contractDate, pc.invCode, pc.`type`, pc.payType, pc.startDate, pc.id, pc.code, pc.`name`, pc.fromCorp, pc.contractDate, pc.invCode, pc.`type`, pc.payType, pc.startDate,
pc.endDate, pc.amount, pc.payAmount, pc.payDate, pc.invoiceDate, pc.planOrderIdFk, pc.orderIdFk, pc.`createUser`, pc.endDate, pc.amount, pc.payAmount, pc.payDate, pc.invoiceDate, pc.planOrderIdFk, pc.orderIdFk, pc.`createUser`,
pc.updateUser, pc.createTime, pc.updateTime, pc.remark,pc.approvalFlowId,pc.isGenerateOrder,IFNULL(pc.status,0) as status, pc.updateUser, pc.createTime, pc.updateTime, pc.remark,pc.approvalFlowId,pc.isGenerateOrder,IFNULL(pc.status,0) as status,
saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType,bc.name as fromCorpName,aw.name AS invCodeName
from pur_contract pc from pur_contract pc
left join basic_corp bc on pc.fromCorp = bc.erpId
left join auth_warehouse aw on pc.invCode = aw.code
left join sys_approval_flow saf ON pc.approvalFlowId = saf.id left join sys_approval_flow saf ON pc.approvalFlowId = saf.id
<where> <where>
pc.code is not null pc.code is not null

@ -2583,7 +2583,7 @@ CREATE TABLE IF NOT EXISTS `pur_contract`
`invCode` 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 '当前仓库',
`status` int(0) NULL DEFAULT NULL COMMENT '合同状态', `status` int(0) NULL DEFAULT NULL COMMENT '合同状态',
`type` int(0) NULL DEFAULT NULL COMMENT '合同类型', `type` int(0) NULL DEFAULT NULL COMMENT '合同类型',
`payType` int(0) NULL DEFAULT NULL COMMENT '付款方式', `payType` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '付款方式',
`startDate` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', `startDate` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
`endDate` datetime(0) NULL DEFAULT NULL COMMENT '截止时间', `endDate` datetime(0) NULL DEFAULT NULL COMMENT '截止时间',
`amount` decimal(10, 3) NULL DEFAULT NULL COMMENT '合同金额', `amount` decimal(10, 3) NULL DEFAULT NULL COMMENT '合同金额',

Loading…
Cancel
Save