采购退库 增加orgName

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@@ -28,4 +28,6 @@ public class ScmVehicleReturn extends BaseEntity {
     private String taskId;
     @ApiModelProperty(value = "taskDefKey")
     private String taskDefKey;
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@@ -34,4 +34,6 @@ public class ScmVehicleReturnDetailsVo implements Vo {
     private List<ScmVehicleReturnDetailssVo> voList = new ArrayList<>();
     @ApiModelProperty(value = "费用说明")
     private String remarks;
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -62,4 +62,6 @@ public class ScmVehicleReturnDto implements Dto {
     private String remarks;
     @ApiModelProperty(value = "createBySid")
     private String createBySid;
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java

@@ -51,4 +51,6 @@ public class ScmVehicleReturnFlowDto implements Serializable {
     private List<String> candidateGroups = new ArrayList<>();
     @ApiModelProperty("taskDefKey")
     private String taskDefKey;
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java

@@ -27,5 +27,6 @@ public class ScmVehicleReturnVo implements Vo {
 
     @ApiModelProperty(value = "台数")
     private Integer num;
-
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml

@@ -7,6 +7,7 @@
                sr.applicationName,
                DATE_FORMAT(sr.createTime, '%Y-%m-%d')                                               as createTime,
                sr.reason,
+               sr.orgName,
                if(length(sr.nodeState) > 0, sr.nodeState, '待提交')                                    as nodeState,
                (select count(*) from scm_vehicle_return_details sd where sd.vehicleOutSid = sr.sid) as num
         from scm_vehicle_return sr