1.工厂数据bug修复

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

@@ -376,7 +376,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			if (Objects.isNull(distributionStockArticleEntity)) {
 				Date date = new Date();
 				if(StringUtil.isNoneBlank(operationTime)){
-					 date = CommonUtil.StringToDateByT(operationTime);
+					 date = CommonUtil.StringToDate(operationTime);
 				}
 				logger.info("#################handleDataToPlatform.waybillNoNum: {}", waybillNoNum);
 
@@ -606,7 +606,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		//进销售
 		entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
 		entity.setDealerName(distributionStockArticleEntity.getDealerName());
-
+		entity.setWarehouseEntryTimeEnd(distributionStockArticleEntity.getWarehouseEntryTime());
 
 		// 绑定部门--仓库
 		if (!Objects.isNull(basicdataWarehouseEntity)) {