Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/AnnouncementVo.java

@@ -12,10 +12,28 @@ import lombok.Data;
 @Data
 public class AnnouncementVo implements Vo {
     private static final long serialVersionUID = -347631276593210436L;
-    @ApiModelProperty("公告型号sid")
+    @ApiModelProperty("公告型号配置sid")
     private String sid;
-    @ApiModelProperty("公告型号sid")
+    @ApiModelProperty("公告型号配置sid")
     private String dictKey;
     @ApiModelProperty("公告型号名称")
     private String dictValue;
+
+    @ApiModelProperty("公告型号配置拼接")
+    private String extra;
+
+    @ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass;
+    @ApiModelProperty("整备质量（Kg）")
+    private String preparationMass;
+    @ApiModelProperty("整车外观尺寸")
+    private String vehAppeSize;
+    @ApiModelProperty("货箱内部尺寸")
+    private String boxInsideSize;
+    @ApiModelProperty("额定载质量（Kg）")
+    private String ratedLoadQuality;
+    @ApiModelProperty("货厢底板到仓栅顶部高（mm）")
+    private String boxFloorReaGraTopHigh;
+    @ApiModelProperty("车辆名称value")
+    private String vehNameValue;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeign.java

@@ -84,5 +84,5 @@ public interface BaseVehmodelAnnouncementmodelFeign {
     @ApiOperation("销售订单-app查询合格证公告型号")
     @GetMapping("/getAnnounceList")
     @ResponseBody
-    ResultBean<List<AnnouncementVo>> getAnnounceList(@RequestParam("modelSid")String modelSid);
+    ResultBean<List<AnnouncementVo>> getAnnounceList(@RequestParam("modelSid")String modelSid,@RequestParam("orgPath")String orgPath);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelFeignFallback.java

@@ -76,7 +76,7 @@ public class BaseVehmodelAnnouncementmodelFeignFallback implements BaseVehmodelA
 	}
 
 	@Override
-	public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid) {
+	public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid,String orgPath) {
 		return null;
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.java

@@ -68,5 +68,5 @@ public interface BaseVehmodelAnnouncementmodelMapper extends BaseMapper<BaseVehm
     @Select("select * from base_vehmodel_announcementmodel")
     List<BaseVehmodelAnnouncementmodelVo> selectListVo();
 
-    List<AnnouncementVo> getAnnounceList(String modelSid);
+    List<AnnouncementVo> getAnnounceList(@Param("modelSid") String modelSid,@Param("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelMapper.xml

@@ -58,14 +58,16 @@
     <select id="getAnnounceList" resultType="com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo">
         SELECT
             ba.`announcementmodelName` as dictValue,
-            ba.sid as dictKey,
-            ba.sid
+            bap.sid as dictKey,
+            bap.sid,
+            bap.*,
+            ba.vehNameValue
         FROM
             base_vehmodel_announcementmodel bva
                 LEFT JOIN base_announcementmodel ba
                           ON bva.`announcementmodelSid` = ba.`sid`
                 LEFT JOIN base_announcementmodel_param bap
                           ON bva.`announcementmodelParamSid` = bap.`sid`
-        where bva.vehModelSid = #{modelSid}
+        where bva.vehModelSid = #{modelSid} and bva.useOrgSid = #{useOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelRest.java

@@ -99,7 +99,7 @@ public class BaseVehmodelAnnouncementmodelRest implements BaseVehmodelAnnounceme
 	}
 
 	@Override
-	public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid) {
-		return baseVehmodelAnnouncementmodelService.getAnnounceList(modelSid);
+	public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid,String orgPath) {
+		return baseVehmodelAnnouncementmodelService.getAnnounceList(modelSid,orgPath);
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelannouncementmodel/BaseVehmodelAnnouncementmodelService.java

@@ -29,14 +29,17 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.*;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -54,6 +57,11 @@ import java.util.List;
  */
 @Service
 public class BaseVehmodelAnnouncementmodelService extends MybatisBaseService<BaseVehmodelAnnouncementmodelMapper, BaseVehmodelAnnouncementmodel> {
+
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+
     private QueryWrapper<BaseVehmodelAnnouncementmodel> createQueryWrapper(BaseVehmodelAnnouncementmodelQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -126,9 +134,51 @@ public class BaseVehmodelAnnouncementmodelService extends MybatisBaseService<Bas
     }
 
 
-    public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid) {
+    public ResultBean<List<AnnouncementVo>> getAnnounceList(String modelSid,String orgPath) {
         ResultBean<List<AnnouncementVo>> rb = ResultBean.fireFail();
-        List<AnnouncementVo> list = baseMapper.getAnnounceList(modelSid);
+        //根据orgPath获取分公司sid
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<AnnouncementVo> list = baseMapper.getAnnounceList(modelSid,useOrgSid);
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            for (int i = 0; i < list.size(); i++) {
+                StringBuilder extra = new StringBuilder();
+                AnnouncementVo announcementVo = list.get(i);
+                //车辆名称
+                if(StringUtils.isNotBlank(announcementVo.getVehNameValue())){
+                    extra.append(announcementVo.getVehNameValue()).append("、");
+                }
+                //整车外观尺寸
+                if(StringUtils.isNotBlank(announcementVo.getVehAppeSize())){
+                    extra.append("整车外观尺寸").append(announcementVo.getVehAppeSize()).append("mm").append("、");
+                }
+                //货箱内部尺寸
+                if(StringUtils.isNotBlank(announcementVo.getBoxInsideSize())){
+                    extra.append("货箱内部尺寸").append(announcementVo.getBoxInsideSize()).append("mm").append("、");
+                }
+                //货厢底板到仓栅顶部高
+                if(StringUtils.isNotBlank(announcementVo.getBoxFloorReaGraTopHigh())){
+                    extra.append("货厢底板到仓栅顶部高").append(announcementVo.getBoxFloorReaGraTopHigh()).append("mm").append("、");
+                }
+                //准牵引总质量
+                if(StringUtils.isNotBlank(announcementVo.getAccTowTotalMass())){
+                    extra.append("准牵引总质量").append(announcementVo.getAccTowTotalMass()).append("Kg").append("、");
+                }
+                //整备质量
+                if(StringUtils.isNotBlank(announcementVo.getPreparationMass())){
+                    extra.append("整备质量").append(announcementVo.getPreparationMass()).append("Kg").append("、");
+                }
+                //额定载质量
+                if(StringUtils.isNotBlank(announcementVo.getRatedLoadQuality())){
+                    extra.append("额定载质量").append(announcementVo.getRatedLoadQuality()).append("Kg");
+                }
+                //如果extra最后一个包含、则截取extra.substring(extra.length()-1)
+                if("、".equals(extra.toString().substring(extra.length()-1))){
+                    extra.delete(extra.length()-1, extra.length());
+                }
+                announcementVo.setExtra(extra.toString());
+            }
+        }
         return rb.success().setData(list);
     }
 }

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

@@ -781,6 +781,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             }
         } else {
+            map.put("dayOne",appOrderDetailsVo.getDepositInfo().getPayDepositDays());
             //获取模板
             ftl = "orderacar";
             remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
@@ -824,6 +825,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
             }
         } else {
+            map.put("dayOne",appOrderDetailsVo.getDepositInfo().getPayDepositDays());
             //获取模板
             ftl = "orderacar";
             remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。";
@@ -872,6 +874,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     remarks = "数量" + num + "台，单台成交价：        元。";
                 }
             } else {
+                map.put("dayOne","");
                 // 订车获取模板
                 ftl = "orderacar_black";
                 remarks = "数量" + num + "台，单台成交价：        元。";
@@ -921,6 +924,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     remarks = "数量" + num + "台，单台成交价：        元。";
                 }
             } else {
+                map.put("dayOne","");
                 // 订车获取模板
                 ftl = "orderacar_black";
                 remarks = "数量" + num + "台，单台成交价：        元。";
@@ -1275,8 +1279,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     public ResultBean<CommonContractVo> fetchAllBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         CommonContract commonContract = fetchBySid(sid);
+        if(commonContract == null){
+            return rb.setMsg("该合同不存在");
+        }
         CommonContractVo commonContractVo = new CommonContractVo();
         BeanUtil.copyProperties(commonContract, commonContractVo);
+        commonContractVo.setCreateDate(DateUtil.format(commonContract.getCreateDate(),"yyyy-MM-dd"));
         String sceneSignUrl = commonContract.getSceneSignUrl();
         String appdixUrl = commonContract.getAppdixUrl();
         String path = "";
@@ -1754,7 +1762,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
             String topName = appOrderDetailsVo.getTopMessage();
-            topName = "上装：" + topName + "。";
+            topName = "上装：制造尺寸与公告一致、" + topName + "。";
             //只有为公司采购时才显示
             if("01".equals(topInfo.getBuyTypeKey())){
                 map.put("topName", topName);
@@ -1849,8 +1857,23 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         map.put("totalPrice", totalPrice);
         map.put("priceRemarks", priceRemarks);
-        map.put("depositTotal", depositTotal);
+        if("0".equals(depositTotal)){
+            map.put("depositTotal", "/");
+        }else{
+            map.put("depositTotal", depositTotal);
+        }
         map.put("address", address);
+        //查询是否有公告型号
+        String publics = "公告型号：";
+        String publicModel = appOrderModelInfoVo.getPublicModel();
+        String publicModelSon = appOrderModelInfoVo.getPublicModelSon();
+        if(StringUtils.isNotBlank(publicModel)){
+            publics = publics+publicModel;
+            map.put("publicModel",publics+"。");
+            if(StringUtils.isNotBlank(publicModelSon)){
+                map.put("publicModel",publics+"、"+publicModelSon+"。");
+            }
+        }
         //生成合同编号
         String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
         map.put("contractNo", contractNo);
@@ -1864,7 +1887,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
             if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
-               /* Future<String> future1 = pool.submit(() -> {
+                /*Future<String> future1 = pool.submit(() -> {
                     return genCarSaleContract(dto, map, appOrderDetailsVo);
                 });
                 Future<String> future1_2 = pool.submit(() -> {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppBusSaleOrderInitModelInfoQuery.java

@@ -32,6 +32,8 @@ public class AppBusSaleOrderInitModelInfoQuery implements Query {
     private String publicModelSid;
     @ApiModelProperty("公告型号")
     private String publicModel;
+    @ApiModelProperty("公告型号配置")
+    private String publicModelSon;
 
     private String saleOrderSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppOrderInfoVo.java

@@ -46,4 +46,7 @@ public class AppOrderInfoVo implements Vo {
     @ApiModelProperty("公告型号")
     private String publicModel;
 
+    @ApiModelProperty("公告型号配置")
+    private String publicModelSon;
+
 }

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

@@ -34,4 +34,6 @@ public class AppOrderDepositInfoVo implements Vo {
     private String makeUpDeposit;
     @ApiModelProperty("所有订金结转上传的委托书")
     private List<String> images;
+
+    private String payDepositDays;
 }

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

@@ -47,4 +47,6 @@ public class AppOrderModelInfoVo implements Vo {
     private String publicModel;
 
     private List<VinListsVo> vinListsVos = new ArrayList<>();
+    @ApiModelProperty("公告型号配置")
+    public String publicModelSon;
 }

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

@@ -32,5 +32,7 @@ public class AppOrderPriceInfoVo implements Vo {
     private String singleFinalPrice;
     //单车折让
     private String singleCarDiscountPrice;
+    @ApiModelProperty("xx日期限内")
+    private String payDepositDays;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDeposit.java

@@ -65,4 +65,7 @@ public class BusSalesOrderDeposit extends BaseEntity {
 	@ApiModelProperty("需补交订金")
     private BigDecimal makeUpDeposit;
 
+    @ApiModelProperty("合同签订后x日内交清")
+    private String payDepositDays;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositDto.java

@@ -29,4 +29,7 @@ public class AppBusSalesOrderDepositDto implements Dto {
     private String makeUpDeposit;
 
     private List<AppBusSalesOrderDepositListDto> virtualOrderList;
+
+    @ApiModelProperty("合同签订后x日内交清")
+    private String payDepositDays;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java

@@ -32,4 +32,12 @@ public class AppBusSalesOrderDepositVo implements Vo {
     private String deposit;
 
     private List<AppBusSalesOrderDepositListVo> virtualOrderList = new ArrayList<>();
+
+
+    @ApiModelProperty("合同签订后x日内交清")
+    private String payDepositDays;
+    @ApiModelProperty("拼接字段：xx天内")
+    private String payDepositDaysValue;
+    @ApiModelProperty("是否支持期限的功能：true是支持，false不支持")
+    private boolean supportPayDepositDays;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java

@@ -75,7 +75,10 @@ public class BusSalesOrderModel extends BaseEntity {
     private BigDecimal finalPrice;
     @ApiModelProperty("公告型号")
     private String publicModel;
-    @ApiModelProperty("公告型号sid")
+    @ApiModelProperty("公告型号配置sid")
     private String publicModelSid;
 
+    @ApiModelProperty("公告型号配置")
+    private String publicModelSon;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppOrderInfoDto.java

@@ -37,4 +37,7 @@ public class AppOrderInfoDto implements Dto {
     private String publicModel;
     @ApiModelProperty("公告型号sid")
     private String publicModelSid;
+
+    @ApiModelProperty("公告型号配置")
+    private String publicModelSon;
 }

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

@@ -2031,8 +2031,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
 
         }
-       /* orderInfo.setPublicModel(appBusSaleOrderInitModelInfoQuery.getPublicModel());
-        orderInfo.setPublicModelSid(appBusSaleOrderInitModelInfoQuery.getPublicModelSid());*/
+        //公告型号
+        orderInfo.setPublicModel(appBusSaleOrderInitModelInfoQuery.getPublicModel());
+        //公告型号子表sid
+        orderInfo.setPublicModelSid(appBusSaleOrderInitModelInfoQuery.getPublicModelSid());
+        //公告型号子表配置
+        orderInfo.setPublicModelSon(appBusSaleOrderInitModelInfoQuery.getPublicModelSon());
 
 
         vo.setOrderInfo(orderInfo);
@@ -2842,7 +2846,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
             String topMessage = "";
             //外廓尺寸
-            String sizeMessage = "";
+           /* String sizeMessage = "";
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())) {
                 sizeMessage = busSalesOrderMakeup.getSizeLong();
             }
@@ -2854,7 +2858,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             if (StringUtils.isNotBlank(sizeMessage)) {
                 topMessage = topMessage + " " + sizeMessage;
-            }
+            }*/
             //颜色
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
                 topMessage = topMessage  + busSalesOrderMakeup.getColor();
@@ -3002,7 +3006,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     depositInfo.setImages(stringList);
                 }
             }
