1.干线-配载详情功能

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-tjj";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java

@@ -0,0 +1,46 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class CarsLoadWaybillInfoVO implements Serializable {
+
+	private String waybillNo;
+	private String orderCode;
+	private Date createTime;
+	private String destination;
+	private String destinationWarehouseName;
+	private String shipper;
+	private String shipperName;
+	private String consignee;
+	private String consigneeName;
+	private Integer waybillNum;
+	private Integer orderNum;
+	private Integer planNum;
+	private Integer loadingNum;
+	private Integer unloadNum;
+	private BigDecimal unloadIncome;
+	private BigDecimal orderLineCost;
+	private String openPrice;
+	private String goodsName;
+	private BigDecimal weight;
+	private BigDecimal volume;
+	private String remark;
+	private BigDecimal totalFreight;
+	private BigDecimal orderFreight;
+	private BigDecimal deliveryFee;
+	private BigDecimal pickupFee;
+	private BigDecimal warehouseManagementFee;
+	private BigDecimal storageFee;
+	private BigDecimal handlingFee;
+	private BigDecimal otherFee;
+	private BigDecimal insuranceFee;
+	private BigDecimal totalFee;
+
+
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java

@@ -43,4 +43,7 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 	private List<LoadZeroListVO> zeroList = new ArrayList<>();
 	private List<TrunklineCarsLoadScanEntity> exceptionList = new ArrayList<>();
 
+
+	private List<CarsLoadWaybillInfoVO> carsLoadWaybillInfoList = new ArrayList<>();
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java

@@ -27,4 +27,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
 	void deleteByCarsOrderId(@Param("carsOrderId") Long carsOrderId);
 
     List<String> findUseOrderWaybilllList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+    List<CarsLoadWaybillInfoVO> findWaybillOrderByloadId(@Param("loadId") Long loadId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml

@@ -101,4 +101,8 @@
         and node_id = #{warehouseId}
     </select>
 
+    <select id="findWaybillOrderByloadId" resultType="com.logpm.trunkline.vo.CarsLoadWaybillInfoVO">
+
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java

@@ -24,4 +24,7 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
 	List<LoadScanOrderVO> findLoadScanPackageWithOrder(Long loadId, Long warehouseId);
 
     List<String> findUseOrderWaybilllList(Long loadId, Long warehouseId);
+
+    List<CarsLoadWaybillInfoVO> findWaybillOrderByloadId(Long loadId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1912,6 +1912,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		trunklineCarsLoadVO.setCarsLoadLineList(loadLineList);
 
+		List<CarsLoadWaybillInfoVO> carsLoadWaybillInfoList = trunklineCarsOrderService.findWaybillOrderByloadId(loadId);
 //		trunklineCarsOrderService.find
 
 		return null;

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java

@@ -57,4 +57,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 		return baseMapper.findUseOrderWaybilllList(loadId,warehouseId);
 	}
 
+	@Override
+	public List<CarsLoadWaybillInfoVO> findWaybillOrderByloadId(Long loadId) {
+		return baseMapper.findWaybillOrderByloadId(loadId);
+	}
+
 }