From 755c44c65651a1f1d6429d24c05b3cd4a852028d Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Sat, 12 Nov 2022 11:34:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=98=E5=BA=93=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/supplychain/inventory/VehInventoryreportDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventoryreportDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventoryreportDto.java index 088e1fd468..8b3b8e20cd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventoryreportDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventoryreportDto.java @@ -18,4 +18,7 @@ public class VehInventoryreportDto implements Dto { private List recipientList; private String userSid; + + @ApiModelProperty("未盘原因") + private String reason; } From f42897ab45d7b13af89b17f6eabbe61f255bb130 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 12 Nov 2022 11:50:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 8465edcaae..69f3616199 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -9,7 +9,8 @@ public enum ProcDefEnum { ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), // CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), - SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//测试销售政策流程定义id + //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), // ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试 From 75deeaa5f8f43a9998c5ae9629f475b6c6819318 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 12 Nov 2022 11:53:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationVo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java index c08e518c8c..c04b2f6b29 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java @@ -50,7 +50,9 @@ import lombok.Data; public class BaseOutsourcingApplicationVo implements Vo { @ApiModelProperty("外采申请单sid") - private String sid; // 申请编号s + private String sid; // 外采申请单sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 @ApiModelProperty("申请编号") private String applicationCode; // 申请编号 @ApiModelProperty("申请日期")