问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehinstall;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-base(上装配置管理) <br/>
  * File: BaseVehinstallFeign.java <br/>
@@ -80,4 +78,9 @@ public interface BaseVehinstallFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("获取车辆的上装信息")
+    @GetMapping("/selectOne")
+    @ResponseBody
+    ResultBean<BaseVehinstall> selectOne(@RequestParam("vinNo")String vinNo,@RequestParam("useOrgSid")String useOrgSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -74,4 +74,9 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehinstall/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.busvehicleorder;
 
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -133,4 +134,9 @@ public interface BusVehicleOrderFeign {
     @ResponseBody
     ResultBean<BasePurchSystemVo> getDetailsOrder(@RequestParam("sid")String sid);
 
+    @ApiOperation("根据采购订单查询排产的上装信息")
+    @GetMapping("/selectApplySz")
+    @ResponseBody
+    ResultBean<BusVehicleApplySz> selectApplySz(@RequestParam("sid")String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.busvehicleorder;
 
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -128,5 +129,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BusVehicleApplySz> selectApplySz(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -68,4 +68,6 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 
 	@Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
     BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
+
+    BaseVehinstall seletByVinAndUseOrg(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -35,4 +35,8 @@
 	<select id="selectByOrgSidAndVin" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
 		select * from base_vehinstall where useOrgSid = #{useOrgSid} and vinNo = #{vinNo}
     </select>
+
+	<select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
+		select * from base_vehinstall where vinNo = #{vinNo} and useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -28,12 +28,10 @@ package com.yxt.anrui.base.biz.basevehinstall;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
-import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
-import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
@@ -48,17 +46,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
-
-import javax.annotation.Resource;
 
 /**
  * Project: anrui-base(上装配置管理) <br/>
@@ -200,4 +191,9 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 		BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
+		return baseVehinstallService.selectOne(vinNo,useOrgSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -217,4 +217,10 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 	public BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(String vinNo, String createOrgSid) {
 		return baseMapper.fetchByVinNoAndOrgSid(vinNo,createOrgSid);
 	}
+
+	public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
+		ResultBean<BaseVehinstall> rb = ResultBean.fireFail();
+		BaseVehinstall baseVehinstall = baseMapper.seletByVinAndUseOrg(vinNo,useOrgSid);
+		return rb.success().setData(baseVehinstall);
+	}
 }

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

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -124,4 +125,6 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
     BasePurchSystemVo getDetails(@Param("createOrgSid") String createOrgSid,@Param("deptSid") String deptSid);
 
     BusVehicleApply selectApply(String sid);
+
+    BusVehicleApplySz selectApplySz(String sid);
 }

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

@@ -224,4 +224,11 @@
         select ba.sid,ba.orgDeptSid,ba.createOrgSid from bus_vehicle_apply ba
         left join bus_vehicle_order bo on bo.purchaseRequisitionSid = ba.sid where bo.sid = #{sid}
     </select>
+
+    <select id="selectApplySz" resultType="com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz">
+        select bs.* from bus_vehicle_apply_sz bs
+        left join bus_vehicle_apply_detail bd on bd.sid = bs.detailsSid
+        left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+        where bo.sid = #{sid}
+    </select>
 </mapper>

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

@@ -28,6 +28,7 @@ package com.yxt.anrui.base.biz.busvehicleorder;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
 import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
@@ -203,17 +204,6 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
     public ResultBean<ActualAndOrgDeptVo> getActualAndOrgDept(String vehicleOrderSid, String modelSid, String configSid) {
         ResultBean<ActualAndOrgDeptVo> rb = ResultBean.fireFail();
         ActualAndOrgDeptVo vo = busVehicleApplyService.getActualAndOrgDept(vehicleOrderSid,modelSid,configSid);
-//        BusVehicleOrderVo vo = busVehicleOrderService.selectBySid(vehicleOrderSid);
-//        if (vo == null) {
-//            return rb;
-//        }
-//        BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.fetchAllBySid(vo.getPurchaseRequisitionSid());
-//        BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(vo.getPurchaseApplyMediumModelSid());
-//        ActualAndOrgDeptVo actualAndOrgDeptDto = new ActualAndOrgDeptVo();
-//        actualAndOrgDeptDto.setOrgDeptSid(busVehicleApplyDetailsVo.getOrgDeptSid());
-//        actualAndOrgDeptDto.setOrgDeptName(busVehicleApplyDetailsVo.getOrgDeptName());
-//        actualAndOrgDeptDto.setActualPay(busVehicleApplyDetail.getActualPay());
-//        actualAndOrgDeptDto.setActualSid(busVehicleApplyDetail.getActualSid());
         return rb.success().setData(vo);
     }
 
@@ -232,4 +222,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return busVehicleOrderService.getDetailsOrder(sid);
     }
 
+    @Override
+    public ResultBean<BusVehicleApplySz> selectApplySz(String sid) {
+        return busVehicleOrderService.selectApplySz(sid);
+    }
+
 }

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfoSpanSize;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
@@ -561,4 +562,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         vo.setPurchaseSystemName(busVehicleApply.getOrgDeptName());
         return rb.success().setData(vo);
     }
+
+    public ResultBean<BusVehicleApplySz> selectApplySz(String sid) {
+        ResultBean<BusVehicleApplySz> rb = ResultBean.fireFail();
+        BusVehicleApplySz busVehicleApplySz = baseMapper.selectApplySz(sid);
+        return rb.success().setData(busVehicleApplySz);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1716,7 +1716,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         //颜色
         if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) {
-            modelAllName2.append(baseModelConfig.getCarColor()).append("驾驶室");
+            modelAllName2.append("/").append(baseModelConfig.getCarColor()).append("驾驶室");
         }
         //导流罩
         if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) {
@@ -1749,6 +1749,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) {
             modelAllName2.append("、").append(baseModelConfig.getMultimedia());
         }
+        //特殊配置说明
+        if(StringUtils.isNotBlank(appOrderModelInfoVo.getSpecialInstructions())){
+            modelAllName2.append("、").append("特殊配置说明:"+appOrderModelInfoVo.getSpecialInstructions());
+
+        }
         modelAllName2.append("。");
         String modelConfig = "配置：" +modelAllName.toString() + "。";
         //上装：外廓尺寸+颜色+上装名称、板材厚度、板材材质、篷布滑道、冷藏冷机、自卸液压盖板、底板加热、更多配置

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@@ -784,7 +784,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${customerName!}   </w:t>
+                    <w:t> ${customerName!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -803,7 +803,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${mobile!}  </w:t>
+                    <w:t> ${mobile!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -822,7 +822,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>  ${idNo!}                </w:t>
+                    <w:t> ${idNo!}  </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl

@@ -784,7 +784,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${customerName!}   </w:t>
+                    <w:t> ${customerName!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -803,7 +803,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${mobile!}  </w:t>
+                    <w:t> ${mobile!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -822,7 +822,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>  ${idNo!}                </w:t>
+                    <w:t> ${idNo!} </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl

@@ -645,7 +645,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>我与你公司签署了《车辆买卖合同》（编号为</w:t>
+                    <w:t>我与你公司签署了《新车买卖合同》（编号为</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -664,7 +664,7 @@
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
                     </w:rPr>
-                    <w:t>），现我申请将车辆发票按照下列金额开具发票，我自行承担相应的法律后果。我承诺按照《车辆买卖合同》约定的价格支付车辆价款。</w:t>
+                    <w:t>），现我申请将车辆发票按照下列金额开具发票，我自行承担相应的法律后果。我承诺按照《新车买卖合同》约定的价格支付车辆价款。</w:t>
                 </w:r>
             </w:p>
             <w:tbl>

anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

@@ -900,7 +900,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${customerName!}   </w:t>
+                    <w:t> ${customerName!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -919,7 +919,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${mobile!}  </w:t>
+                    <w:t> ${mobile!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -938,7 +938,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>  ${idNo!}                </w:t>
+                    <w:t> ${idNo!} </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl

@@ -900,7 +900,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>    ${customerName!}    </w:t>
+                    <w:t> ${customerName!} </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -938,7 +938,7 @@
                         <w:sz-cs w:val="20"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>  ${idNo!}                </w:t>
+                    <w:t> ${idNo!} </w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSaleOrderVehicleOutVo.java

@@ -54,5 +54,7 @@ public class BusSaleOrderVehicleOutVo implements Vo {
     private String name;
     @ApiModelProperty("内部引荐人用户sid")
     private String userSid;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java

@@ -78,4 +78,7 @@ public class AppBusSaleOrderStateVo implements Vo {
     @ApiModelProperty("是否有上装按钮")
     private boolean topState;
 
+    @ApiModelProperty("上装的采购类型是否允许修改")
+    private boolean isMain;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java

@@ -107,5 +107,7 @@ public class BusSalesOrderMakeup extends BaseEntity {
 
     private String buyTypeKey;
     private String buyTypeValue;
+    @ApiModelProperty("0主车带，1不是主车带")
+    private int isMain;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java

@@ -74,4 +74,6 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
     private String contractPath;
     private String remarks;
 
+    private int isMain;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1318,11 +1318,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (busSalesOrderMakeupDetailsVo != null) {
                         vo.setTopInfoState(1);
                         vo.setTopName(busSalesOrderMakeupDetailsVo.getTopName());
+                        if(busSalesOrderMakeupDetailsVo.getIsMain() == 0){//主车带上装
+                            vo.setMain(false);
+                        }else{
+                            vo.setMain(true);
+                        }
                     }
                 }
             } else {
                 vo.setTopInfoState(0);
                 vo.setTopName("无");
+                vo.setMain(true);
             }
             //挂车状态
             vo.setTrailerInfoState(0);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -22,7 +22,8 @@
                topPrice,
                moreConfig,
                contractPath,
-               remarks
+               remarks,
+               isMain
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -110,20 +110,27 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据信息不存在");
         }
-       /* Boolean topInfoState = dto.getTopInfoState();
-        String state = "0";
-        if (topInfoState) {
-            state = "1";
-        }*/
         String state = "1";
         busSalesOrderService.updateIsTop(salesOrderSid, state);
         BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = baseMapper.details(salesOrderSid);
         if (busSalesOrderMakeupDetailsVo != null) {
             baseMapper.deleteBySalesOrderSid(salesOrderSid);
         }
+        int isMain = 1;
+        if(busSalesOrderMakeupDetailsVo != null){
+            if("0".equals(busSalesOrderMakeupDetailsVo.getIsMain())){
+                isMain = 0;
+            }
+        }
+
         if ("1".equals(state)) {
             BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
             BeanUtil.copyProperties(dto, busSalesOrderMakeup, "sid");
+            busSalesOrderMakeup.setIsMain(isMain);
+            if("02".equals(busSalesOrderMakeup.getBuyTypeKey())){
+                //如果为客户自购，将上装价格设置为0
+                busSalesOrderMakeup.setTopPrice(BigDecimal.ZERO);
+            }
             if (!dto.getContractImages().isEmpty()) {
                 List<String> imgList = new ArrayList<>();
                 dto.getContractImages().stream().forEach(i -> {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -28,8 +28,12 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
+import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
@@ -103,6 +107,10 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BusDepositFictitiousService busDepositFictitiousService;
     @Autowired
     private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
+    @Autowired
+    private BaseVehinstallFeign baseVehinstallFeign;
+    @Autowired
+    private BusVehicleOrderFeign busVehicleOrderFeign;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -232,6 +240,17 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     String topSid = topSidList.get(0);
                     String topSidVin = "";
                     if ("0".equals(dto.getState())) {//现车
+                        String topPrice = "";
+                        for (int i = 0; i < nowCarList1.size(); i++) {
+                            AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList1.get(i);
+                            if(StringUtils.isNotBlank(appBusSalesOrderVehicleDto.getTopSid())){
+                                //根据车架号和上装配置以及分公司sid查询上装价格
+                                BaseVehinstall baseVehinstall = baseVehinstallFeign.selectOne(appBusSalesOrderVehicleDto.getLinkNo(),busSalesOrder.getUseOrgSid()).getData();
+                                if(baseVehinstall != null){
+                                    topPrice = baseVehinstall.getGuidePrice();
+                                }
+                            }
+                        }
                         //判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条
                         List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
                         nowCarList.removeAll(Collections.singleton(null));
@@ -267,6 +286,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                                     busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                                     //上装价格
+                                    if(StringUtils.isNotBlank(topPrice)){
+                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                                    }
                                     //更多配置
                                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                                     //颜色
@@ -282,6 +304,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                                     busSalesOrderMakeup.setBuyTypeKey("01");
                                     busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                                    busSalesOrderMakeup.setIsMain(0);
                                     busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                                     busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                                 } else {
@@ -311,6 +334,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                         busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                                         busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                                         //上装价格
+                                        if(StringUtils.isNotBlank(topPrice)){
+                                            busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                                        }
                                         //更多配置
                                         busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                                         //颜色
@@ -326,11 +352,11 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                         busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                                         busSalesOrderMakeup.setBuyTypeKey("01");
                                         busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                                        busSalesOrderMakeup.setIsMain(0);
                                         busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                                         busSalesOrderService.updateMakeUp(salesOrderSid, "1");
 
                                     }
-
                                 }
                             } else {
                                 if (StringUtils.isNotBlank(topSid)) {
@@ -359,6 +385,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                                     busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                                     //上装价格
+                                    if(StringUtils.isNotBlank(topPrice)){
+                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                                    }
                                     //更多配置
                                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                                     //颜色
@@ -374,6 +403,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                                     busSalesOrderMakeup.setBuyTypeKey("01");
                                     busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                                    busSalesOrderMakeup.setIsMain(0);
                                     busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                                     busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                                 }
@@ -404,6 +434,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                             busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                             //上装价格
+                            if(StringUtils.isNotBlank(topPrice)){
+                                busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                            }
                             //更多配置
                             busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                             //颜色
@@ -419,6 +452,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                             busSalesOrderMakeup.setBuyTypeKey("01");
                             busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                            busSalesOrderMakeup.setIsMain(0);
                             busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                             busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                         }
@@ -426,6 +460,15 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     if ("1".equals(dto.getState())) {//采购订单
                         List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
                         appReadyCarList.removeAll(Collections.singleton(null));
+                        String topPrice = "";
+                        for (int i = 0; i <readyCarList1.size(); i++) {
+                            //根据采购订单查询上装的配置
+                            AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList1.get(i);
+                            BusVehicleApplySz busVehicleApplySz = busVehicleOrderFeign.selectApplySz(appBusSalesVehicleOrderDto.getLinkSid()).getData();
+                            if(busVehicleApplySz != null){
+                                topPrice = busVehicleApplySz.getGuidePrice();
+                            }
+                        }
                         if (!appReadyCarList.isEmpty()) {
                             List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
                             if (stringList.size() > 0) {
@@ -458,6 +501,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                                     busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                                     //上装价格
+                                    if(StringUtils.isNotBlank(topPrice)){
+                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                                    }
                                     //更多配置
                                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                                     //颜色
@@ -473,6 +519,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                                     busSalesOrderMakeup.setBuyTypeKey("01");
                                     busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                                    busSalesOrderMakeup.setIsMain(0);
                                     busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                                     busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                                 }
@@ -503,6 +550,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                                     busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                                     //上装价格
+                                    if(StringUtils.isNotBlank(topPrice)){
+                                        busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                                    }
                                     //更多配置
                                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                                     //颜色
@@ -518,6 +568,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                                     busSalesOrderMakeup.setBuyTypeKey("01");
                                     busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                                    busSalesOrderMakeup.setIsMain(0);
                                     busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                                     busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                                 }
@@ -548,6 +599,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
                             busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                             //上装价格
+                            if(StringUtils.isNotBlank(topPrice)){
+                                busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
+                            }
                             //更多配置
                             busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
                             //颜色
@@ -563,12 +617,11 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
                             busSalesOrderMakeup.setBuyTypeKey("01");
                             busSalesOrderMakeup.setBuyTypeValue("公司采购");
+                            busSalesOrderMakeup.setIsMain(0);
                             busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                             busSalesOrderService.updateMakeUp(salesOrderSid, "1");
                         }
                     }
-
-
                 } else {
                     //删除上装信息
                     busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -53,6 +53,6 @@
                DATE_FORMAT(createTime, '%Y-%m-%d') AS `date`,
                reason                              as  surplusNumberRemarks
         FROM scm_veh_inventoryreport
-        WHERE mainSid = #{sid}
+        WHERE mainSid = #{sid} limit 1
     </select>
 </mapper>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -82,4 +83,7 @@ public class OrderStateVo implements Vo {
 
     @ApiModelProperty("是否有上装")
     private boolean topState;
+    @ApiModelProperty("上装的采购类型是否允许修改")
+    @JsonProperty("isMain")
+    private boolean isMain;
 }