Merge remote-tracking branch 'origin/dev' into dev

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

@@ -8,4 +8,7 @@ public class TrunklineCarsLoadScanVO extends TrunklineCarsLoadScanEntity {
 
 	private Long signOrderId;
 
+	private String destinationWarehouseName;
+
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -18,6 +18,7 @@ package com.logpm.warehouse.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -373,21 +374,25 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	 * 现付金额
 	 */
 	@ApiModelProperty(value = "现付金额")
+	@JsonProperty("xPay")
 	private BigDecimal xPay;//现付金额
 	/**
 	 * 到付
 	 */
 	@ApiModelProperty(value = "到付")
+	@JsonProperty("dPay")
 	private BigDecimal dPay;//到付
 	/**
 	 * 月结
 	 */
 	@ApiModelProperty(value = "月结")
+	@JsonProperty("yPay")
 	private BigDecimal yPay;//月结
 	/**
 	 * 回付
 	 */
 	@ApiModelProperty(value = "回付")
+	@JsonProperty("hPay")
 	private BigDecimal hPay;//回付
 	/**
 	 * 三方操作费

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

@@ -220,7 +220,7 @@
         select
             ltad.waybill_id waybillId,
             ltad.waybill_no waybillNo,
-            ldpl.warehouse nowWarehouseName,
+            t.warehouse nowWarehouseName,
             ltad.train_number trainNumber,
             ltad.package_status packageStatus,
             lta.is_gcp isGcp,
@@ -251,40 +251,39 @@
             lta.create_time createTime
         from logpm_trunkline_advance_detail ltad
                  left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
-                 left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code
+                 left join (select ldpl.* from logpm_distribution_parcel_list ldpl
-                 left join (
+                join (
             select pl.order_package_code,
                    max(pl.update_time) updateTime
             from logpm_distribution_parcel_list pl
-                     left join logpm_trunkline_advance_detail ad on ad.order_package_code = pl.order_package_code
             where 1=1
             <if test="param.orderCode != null and param.orderCode != '' ">
                 and LOCATE(#{param.orderCode}, pl.order_code) > 0
             </if>
             <if test="param.waybillNo != null and param.waybillNo != '' ">
-                and ad.waybill_no = #{param.waybillNo}
+                and pl.waybill_no = #{param.waybillNo}
             </if>
             <if test="param.trainNumber != null and param.trainNumber != '' ">
-                and ad.train_number = #{param.trainNumber}
+                and pl.train_number = #{param.trainNumber}
             </if>
             <if test="param.serviceNumber != null and param.serviceNumber != '' ">
-                and ad.service_num = #{param.serviceNumber}
+                and pl.service_number = #{param.serviceNumber}
             </if>
             <if test="param.orderPackageCode != null and param.orderPackageCode != '' ">
-                and LOCATE(#{param.orderPackageCode},ad.order_package_code) > 0
+                and LOCATE(#{param.orderPackageCode},pl.order_package_code) > 0
             </if>
             group by pl.order_package_code
-        ) tmax on tmax.order_package_code = ldpl.order_package_code and ldpl.update_time = tmax.updateTime
+        ) tmax on tmax.order_package_code = ldpl.order_package_code and ldpl.update_time = tmax.updateTime) t on t.order_package_code = ltad.order_package_code
-                 left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ldpl.order_package_code and lwtg.warehouse_id = ldpl.warehouse_id
+                 left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = t.order_package_code and lwtg.warehouse_id = t.warehouse_id
                  left join logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
-                 left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code
+                 left join (select ltcls.* from logpm_trunkline_cars_load_scan ltcls
-                 left join (
+                 join (
-            select cls.scan_code,
+                    select cls.scan_code,
-                   max(cls.update_time) cupdateTime
+                           max(cls.update_time) cupdateTime
-            from  logpm_trunkline_cars_load_scan cls
+                    from  logpm_trunkline_cars_load_scan cls
-            group by cls.scan_code
+                    group by cls.scan_code
-        ) cmax on cmax.scan_code = ldpl.order_package_code and cmax.cupdateTime = ltcls.update_time
+                ) cmax on cmax.scan_code = ltcls.scan_code and cmax.cupdateTime = ltcls.update_time) m on m.scan_code = t.order_package_code
-                 left join logpm_distribution_loadscan ldl on ldl.order_package_code = ldpl.order_package_code and ldl.scan_status != 1 and ldl.is_deleted = 0
+                 left join logpm_distribution_loadscan ldl on ldl.order_package_code = t.order_package_code and ldl.scan_status != 1 and ldl.is_deleted = 0
         left join logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id
         where 1=1
         <if test="param.orderCode != null and param.orderCode != '' ">
@@ -312,7 +311,7 @@
             and ltad.brand  = #{param.brand}
         </if>
         <if test="param.trunklineCarsNo != null and param.trunklineCarsNo != ''  ">
-            and ltcls.load_code  = #{param.trunklineCarsNo}
+            and m.load_code  = #{param.trunklineCarsNo}
         </if>
         <if test="param.deliveryTrainNumber != null and param.deliveryTrainNumber != ''  ">
             and lddl.train_number  = #{param.deliveryTrainNumber}

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

@@ -38,7 +38,7 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 
 	List<ProductInfoDTO> findProductInfoList(@Param("loadId") Long loadId, @Param("trayCode") String trayCode, @Param("waybillNo") String waybillNo);
 
-    IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
+    IPage<TrunklineCarsLoadScanVO> loadingDetail(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
 
 
 	List<OrderScanDetailVO> findCarsLoadingOrderDetail(@Param("loadId") Long loadId, @Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId);

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

@@ -79,72 +79,77 @@
         and waybill_no = #{waybillNo}
     </select>
 
-    <select id="loadingDetail" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
+    <select id="loadingDetail" resultType="com.logpm.trunkline.vo.TrunklineCarsLoadScanVO">
-        select *
+        select cls.*,
-        from logpm_trunkline_cars_load_scan
+               lww.destination_warehouse_name
-        where load_id = #{param.loadId}
+        from logpm_trunkline_cars_load_scan cls
+        left join logpm_warehouse_waybill lww on cls.waybill_id = lww.id
+        where cls.load_id = #{param.loadId}
         <if test="param.waybillNo != null and param.waybillNo != ''">
-            and Locate(#{param.waybillNo},waybill_no) > 0
+            and Locate(#{param.waybillNo},cls.waybill_no) > 0
         </if>
         <if test="param.orderCode != null and param.orderCode != ''">
-            and Locate(#{param.orderCode},order_code) > 0
+            and Locate(#{param.orderCode},cls.order_code) > 0
         </if>
         <if test="param.scanCode != null and param.scanCode != ''">
-            and Locate(#{param.scanCode},scan_code) > 0
+            and Locate(#{param.scanCode},cls.scan_code) > 0
         </if>
         <if test="param.loadingUserName != null and param.loadingUserName != ''">
-            and Locate(#{param.loadingUserName},loading_user_name) > 0
+            and Locate(#{param.loadingUserName},cls.loading_user_name) > 0
         </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
-            and Locate(#{param.warehouseName},warehouse_name) > 0
+            and Locate(#{param.warehouseName},cls.warehouse_name) > 0
         </if>
         <if test="param.finalNodeName != null and param.finalNodeName != ''">
-            and Locate(#{param.finalNodeName},final_node_name) > 0
+            and Locate(#{param.finalNodeName},cls.final_node_name) > 0
         </if>
         <if test="param.finalNodeName != null and param.finalNodeName != ''">
-            and Locate(#{param.finalNodeName},final_node_name) > 0
+            and Locate(#{param.finalNodeName},cls.final_node_name) > 0
         </if>
         <if test="param.scanStatus != null">
-            and scan_status = #{param.scanStatus}
+            and cls.scan_status = #{param.scanStatus}
         </if>
         <if test="param.trayName != null and param.trayName != ''">
-            and Locate(#{param.trayName},tray_name) > 0
+            and Locate(#{param.trayName},cls.tray_name) > 0
         </if>
         <if test="param.trayCode != null and param.trayCode != ''">
-            and Locate(#{param.trayCode},tray_code) > 0
+            and Locate(#{param.trayCode},cls.tray_code) > 0
         </if>
         <if test="param.unloadNodeName != null and param.unloadNodeName != ''">
-            and Locate(#{param.unloadNodeName},unload_node_name) > 0
+            and Locate(#{param.unloadNodeName},cls.unload_node_name) > 0
         </if>
         <if test="param.unloadUserName != null and param.unloadUserName != ''">
-            and Locate(#{param.unloadUserName},unload_user_name) > 0
+            and Locate(#{param.unloadUserName},cls.unload_user_name) > 0
         </if>
         <if test="param.type != null">
-            and `type` = #{param.type}
+            and cls.`type` = #{param.type}
         </if>
         <if test="param.isData != null">
-            and is_data = #{param.isData}
+            and cls.is_data = #{param.isData}
         </if>
         <if test="param.loadingAbnormal != null">
-            and loading_abnormal = #{param.loadingAbnormal}
+            and cls.loading_abnormal = #{param.loadingAbnormal}
         </if>
         <if test="param.unloadAbnormal != null">
-            and unload_abnormal = #{param.unloadAbnormal}
+            and cls.unload_abnormal = #{param.unloadAbnormal}
         </if>
         <if test="param.isSupple != null">
-            and is_supple = #{param.isSupple}
+            and cls.is_supple = #{param.isSupple}
         </if>
         <if test="param.createTimeStart != null">
-            and create_time &gt;= #{param.createTimeStart}
+            and cls.create_time &gt;= #{param.createTimeStart}
         </if>
         <if test="param.createTimeEnd != null">
-            and create_time &lt;= #{param.createTimeEnd}
+            and cls.create_time &lt;= #{param.createTimeEnd}
         </if>
         <if test="param.unloadTimeStart != null">
-            and unload_time &gt;= #{param.unloadTimeStart}
+            and cls.unload_time &gt;= #{param.unloadTimeStart}
         </if>
         <if test="param.unloadTimeEnd != null">
-            and unload_time &lt;= #{param.unloadTimeEnd}
+            and cls.unload_time &lt;= #{param.unloadTimeEnd}
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
+            and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
         </if>
 
     </select>

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

@@ -34,7 +34,7 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
 	List<ProductInfoDTO> findProductInfoList(Long loadId, String trayCode, String waybillNo);
 
-    IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO);
+    IPage<TrunklineCarsLoadScanVO> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO);
 
 	List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId);
 

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

@@ -70,7 +70,7 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 	}
 
 	@Override
-	public IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO) {
+	public IPage<TrunklineCarsLoadScanVO> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO) {
 		return baseMapper.loadingDetail(page,loadCarsDTO);
 	}
 

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

@@ -2081,7 +2081,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		loadCarsDTO.setUnloadTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getUnloadTimeStartStr()));
 		loadCarsDTO.setUnloadTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getUnloadTimeEndStr()));
 
-		IPage<TrunklineCarsLoadScanEntity> pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO);
+		IPage<TrunklineCarsLoadScanVO> pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO);
 
 		return R.data(pageList);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -238,10 +238,10 @@
             and lww.create_time <= #{param.createTimeEndDate}
         </if>
         <if test="param.agent != null and param.agent != ''">
-            and lww.Locate(#{param.agent},agent) > 0
+            and Locate(#{param.agent},lww.agent) > 0
         </if>
         <if test="param.goodsName != null and param.goodsName != ''">
-            and lww.Locate(#{param.goodsName},goods_name) > 0
+            and Locate(#{param.goodsName},lww.goods_name) > 0
         </if>
         <if test="param.freezeStatus != null">
             and lww.freeze_status = #{param.freezeStatus}
@@ -249,7 +249,7 @@
         <if test="param.abolishStatus != null">
             and lww.abolish_status = #{param.abolishStatus}
         </if>
-        <if test="param.remark != null and param.reamrk != ''">
+        <if test="param.remark != null and param.remark != ''">
             and Locate(#{param.remark},lww.remark) > 0
         </if>
         <if test="param.consigneeAddress != null and param.consigneeAddress != ''">