厂家采购流程添加环节

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -82,4 +82,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人的orgSidPath")
+    private String orgSidPath;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -82,4 +82,7 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人orgSidPath")
+    private String orgSidPath;
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -192,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales);
+            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales,"orgSidPath");
             int i = baseMapper.updateById(baseVehicleActualSales);
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -220,6 +220,22 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
+            //=======================================
+            String orgSidPath = dto.getOrgSidPath();
+            if(StringUtils.isBlank(orgSidPath)){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+            //===========================================
             BusVehicleApply entity = new BusVehicleApply();
             BeanUtil.copyProperties(dto, entity, "sid");
             //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
@@ -227,6 +243,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             String billNo = getApplyCode(dto);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
+            entity.setOrgSidPath(orgSidPath);
             int i = 0;
             List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
@@ -260,7 +277,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (busVehicleApply == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(dto, busVehicleApply);
+            BeanUtil.copyProperties(dto, busVehicleApply,"orgSidPath");
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
             busVehicleApplySzService.deleteByApplySid(dto.getSid());
             int i = 0;
@@ -364,6 +381,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return rb.setMsg("采购原因不能为空");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -511,6 +529,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(busVehicleApply.getOrgSidPath());
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

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

@@ -17,8 +17,8 @@ public enum ProcDefEnum {
 //    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
 //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
-//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"),

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -450,7 +450,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             if (scmVehicleGression == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(dto, scmVehicleGression);
+            BeanUtil.copyProperties(dto, scmVehicleGression,"orgSidPath");
             baseMapper.updateById(scmVehicleGression);
             scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid());
             scmVehicleGressionVehService.saveOrUpdateDto(scmVehicleGressionVehDtos, scmVehicleGression.getSid());