1.功能优化

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java

@@ -67,4 +67,7 @@ public interface IWarehouseTrayTypeClient {
 	void deleteZeroOrderByTrayCode(@RequestParam String orderCode, @RequestParam String palletCode, @RequestParam Long wid);
 	@GetMapping(API_PREFIX+"/changeTrayWarehouseInfo")
     void changeTrayWarehouseInfo(@RequestParam String trayCode, @RequestParam Long warehouseId);
+
+	@GetMapping(API_PREFIX+"/trayToNull")
+    void trayToNull(@RequestParam String trayCode);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

@@ -221,7 +221,12 @@ public class OrderStatusHandler {
 				boolean b = warehouseTrayTypeClient.orderScanOrderPackageCode(m);
 				if(!b){
 					log.warn("####################orderStatusHandler: 打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
-					return;
+					//先去空置托盘再打托
+					warehouseTrayTypeClient.trayToNull("T"+trayId);
+					boolean b1 = warehouseTrayTypeClient.orderScanOrderPackageCode(m);
+					if(!b1){
+						log.warn("####################orderStatusHandler: 二次打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
+					}
 				}
 			}else{
 				//有上架就上架

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java

@@ -89,5 +89,10 @@ public class WarehouseTrayTypeClient implements IWarehouseTrayTypeClient {
 		warehouseTrayTypeService.changeTrayWarehouseInfo(trayCode,warehouseId);
 	}
 
+	@Override
+	public void trayToNull(String trayCode) {
+		warehouseTrayTypeService.trayToNull(trayCode);
+	}
+
 
 }