Merge remote-tracking branch 'origin/pre-production' into pre-production

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java

@@ -11,7 +11,7 @@ public interface IOuPaiFactoryService {
 	String saveOuPaiFactoryOrderDTOByCarCarNumber(String carNumber);
 
 
-	String saveOuPaiPackageStatusByCode(String orderCode,Integer event);
+	String saveOuPaiPackageStatusByCode(String orderPackageCode,Integer event);
 
 	String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event);
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java

@@ -25,6 +25,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 		Integer event = ouPaiDataPushVO.getEvent();
 		String typeName = ouPaiDataPushVO.getTypeName();
 		String orderCode = ouPaiDataPushVO.getOrderCode();
+		String key = ouPaiDataPushVO.getKey();
 		String code = null;
 		if(StringUtil.isBlank(typeName)){
 			log.info("#############saveData: 事件类型为空 typeName={}",typeName);
@@ -36,7 +37,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 			//收货单完成收货
 		}else if(event == 2){
 			//包件收货
-			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(orderCode,event);
+			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
 		}else if(event == 3){
 			// 收货单创建
 			// 获取需要处理的数据并存入数据库

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -83,7 +83,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 	@Override
-	public String saveOuPaiPackageStatusByCode(String orderCode, Integer event) {
+	public String saveOuPaiPackageStatusByCode(String orderPackageCode, Integer event) {
 		//
 //		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=Code eq '" + orderCode + "'&select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber\n" +
 //			"&$expand=" +
@@ -99,13 +99,13 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //		handlePackageData(url, event);
 		//orderCode现在是包件码
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("oid",orderCode);
+		queryWrapper.eq("oid",orderPackageCode);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
 		packageEntity.setPackageStatus(5);
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",orderCode);
+		jo.put("orderPackageCode",orderPackageCode);
 		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据
@@ -122,7 +122,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		log.info("############saveOuPaiPackageStatusByCode: 数据处理结束");
 
-		return orderCode;
+		return orderPackageCode;
 	}
 
 	@Override