1.工厂订单入库时间bug修复

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

@@ -495,7 +495,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			}
 
 			//保存包件信息
-			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum);
+			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime);
 
 			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
 			if(!waybillNumber.contains(waybillNoNum)){
@@ -571,7 +571,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @param distributionStockArticleEntity 订单对象
 	 * @param basicdataWarehouseEntity 仓库对象
 	 */
-	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {
+	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo,String operationTime) {
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 //		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
@@ -606,7 +606,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		//进销售
 		entity.setDealerCode(distributionStockArticleEntity.getDealerCode());
 		entity.setDealerName(distributionStockArticleEntity.getDealerName());
-		entity.setWarehouseEntryTimeEnd(distributionStockArticleEntity.getWarehouseEntryTime());
+		entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime));
 
 		// 绑定部门--仓库
 		if (!Objects.isNull(basicdataWarehouseEntity)) {