+            if(StringUtils.isNotBlank(depositInfo.getPayDepositDays())){
+                depositInfo.setPayDepositDays(depositInfo.getPayDepositDays());
+            }else{
+                depositInfo.setPayDepositDays("/");
+            }
             vo.setDepositInfo(depositInfo);
+
         }
         return rb.success().setData(vo);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -35,7 +35,8 @@
                bd.depositType    as payType,
                bd.depositTypeKey as payTypeKey,
                bd.sid,
-               bd.deposit
+               bd.deposit,
+        bd.payDepositDays
         from bus_sales_order_deposit bd
         where bd.salesOrderSid = #{sid}
     </select>
@@ -71,7 +72,7 @@
     </update>
 
     <select id="selectDeposit" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo">
-        select deposit, depositAll as depositTotal, sid, depositTypeKey, depositType as type, makeUpDeposit
+        select deposit, depositAll as depositTotal, sid, depositTypeKey, depositType as type, makeUpDeposit,payDepositDays
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -147,6 +147,9 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             vo = new AppBusSalesOrderDepositVo();
             vo.setSaleOrderSid(sid);
         } else {
+            if(StringUtils.isNotBlank(vo.getPayDepositDays())){
+                vo.setPayDepositDaysValue(vo.getPayDepositDays()+"天内");
+            }
             //根据订金sid查询虚拟订单和订金的关联
             List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(vo.getSid());
             listVos.removeAll(Collections.singleton(null));
@@ -187,7 +190,12 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             } else {
                 return rb.setMsg("请先完善车型信息");
             }
