From fcc7df6644342ee263406650eb3023053cfda4af Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 29 Jul 2022 21:03:50 +0800 Subject: [PATCH] =?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 --- .../yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java | 2 ++ .../scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java | 2 ++ .../anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java | 2 ++ .../scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java | 2 ++ .../anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java | 3 +++ .../yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java | 2 ++ .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 1 + .../scm/biz/scmvehiclereturn/ScmVehicleReturnService.java | 1 + 8 files changed, 15 insertions(+) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java index 24ffb743cb..bf40799d64 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java @@ -30,4 +30,6 @@ public class ScmVehicleReturn extends BaseEntity { private String taskDefKey; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java index 8da8b0d988..00c8b6fc50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java @@ -36,4 +36,6 @@ public class ScmVehicleReturnDetailsVo implements Vo { private String remarks; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java index ff88ccff88..76139e85d4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java @@ -64,4 +64,6 @@ public class ScmVehicleReturnDto implements Dto { private String createBySid; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java index b9aa5aa7d4..d43ce71985 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java @@ -53,4 +53,6 @@ public class ScmVehicleReturnFlowDto implements Serializable { private String taskDefKey; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java index 9c7a2c293f..2833516928 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java @@ -24,5 +24,8 @@ public class ScmVehicleReturnQuery implements Query { @ApiModelProperty(value = "用户sid") private String userSid; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java index 6c04319c12..4a5d2cdba7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java @@ -29,4 +29,6 @@ public class ScmVehicleReturnVo implements Vo { private Integer num; @ApiModelProperty(value = "分公司名称") private String orgName; + @ApiModelProperty(value = "分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index db06aa62bd..f8de6885eb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -112,6 +112,7 @@ public class ScmApplyInboundService extends MybatisBaseService pagging = baseMapper.pagerList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);