Merge remote-tracking branch 'origin/master'

1 year ago · 149c7c09d3
17 changed files with 156 additions and 28 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java
@ -66,6 +66,10 @@ public interface BaseVehicleCertificateFeign {
    @PostMapping("/update/{sid}")
    public ResultBean update(@RequestBody BaseVehicleCertificateDto dto, @PathVariable("sid") String sid);

+    @ApiOperation("单独维护车架号")
+    @PostMapping("/updateVinNo")
+    public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid);
+
    /**
     * 根据前台传来的sid的集合进行批量删除
     *
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
@ -112,5 +112,8 @@ public interface BusVehicleApplyFeign {
    @ResponseBody
    public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query);

-
+    @ApiOperation("根据排产编号查询")
+    @PostMapping("/getBillNo")
+    @ResponseBody
+    ResultBean<BusVehicleApply> getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode);
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java
@ -121,4 +121,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
    public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) {
        return null;
    }
+
+    @Override
+    public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
+        return null;
+    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
@ -107,4 +107,7 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
    void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);

    BaseVehicleCertificate selectByVinSid(String vinSid);
+
+    @Update("update base_vehicle_certificate set remarks = #{remarks},vinNo = #{vinNo} where sid = #{sid}")
+    void updateVinNo(@Param("vinNo") String vinNo,@Param("remarks") String remarks,@Param("sid") String sid);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java
@ -177,6 +177,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
        return rb.success().setMsg("修改成功");
    }

+    @Override
+    public ResultBean updateVinNo(String vinNo, String sid) {
+        return baseVehicleCertificateService.updateVinNo(vinNo,sid);
+    }
+
    /**
     * 根据前台传来的sid的集合进行批量删除
     *
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.CertificState;
@ -67,6 +68,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
    private BusTransferRecordsFeign busTransferRecordsFeign;
    @Autowired
    private BaseVehicleAppendixService baseVehicleAppendixService;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
    /**
     * 台账信息条件分页查询
     *
@ -342,4 +345,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
        }
        return rb.success();
    }
+
+    public ResultBean updateVinNo(String vinNo, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        if (vinNo.length() != 17){
+            return rb.setMsg("字符串长度不是17位");
+        }
+        BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
+        String remarks = baseVehicleCertificate.getRemarks();
+        if (StringUtils.isBlank(remarks)) {
+            remarks = "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+        }else {
+            remarks = remarks + "，" + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+        }
+        baseMapper.updateVinNo(vinNo,remarks,sid);
+        baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
+        return rb.success();
+    }
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java
@ -133,6 +133,13 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
        return busVehicleApplyService.assignTask(query);
    }

+    @Override
+    public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleApply busVehicleApply = busVehicleApplyService.selectByCode(pcApplicationCode);
+        return rb.success().setData(busVehicleApply);
+    }
+
 /*    @Override
    public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
        return busVehicleApplyService.shareBusVehicleApply(shareQuery);
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
@ -48,6 +49,8 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
@ -65,6 +68,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDeta
 import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders;
 import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
 import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesreturnorders.BusSalesReturnOrdersService;
@ -77,6 +81,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@ -167,6 +172,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
    @Autowired
    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;

+    @Autowired
+    private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
    @Autowired
    private BaseVehicleOutFeign baseVehicleOutFeign;

@ -739,6 +746,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                        dtoList.add(baseVehicleStateDto);
                    });
                    ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    //退车后修改金蝶客户信息
+                    updateFinCustomerInfo(vehicleList);
                }
                //判断销售订单是否全部退车
                List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid);
@ -759,9 +768,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                        BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
                        salesOrder.setNodeState("作废");
                        busSalesOrderService.updateById(salesOrder);
-                        if(!stringList.isEmpty()){
+                        if (!stringList.isEmpty()) {
                            for (int j = 0; j < stringList.size(); j++) {
-                                if(StringUtils.isNotBlank(stringList.get(j))){
+                                if (StringUtils.isNotBlank(stringList.get(j))) {
                                    baseMapper.updateByBorrowSid(stringList.get(j));
                                }
                            }
@ -788,6 +797,44 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa

    }

+    public void updateFinCustomerInfo(List<BusSalesOrderVehicle> vehicleList) {
+        for (BusSalesOrderVehicle v : vehicleList) {
+            BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(v.getSalesOrderSid());
+            if (null != salesOrder) {
+                if (salesOrder.getPayTypeKey().equals("2")) {
+                    //判断财务系统是否有客户
+                    Boolean aBoolean = finKingDeeFeign.customerExistState(v.getTemporaryNo()).getData();
+                    String linkNo = "";
+                    BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerService.fetchDetailsVoBySid(v.getBorrowerSid());
+                    if (aBoolean) {
+                        List<BdCustomer> bdCustomers = new ArrayList<>();
+                        BdCustomer bdCustomer = new BdCustomer();
+                        if (StringUtils.isNotBlank(v.getLinkNo())) {
+                            String vinNo = v.getLinkNo();
+                            if (vinNo.length() > 8) {
+                                linkNo = vinNo.substring(vinNo.length() - 8);
+                            } else {
+                                linkNo = v.getLinkNo();
+                            }
+                            if (null != borrowerDetailsVo) {
+                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo + "T");
+                            }
+                        } else {
+                            if (null != borrowerDetailsVo) {
+                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + v.getTemporaryNo() + "T");
+                            }
+                        }
+                        bdCustomer.setFShortName(salesOrder.getContractNo());
+                        bdCustomer.setFNumber(v.getTemporaryNo());
+                        bdCustomer.setOldFNumber(v.getTemporaryNo());
+                        bdCustomers.add(bdCustomer);
+                        finKingDeeFeign.saveBdCustomers(bdCustomers);
+                    }
+                }
+            }
+        }
+    }
+
    /**
     * 获取上一环节
     *
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
@ -858,6 +858,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
        } else {
            BeanUtil.copyProperties(loanHomevisitInvestigateTransportDetailsVo, loanHomevisitInvestigateTransportDto);
        }
+        loanHomevisitInvestigateTransportDto.setTransportRoute(dto.getTransportRoute());
        loanHomevisitInvestigateTransportDto.setTransportTypeKey(dto.getTransportKey());
        loanHomevisitInvestigateTransportDto.setTransportTypeValue(dto.getTransportType());
        loanHomevisitInvestigateTransportDto.setTransportGoodsTrip(dto.getTransportGoodsGoTo());
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
@ -553,7 +553,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
        }
        //合并pdf文件
        if (filesList.size() > 0) {
-            String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + ".pdf";
+            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+            long seconds = System.currentTimeMillis();
+            String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + "_" + dateStr + seconds + ".pdf";
            try {
                File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
            } catch (Exception e) {
@ -1246,11 +1248,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
        } else {
            map.put("pj", "□");
        }
-        //融资金额
-        map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
        List<String> urls = new ArrayList<>();
        if (conSetUpKey.equals("001")) {
            for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
+                //融资金额
+                map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
                //保证金款项
                map.put("bondAmounts", solutionsDetailsVo.getBondAmounts());
                //车辆落户保证金
@ -1298,6 +1300,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                urls.add(pdfName);
            }
        } else if (conSetUpKey.equals("002")) {
+            //融资金额
+            map.put("downPayMoney", new BigDecimal(solutionsDetailsVo.getLoanAmountTotal()).multiply(new BigDecimal(salesOrderVehicles.size())));
            //保证金款项
            map.put("bondAmounts", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size())));
            //车辆落户保证金
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
@ -108,6 +108,9 @@ public class ScmApplyInboundVo implements Vo {
    private BigDecimal costPrice;
    @ApiModelProperty("内部编码")
    private String insideCode;
+
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
    
 	@ApiModelProperty("厂家发车日期")
    private String departureDate;
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@ -20,6 +21,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
@ -30,6 +32,7 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -132,8 +135,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
    @Autowired
    private BasePurchaseSystemFeign basePurchaseSystemFeign;
    @Autowired
-    private ScmApplyInboundQueryService scmApplyInboundQueryService;
-    @Autowired
    private BaseVehmodelConfigFeign baseVehmodelConfigFeign;

    public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
@ -262,9 +263,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                    vinNo = vinNo.trim();
                    vinNo = vinNo.replace(" ", "");
                    if (vinNo.length() != 17) {
-                        if (vinNo.length() != 8) {
-                            return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
-                        }
+                        return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
                    }
                }
            }
@ -363,6 +362,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
        }
        vo.setVehicleList(list);
        vo.setScmFiles(scmFileVos);
+        BusVehicleApply busVehicleApply = busVehicleApplyFeign.getBillNo(scmApplyInbound.getPcApplicationCode()).getData();
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busVehicleApply.getOrgDeptSid()).getData();
+        vo.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
        return vo;
    }

@ -1027,7 +1029,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
            return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
        }
        List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        if (StringUtils.isBlank(dto.getOrgPriceDate())){
+        if (StringUtils.isBlank(dto.getOrgPriceDate())) {
            return new ResultBean().fail().setMsg("公司入库日期不能为空");
        }
        /*int vinCount = 0;
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@ -5,7 +5,7 @@
        <div>{{ viewTitle }}</div>
        <div>
          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
-            <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">确认</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">确认</el-button>
          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
        </div>
      </div>
@ -32,11 +32,15 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
              <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne" style="width: 75% !important;"/></el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>采购系统</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>内部编码</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
            </el-col>
@ -290,6 +294,7 @@ export default {
        policyTwoo: '', // 政策2
        priceDate: '',
        purchaseOrderNo: '',
+        purchaseSystemName: '',
        remarks: '',
        secondaryFreight: '',
        userSid: '',
@ -726,8 +731,8 @@ export default {
      }
    },
    changeVinNo(val) {
-      if (val.length < 17 && val.length !== 8) {
-        const message = '车架号的长度应为8位或17位'
+      if (val.length < 17) {
+        const message = '车架号的长度应为17位'
        this.$message({ showClose: true, type: 'error', message: message })
      }
    },
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
@ -30,11 +30,15 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth">采购系统</div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>内部编码</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
            </el-col>
@ -287,6 +291,7 @@ export default {
        policyTwoo: '',
        priceDate: '',
        purchaseOrderNo: '',
+        purchaseSystemName: '',
        remarks: '',
        secondaryFreight: '',
        userSid: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
@ -32,11 +32,15 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth">采购系统</div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>内部编码</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
            </el-col>
@ -322,6 +326,7 @@ export default {
        policyTwoo: '',
        priceDate: '',
        purchaseOrderNo: '',
+        purchaseSystemName: '',
        remarks: '',
        secondaryFreight: '',
        userSid: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@ -31,11 +31,15 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
              <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>采购系统</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>内部编码</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
            </el-col>
@ -233,7 +237,6 @@
 <script>
 import req from '@/api/ruzhang/scmapplyinbound'
 import upload_picture from '@/components/uploadFile/upload_picture'
-import { getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
 export default {
  name: 'ruzhangEdit',
  components: {
@ -289,6 +292,7 @@ export default {
        policyTwoo: '',
        priceDate: '',
        purchaseOrderNo: '',
+        purchaseSystemName: '',
        remarks: '',
        secondaryFreight: '',
        userSid: '',
@ -724,8 +728,8 @@ export default {
      }
    },
    changeVinNo(val) {
-      if (val.length < 17 && val.length !== 8) {
-        const message = '车架号的长度应为8位或17位'
+      if (val.length < 17) {
+        const message = '车架号的长度应为17位'
        this.$message({ showClose: true, type: 'error', message: message })
      }
    },
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
@ -30,11 +30,15 @@
            </el-col>
          </el-row>
          <el-row>
-            <el-col :span="12">
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth">采购系统</div>
+              <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
              <div class="span-sty spanOneWidth"><span>内部编码</span></div>
              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
            </el-col>
@ -287,6 +291,7 @@ export default {
        policyTwoo: '',
        priceDate: '',
        purchaseOrderNo: '',
+        purchaseSystemName: '',
        remarks: '',
        secondaryFreight: '',
        userSid: '',