-
+        }
+        //是否支持期限内日期
+        if(BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())){
+            vo.setSupportPayDepositDays(false);
+        }else{
+            vo.setSupportPayDepositDays(true);
         }
         return rb.success().setData(vo);
     }
@@ -270,9 +278,19 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             }
             depositSid = busSalesOrderDeposit.getSid();
             baseMapper.insert(busSalesOrderDeposit);
-        } else {
+        } else {//修改
             depositSid = busSalesOrderDeposit.getSid();
             BeanUtil.copyProperties(dto, busSalesOrderDeposit, "sid");
+            if(BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())){
+                //当为现车时，将期限天数设置为空
+                busSalesOrderDeposit.setPayDepositDays("");
+            }else{
+                //当订金总计为0时，将期限天数设置为空
+                if("0".equals(dto.getDepositAll())){
+                    busSalesOrderDeposit.setPayDepositDays("");
+                }
+            }
+
             //计算需补交订金
             if (StringUtils.isNotBlank(dto.getDepositAll())) {
                 if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {

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

@@ -91,7 +91,8 @@
                           NULL)) as topBean,
                contractPath,
                topName,
-               remarks
+               remarks,
+                buyTypeKey
         FROM bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>

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

@@ -41,7 +41,8 @@
                specialConfig  as specialInstructions,
                guildPrice     as price,
                publicModel,
