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

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-factory/src/test/java/com/logpm/factory/TestService.java

@@ -772,7 +772,7 @@ public class TestService {
 	public void test17(){
 		// 解析 Excel
 
-		String file ="D:\\data\\工作文件\\slwk\\软件项目\\hyw\\新带解析数据1.2.xlsx";
+		String file ="D:\\data\\工作文件\\slwk\\软件项目\\hyw\\新带解析数据1.3.xlsx";
 
 		 EasyExcel.read(file, OrderStatusLogMode.class, new OrderStatusLogListener()).sheet("Sheet1").doRead();
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OldWaybillClient.java

@@ -41,49 +41,56 @@ public class OldWaybillClient implements IOldWaybillClient {
 	@Override
 	public R waybillDataHandler(String waybillId, String waybillNo) {
 
-		// 更加运单ID查询系统数据
-		log.info("##################pushOldSystemSignInfo: 请求老系统接口 start  waybillId {},waybillNo {}", waybillId, waybillNo);
 
-		WayBillEntity byWaybillId = wayBillService.getByWaybillId(Integer.parseInt(waybillId));
+		try {
+			// 更加运单ID查询系统数据
+			log.info("##################pushOldSystemSignInfo: 请求老系统接口 start  waybillId {},waybillNo {}", waybillId, waybillNo);
 
+			WayBillEntity byWaybillId = wayBillService.getByWaybillId(Integer.parseInt(waybillId));
 
 
-		// 需要验证当前需要开启的数据推送仓库
-		if(!OldSystemDataPushConfig.getWarehourseIdList().contains(byWaybillId.getWarehouseId()+"")){
-			log.info(">>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", byWaybillId.getWarehouseId());
-			return null;
-		}
-
-		String authCode = oldLogin(byWaybillId.getArriveSiteId() + "");
+			log.info(">>>>>>>>>>>>>>>>> 运单信息 {}", byWaybillId);
+			log.info(">>>>>>>>>>>>>>>>> 旧仓库ID 集合 {}", OldSystemDataPushConfig.getWarehourseIdList());
 
-		String url = oldSystemProperties.getUrl() + "openApi/newSystem.WaybillQuery/index?waybillId=" + waybillId;
 
-		String body = HttpRequest.get(url).header("token", authCode).execute().body();
-		JSONObject jsonObject = JSONObject.parseObject(body);
-		if (200 == Integer.parseInt(jsonObject.get("code").toString())) {
-			// 请求成功
-			JSONArray jsonArray = jsonObject.getJSONArray("data");
-			// 循环结果
-			for (int i = 0; i < jsonArray.size(); i++) {
-				JSONObject temp = jsonArray.getJSONObject(i);
-				// 订单编号
-				String orderSelfNum = temp.getString("orderSelfNum");
-				JSONArray unitNos = temp.getJSONArray("unitNo");
+			// 需要验证当前需要开启的数据推送仓库 null+""
+			if (!OldSystemDataPushConfig.getWarehourseIdList().contains(byWaybillId.getWarehouseId() + "")) {
+				log.info(">>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", byWaybillId.getWarehouseId());
+				return null;
+			}
 
-				for (int i1 = 0; i1 < unitNos.size(); i1++) {
-					String unitNo = unitNos.getString(i1);
-					log.info(">>>>>>>> 保存开单推送的已入库包件 {} 保存到新系统",unitNo);
+			String authCode = oldLogin(byWaybillId.getArriveSiteId() + "");
+
+			String url = oldSystemProperties.getUrl() + "openApi/newSystem.WaybillQuery/index?waybillId=" + waybillId;
+
+			String body = HttpRequest.get(url).header("token", authCode).execute().body();
+			JSONObject jsonObject = JSONObject.parseObject(body);
+			if (200 == Integer.parseInt(jsonObject.get("code").toString())) {
+				// 请求成功
+				JSONArray jsonArray = jsonObject.getJSONArray("data");
+				// 循环结果
+				for (int i = 0; i < jsonArray.size(); i++) {
+					JSONObject temp = jsonArray.getJSONObject(i);
+					// 订单编号
+					String orderSelfNum = temp.getString("orderSelfNum");
+					JSONArray unitNos = temp.getJSONArray("unitNo");
+
+					for (int i1 = 0; i1 < unitNos.size(); i1++) {
+						String unitNo = unitNos.getString(i1);
+						log.info(">>>>>>>> 保存开单推送的已入库包件 {} 保存到新系统", unitNo);
+						String operationTime = DateUtil.format(new Date(), "yyyy-MM-dd hh:mm:ss");
+						oldSystemWaybillClient.handleDataToPlatform(unitNo, operationTime);
+					}
 
-					String operationTime = DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss");
-					oldSystemWaybillClient.handleDataToPlatform(unitNo,operationTime);
 				}
-
-
+			} else {
+				// 请求失败
 			}
-		} else {
-			// 请求失败
+		} catch (Exception e) {
+			log.error(">>>> 运单信息查询解析报错 ", e);
 		}
 
+
 		return null;
 	}
 

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);
+	}
+
 
 }