1.干线bug修复

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

@@ -31,4 +31,6 @@ public interface TrunklineWaybillOrderMapper extends BaseMapper<TrunklineWaybill
     List<OrderTotalNumVO> findTotalNumByOrderCodesAndWaybillNos(@Param("orderCodes") List<String> orderCodes, @Param("waybillNos") List<String> waybillNos);
 
 	void updateTotalNumByWaybillId(@Param("waybillId") Long waybillId, @Param("totalCount") Integer totalCount);
+
+	TrunklineWaybillOrderEntity findEntityByWaybillNoAndOrderCode(@Param("waybillNo") String waybillNo, @Param("orderCode") String orderCode);
 }

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

@@ -83,4 +83,20 @@
         where waybill_id = #{waybillId}
     </update>
 
+    <select id="findEntityByWaybillNoAndOrderCode" resultType="com.logpm.trunkline.entity.TrunklineWaybillOrderEntity">
+        select warehouse_id,
+               warehouse_name,
+               waybill_id,
+               waybill_no,
+               order_code,
+               sum(total_number) totalNumber,
+               advance_id,
+               sum(handle_number) handleNumber
+        from logpm_trunkline_waybill_order
+        where waybill_no = #{waybillNo}
+          and order_code = #{orderCode}
+          and is_deleted = 0
+        group by id
+    </select>
+
 </mapper>

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

@@ -3808,7 +3808,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			distributionParcelListClient.updateOrderPackageCodeById(packageId, "60");
 //			distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
-			if (StringUtil.isBlank(trayCode) && StringUtil.isBlank(orderPackageCode)) {
+			if (StringUtil.isBlank(trayCode) && StringUtil.isNotBlank(orderPackageCode)) {
 				updownTypeClient.downPackageOrDelTray(orderPackageCode, warehouseId, "干线装车下架解托");
 			}
 			carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
@@ -4638,14 +4638,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String productNum = carsLoadWaybillInfoVO.getProductNum();
 			String productVolume = carsLoadWaybillInfoVO.getProductVolume();
 			String productWeight = carsLoadWaybillInfoVO.getProductWeight();
-			String chargeTypes = carsLoadWaybillInfoVO.getChargeTypes();
+//			String chargeTypes = carsLoadWaybillInfoVO.getChargeTypes();
 
 			String[] nameArray = goodsName.split(",");
 			String[] priceArray = productPrice.split(",");
 			String[] numArray = productNum.split(",");
 			String[] volumeArray = productVolume.split(",");
 			String[] weightArray = productWeight.split(",");
-			String[] chargeTypeArray = chargeTypes.split(",");
+//			String[] chargeTypeArray = chargeTypes.split(",");
 
 
 
@@ -4661,7 +4661,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String weight = weightArray[i];
 				volumeMap.put(nameArray[i],new BigDecimal(volume).divide(new BigDecimal(num),2, RoundingMode.HALF_UP).toString());
 				weightMap.put(nameArray[i],new BigDecimal(weight).divide(new BigDecimal(num),2, RoundingMode.HALF_UP).toString());
-				chargeTypeMap.put(nameArray[i],chargeTypeArray[i]);
+//				chargeTypeMap.put(nameArray[i],chargeTypeArray[i]);
 			}
 
 

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

@@ -63,10 +63,7 @@ public class TrunklineWaybillOrderServiceImpl extends BaseServiceImpl<TrunklineW
 
 	@Override
 	public TrunklineWaybillOrderEntity findEntityByWaybillNoAndOrderCode(String waybillNo, String orderCode) {
-		QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper = new QueryWrapper<>();
+		return baseMapper.findEntityByWaybillNoAndOrderCode(waybillNo,orderCode);
-		queryWrapper.eq("waybill_no",waybillNo)
-			.eq("order_code",orderCode);
-		return baseMapper.selectOne(queryWrapper);
 	}
 
 	@Override