fix: 修复导出没有到付价格问题

2.增加预约必须审单的条件
3.增加卸车分拣打托里面的语音提示托盘

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java

@@ -125,16 +125,16 @@ public class ExportWarehouseWaybillVO implements Serializable {
 	private String payWay;
 
 	@ExcelProperty(value = "现付")
-	private BigDecimal xPay;
+	private BigDecimal nowPay;
 
 	@ExcelProperty(value = "到付")
-	private BigDecimal dPay;
+	private BigDecimal arrivePay;
 
 	@ExcelProperty(value = "回付")
-	private BigDecimal hPay;
+	private BigDecimal backPay;
 
 	@ExcelProperty(value = "月结")
-	private BigDecimal yPay;
+	private BigDecimal mouthPay;
 
 	@ExcelProperty(value = "三方操作费")
 	private BigDecimal thirdOperationFee;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -758,8 +758,11 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
+        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no
+        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id
         <where>
             ldsa.order_status in ('10','20','30','70')
+            AND lww.check_status = 1
             and ldsa.reservation_status in ('10','20')
             AND EXISTS (
             SELECT 1

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

@@ -950,10 +950,10 @@
         lww.remark remark,
         lww.pay_type payType,
         lww.pay_way payWay,
-        lww.x_pay xPay,
+        lww.x_pay nowPay,
-        lww.d_pay dPay,
+        lww.d_pay arrivePay,
-        lww.h_pay hPay,
+        lww.h_pay backPay,
-        lww.y_pay yPay,
+        lww.y_pay mouthPay,
         lww.service_type serviceType,
         IFNULL(lww.update_status,0) updateStatus,
         IFNULL(lww.check_status,0) checkStatus,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1057,7 +1057,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			}
 
 			log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}", orderPackageCode);
-			return R.fail(4002, "包件已打托");
+			// 需要告知这个托盘名称
+
+			BasicdataTrayEntity trayByTray = basicdataTrayClient.getTrayByTrayCode(oldTrayCode);
+			if(!Objects.isNull(trayByTray)){
+				return R.fail(4002, "包件已在"+trayByTray.getPalletName()+"进行打托");
+			}else{
+				return R.fail(4002, "包件已在"+trayGoodsEntity.getTrayCode()+"进行打托");
+			}
+
 		}
 
 		QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
@@ -1785,7 +1793,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList);
 			return R.fail(403, "数据为空");
 		}
-		if (zeroList.size() == 0) {
+		if (zeroList.isEmpty()) {
 			log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList);
 			return R.fail(403, "数据为空");
 		}