-               publicModelSid
+               publicModelSid,
+               publicModelSon
         from bus_sales_order_model
         where salesOrderSid = #{saleOrderSid}
     </select>
@@ -65,7 +66,8 @@
                    when 3 then '2' end as type,
                bp.quantity             as total,
         bm.specialConfig as specialInstructions,
-        bm.publicModel
+        bm.publicModel,
+        bm.publicModelSon
         from bus_sales_order_model bm
                  left join bus_sales_order bo on bm.salesOrderSid = bo.sid
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid

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

@@ -53,6 +53,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
@@ -234,8 +235,17 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
         if (details.getData() != null) {
             String vehicleKey = details.getData().getVehicleType();
+            //除牵引外，其他类型的公告型号为必填项
+            if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){
+                if(StringUtils.isBlank(orderInfo.getPublicModelSid())){
+                    return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加");
+                }
+            }
             //（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填）
-            if ("3".equals(vehicleKey) || "005".equals(vehicleKey) || "7".equals(vehicleKey) || "5".equals(vehicleKey)) {
+            if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) ||
+                    BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) ||
+                    BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey) ||
+                    BusSalesOrderConstantUtils.VehicleFunctions.SPECIAL.getCode().equals(vehicleKey)) {
                 if (topSidList.size() > 0) {
                     String topSid = topSidList.get(0);
                     String topSidVin = "";
@@ -734,7 +744,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
 
         }
-        return rb.success().setMsg("成功");
+        return rb.success();
     }
 
     /**

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/gongggaoxinghao.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="50" fixed type="selection" align="center"/>
             <el-table-column width="80" fixed label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="公告型号" width="190" align="center">
               <template slot-scope="scope">
@@ -135,6 +135,7 @@ export default {
     // 返回
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
+      this.listQuery.params.announcementmodelParamSids = []
       this.$emit('doback')
     },
     // 序号
@@ -202,4 +203,12 @@ export default {
 </script>
 
 <style scoped>
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoguanli.vue

@@ -42,6 +42,11 @@
                 <span>{{ scope.row.announcementmodelName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehNameValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.remarks }}</span>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoDto.java

@@ -36,4 +36,7 @@ public class DepositInfoDto implements Dto {
 
     private List<DepositInfoListDto> virtualOrderList;
 
+    @ApiModelProperty("合同签订后x日内交清")
+    private String payDepositDays;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java

@@ -30,4 +30,12 @@ public class DepositInfoVo implements Vo {
 
     private List<DepositInfoListVo> virtualOrderList = new ArrayList<>();
 
+
+    @ApiModelProperty("合同签订后x日内交清")
+    private String payDepositDays;
+    @ApiModelProperty("拼接字段：xx天内")
+    private String payDepositDaysValue;
+    @ApiModelProperty("是否支持期限的功能：true是支持，false不支持")
+    private boolean supportPayDepositDays;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java

@@ -43,6 +43,8 @@ public class OrderInfoDto implements Dto {
 
     @ApiModelProperty("公告型号")
     private String publicModel;
-    @ApiModelProperty("公告型号sid")
+    @ApiModelProperty("公告型号配置sid")
     private String publicModelSid;
+    @ApiModelProperty("公告型号配置")
+    private String publicModelSon;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java

@@ -51,4 +51,7 @@ public class OrderInfoVo implements Vo {
     @ApiModelProperty("公告型号")
     private String publicModel;
 
+    @ApiModelProperty("公告型号")
+    private String publicModelSon;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -26,7 +26,7 @@ public interface CommonFeign {
     @ApiOperation(value = "App-合格证公告型号")
     @ResponseBody
     @GetMapping("/publicModel")
-    ResultBean<List<PublicModelVo>> getPublicModelList(@RequestParam("modelSid") String modelSid);
+    ResultBean<List<PublicModelVo>> getPublicModelList(@RequestParam("modelSid") String modelSid,@RequestParam("orgPath")String orgPath);
 
     @ApiOperation(value = "获取上装配置")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -25,8 +25,8 @@ public class CommonRest implements CommonFeign {
     private CommonService commonService;
 
     @Override
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid) {
-        return commonService.getPublicModelList(modelSid);
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
+        return commonService.getPublicModelList(modelSid,orgPath);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -40,9 +40,9 @@ public class CommonService {
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid) {
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
-        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid);
+        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid,orgPath);
         List<PublicModelVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }