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

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

@@ -738,10 +738,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 					}
 					String selfCode = orderEntity.getString("SelfCode");//订单自编码
 					//先查询是否存在订单自编码
-					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode,receivingId);
+//
+//					factoryOrderService.selectEntityBySelfCode(selfCode,receivingId);
 
 
-						factoryOrderEntity = new FactoryOrderEntity();
+						FactoryOrderEntity factoryOrderEntity = new FactoryOrderEntity();
 						factoryOrderEntity.setCode(orderEntity.getString("Code"));
 						factoryOrderEntity.setSelfCode(selfCode);
 						factoryOrderEntity.setContractNumber(orderEntity.getString("ContractNumber"));

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

@@ -81,7 +81,7 @@ public class DealWithDataHandler {
 							factoryCommonService.syncTrayTypeData(unitNo,trayId,currentWarehouseId);
 
 						} catch (Exception e) {
-							log.error(e.getMessage());
+							log.error(">>>> 数据处理报错",e);
 						}
 					}
 				}