退库和外采

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.base.api.baseoutsourcingapplication;
 
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -106,6 +108,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private String useOrgName; // 分公司名称
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("合同附件")
+    private CommonAppendixVo contract; // 备注
     @ApiModelProperty("外采车辆列表")
     private List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos; // 外采车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -123,5 +123,5 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 	@ApiModelProperty("合同附件信息")
-	private List<CommonAppendix> contract;
+	private CommonAppendix contract;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingA
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
@@ -171,7 +172,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         ResultBean rb = ResultBean.fireFail();
         BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
         List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos();
-        List<CommonAppendix> contract = dto.getContract();
+         CommonAppendix  contract = dto.getContract();
         String sid1 = entity.getSid();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
@@ -211,10 +212,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                 baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
                 baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
             }
-            for (CommonAppendix commonAppendix : contract) {
-                commonAppendix.setLinkSid(entity.getSid());
-                commonAppendix.setAttachType(CommonAttachTypeEnum.OUTSOURCINGAPPLY.getAttachType());
-                commonAppendixService.save(commonAppendix);
+            if(contract!=null){
+                contract.setLinkSid(entity.getSid());
+                contract.setFileType( contract.getFileName().substring(
+                        contract.getFileName().lastIndexOf("."),contract.getFileName().length()));
+                contract.setName(dto.getCreateByName());
+                contract.setAttachType(CommonAttachTypeEnum.OUTSOURCINGAPPLY.getAttachType());
+                commonAppendixService.save(contract);
             }
             return rb.success().setMsg("添加成功").setData(entity.getSid());
         }
@@ -245,6 +249,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         BeanUtil.copyProperties(baseOutsourcingApplication, baseOutsourcingApplicationDetailsVo);
         List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(sid);
         baseOutsourcingApplicationDetailsVo.setBaseOutsourcingApplicationVehicleVos(baseOutsourcingApplicationVehicleVos);
+
+        List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid( sid);
+        if(commonAppendixVos!=null&&commonAppendixVos.size()>0){
+            baseOutsourcingApplicationDetailsVo.setContract(commonAppendixVos.get(0));
+        }
+
         return rb.success().setData(baseOutsourcingApplicationDetailsVo);
     }
 

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

@@ -16,7 +16,7 @@ public enum ProcDefEnum {
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:4:255004"),//TODO
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入账申请", "process_xbwq2c7p:1:285008"),//TODO
-    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:237508"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:5:292504"),//ToDo
     SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"),