问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -278,6 +278,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
                 scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
                 scmApplyInbound.setUseOrgSid(vehicleOrder.getCreateOrgSid());
+                //scmApplyInbound.setPcApplicationCode();
                 scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
             }
             return rb.success();

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -7,7 +7,7 @@ public enum ProcDefEnum {
 
     /***************************正式流程id***********************************/
 
-   /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+   ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
@@ -38,12 +38,12 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
 
 
     /******************************测试流程id*********************************************/
 
-    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+    /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
@@ -74,7 +74,7 @@ public enum ProcDefEnum {
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id*/
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTask.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>工作流任务<p>
@@ -95,4 +96,7 @@ public class FlowTask extends BaseEntity implements Serializable {
     @ApiModelProperty("任务完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
+
+    @ApiModelProperty("环节的办理人信息")
+    private List<TaskUserInfo> taskUserInfos;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/TaskUserInfo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.portal.api.flow;
+
+public class TaskUserInfo {
+    private String assigneeName;
+    private String assigneeHeadImage;
+    private String assigneeSid;
+
+    public String getAssigneeSid() {
+        return assigneeSid;
+    }
+
+    public void setAssigneeSid(String assigneeSid) {
+        this.assigneeSid = assigneeSid;
+    }
+
+    public String getAssigneeName() {
+        return assigneeName;
+    }
+
+    public void setAssigneeName(String assigneeName) {
+        this.assigneeName = assigneeName;
+    }
+
+    public String getAssigneeHeadImage() {
+        return assigneeHeadImage;
+    }
+
+    public void setAssigneeHeadImage(String assigneeHeadImage) {
+        this.assigneeHeadImage = assigneeHeadImage;
+    }
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -155,6 +155,8 @@ public class ScmApplyInboundDto implements Dto {
 
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("排产申请编号")
+    private String pcApplicationCode;
 
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -56,7 +56,7 @@ public class ScmWarehouseVo implements Vo {
     private String useOrg; // 使用组织
     
 	@ApiModelProperty("使用组织sid")
-    private String[][] useOrgSid; // 使用组织sid
+    private String useOrgSid; // 使用组织sid
     
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -172,20 +172,6 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         ScmWarehouse entity = this.fetchBySid(sid);
         ScmWarehouseVo vo = new ScmWarehouseVo();
         BeanUtil.copyProperties(entity, vo);
-        if (StringUtils.isNotBlank(entity.getUseOrgSid())) { //库存组织sid
-            List<String> list = Arrays.asList(entity.getUseOrgSid().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            vo.setUseOrgSid(s);
-        }
         return vo;
     }