销售订单查看挂车详情

选择供应商传参调整

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

@@ -62,6 +62,8 @@ public class AppOrderDetailsVo implements Vo {
     private AppOrderPriceInfoVo priceInfo;
     @ApiModelProperty(value = "上装信息")
     private AppOrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<AppOrderTrailerInfoVo> trailerInfo = new ArrayList<>();
     @ApiModelProperty(value = "主车优惠")
     private List<AppOrderDiscountListVo> discountList = new ArrayList<>();
     @ApiModelProperty(value = "订金信息")

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

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class AppOrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}

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

@@ -104,6 +104,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
@@ -3849,6 +3851,33 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
             vo.setTopMessage(topMessage);
         }
+        /***************************挂车信息***************************************/
+        List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
+        List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
+        for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
+            BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
+                List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
+                List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
+                ArrayList<String> contractFileString = new ArrayList<>();
+                ArrayList<String> certFileString = new ArrayList<>();
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
+                    contractFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
+                    certFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+            appOrderTrailerInfoVo.setContractFile(contractFileString);
+            appOrderTrailerInfoVo.setCertFile(certFileString);
+            appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
+            appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
+            appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
+        }
+        for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
+            appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
+        }
+        vo.setTrailerInfo(appOrderTrailerInfoVos);
         /***************************主车优惠***************************************/
         List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
         discountList.removeAll(Collections.singleton(null));

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,6 +55,8 @@ public class OrderDetailsVo implements Vo {
     private OrderPriceInfoVo priceInfo;
     @ApiModelProperty(value = "上装信息")
     private OrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<OrderTrailerInfoVo> trailerInfo;
     @ApiModelProperty(value = "主车优惠")
     private List<OrderDiscountListVo> discountList;
     @ApiModelProperty(value = "订金信息")

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

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class OrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java

@@ -89,9 +89,9 @@ public class PmsSupplierInfoRest {
 
 	@ApiOperation("选择供应商")
 	@PostMapping("/choiceSupplierInfo")
-	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("orgSid") String orgSid){
+	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("deptSid") String deptSid){
 		ResultBean rb = ResultBean.fireFail();
-		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgSid);
+		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(deptSid);
 		return rb.success().setData(baseSupplierInfoChoiceList);
 	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java

@@ -57,8 +57,8 @@ public interface PmsSupplierInfoMapper extends BaseMapper<PmsSupplierInfo> {
 	@Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}")
     int updateBySidIsDelete(String sid);
 
-	@Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'")
+	@Select("select * from yxt_base.base_supplier_info where useOrgSid = #{deptSid} and isDelete = '0'")
-    List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
+    List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid);
 
 	@Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'")
     PmsSupplierInfo selBySid(String sid);

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -187,8 +187,8 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		}
 	}
 
-	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String orgSid) {
+	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid) {
-		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(orgSid);
+		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(deptSid);
 		for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) {
 			List<PmsSupplierBankChoice> pmsSupplierBankChoices = new ArrayList<>();
 			List<PmsSupplierBankDetailsVo> pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid());