Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.baseoutsourcingapplication;
 
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.common.core.dto.Dto;
 
@@ -122,5 +123,5 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	@ApiModelProperty("外采车辆列表")
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 	@ApiModelProperty("合同附件信息")
-	private  CommonAppendixDto contract;
+	private List<CommonAppendix> contract;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@@ -49,7 +49,8 @@ public enum CommonAttachTypeEnum {
     BILL_APPLICAYION("0012", "开票申请附件"),
     MANUFACTOR_SUB("0013", "厂商认款附件"),
     MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"),
-    SHUNTINGINVOICINAPPLY("0015", "调车开票附件");
+    SHUNTINGINVOICINAPPLY("0015", "调车开票附件"),
+    OUTSOURCINGAPPLY("0016", "外采申请附件");
     /**
      * 附件类型
      */

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

@@ -35,8 +35,12 @@ import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingA
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
 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.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
@@ -112,6 +116,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     private FlowableFeign flowableFeign;
     @Autowired
     private FinPaymentrecordFeign finPaymentrecordFeign;
+    @Autowired
+    private CommonAppendixService commonAppendixService;
 
     private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -165,6 +171,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();
         String sid1 = entity.getSid();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
@@ -204,6 +211,11 @@ 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);
+            }
             return rb.success().setMsg("添加成功").setData(entity.getSid());
         }
         updateBySid(dto, sid);

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@@ -57,7 +57,7 @@
               </template>
             </el-table-column>
             <el-table-column width="120px" prop="state" label="状态" header-align="center" align="left"/>
-            <el-table-column width="160px" prop="applyId" label="申请编号" align="center"/>
+            <el-table-column width="220px" prop="applyId" label="申请编号" align="center"/>
             <el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
             <el-table-column width="130px" prop="applyName" label="申请人" align="center"/>
             <el-table-column width="180px" prop="vin" label="车架号" align="center"/>
@@ -77,7 +77,7 @@
             </el-table-column>
             <el-table-column width="120px" label="临时出门证" align="center">
               <template slot-scope="{row}"> <!-- row.state == '已办结' -->
-                <el-button v-show="row.state == '已办结'" size="mini" type="primary" @click="handleExitPermit(row)">出门证
+                <el-button v-show="row.state == '已办结'" size="mini" type="primary" @click="handleExitPermit(row)">打印出门证
                 </el-button>
               </template>
             </el-table-column>
@@ -229,7 +229,11 @@
 </template>
 
 <script>
-import { deleteCarTransfer, selectCarTransferList, temporaryExitPermitInfo } from '@/api/supplychain/cunfangdidianbiangeng'
+import {
+  deleteCarTransfer,
+  selectCarTransferList,
+  temporaryExitPermitInfo
+} from '@/api/supplychain/cunfangdidianbiangeng'
 import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@@ -339,6 +339,7 @@ export default {
         if (res.success) {
           this.temp = res.data
           this.temp.instanceId = res.data.procInstId
+          this.vinNoList.params.warehouseSid = this.temp.locationSid
           if (this.temp.policyImage.length > 0) {
             for (var i = 0; i < this.temp.policyImage.length; i++) {
               const imgName = this.temp.policyImage[i].split('/')
@@ -402,8 +403,24 @@ export default {
     },
     // 确认选择车架号
     selectionvinNo() {
-      this.temp.vinNo = this.vinNoChoice[0].vin
-      this.vinNoVisible = false
+      if (this.vinNoChoice.length > 1){
+        this.$message({
+          showClose: true,
+          message: '仅可选择一个车架号！',
+          type: 'error'
+        });
+        return
+      }
+      if (this.vinNoChoice.length > 0) {
+        this.temp.vinNo = this.vinNoChoice[0].vin
+        this.vinNoVisible = false
+      }else {
+        this.$message({
+          showClose: true,
+          message: '请选择选择一个车架号！',
+          type: 'error'
+        });
+      }
       // this.$refs.multipleTable.clearSelection();
     },
 

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@@ -371,6 +371,7 @@ export default {
           this.temp = res.data
           this.temp.instanceId = instanceId
           this.temp.taskId = taskId
+          this.vinNoList.params.warehouseSid = this.temp.locationSid
           if (this.temp.policyImage.length > 0) {
             for (var i = 0; i < this.temp.policyImage.length; i++) {
               const imgName = this.temp.policyImage[i].split('/')
@@ -434,8 +435,24 @@ export default {
     },
     // 确认选择车架号
     selectionvinNo() {
-      this.temp.vinNo = this.vinNoChoice[0].vin
-      this.vinNoVisible = false
+      if (this.vinNoChoice.length > 1){
+        this.$message({
+          showClose: true,
+          message: '仅可选择一个车架号！',
+          type: 'error'
+        });
+        return
+      }
+      if (this.vinNoChoice.length > 0) {
+        this.temp.vinNo = this.vinNoChoice[0].vin
+        this.vinNoVisible = false
+      }else {
+        this.$message({
+          showClose: true,
+          message: '请选择选择一个车架号！',
+          type: 'error'
+        });
+      }
       // this.$refs.multipleTable.clearSelection();
     },