Merge branch 'dev' into test

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -279,11 +279,13 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		mtOrderStatusDTO.setWarehouse(mtFactoryOrderMain.getCenterWarehouseCode());
 		mtOrderStatusDTO.setDealerName(mtFactoryOrder.getDealerName());
 
+		String s = JSONObject.toJSONString(mtOrderStatusDTO);
+
 		//先获取token
 		String token = getMtToken();
 
 		//请求参数
-		logger.info("##############handleStatusData: 推送包件状态请求参数 {}",mtOrderStatusDTO);
+		logger.info("##############handleStatusData: 推送包件状态请求参数 {}",s);
 
 		//处理逻辑
 		String result =  HttpRequest.post(mtFactoryProperties.getUrl()+"/Auth/text")
@@ -292,7 +294,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			.header("USERID",mtFactoryProperties.getUserid())
 			.header("USERPWD",mtFactoryProperties.getUserpwd())
 			.header("Content-Type","application/json")
-			.body(JSONObject.toJSONString(mtOrderStatusDTO)).timeout(5 * 1000)
+			.body(s).timeout(5 * 1000)
 			.execute().body();
 
 		logger.info("##############handleStatusData: 推送包件状态返回参数 {}",result);

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -363,6 +363,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setGenre(1);
 				distributionStockArticleEntity.setState(2);
 				distributionStockArticleEntity.setAdvanceId(advanceId);
+
+				logger.info("#################handleDataToPlatform: 保存新的在库订单数据 {}",distributionStockArticleEntity);
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 				if(id == 0){
 					logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}",orderSelfNum);
@@ -385,6 +387,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				throw new CustomerException(405,"保存包件信息失败");
 			}
 			distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity()+1);
+
+			logger.info("#################handleDataToPlatform: 更新的数据 {}",distributionStockArticleEntity);
 			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 
 			logger.info("#################handleDataToPlatform: 数据处理完成");