diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 70f147476..8a05789b2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -728,12 +728,14 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { entity.setDealerCode(distributionStockArticleEntity.getDealerCode()); entity.setDealerName(distributionStockArticleEntity.getDealerName()); + entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime)); + if(!Objects.isNull(orderDetailEntity)){ Integer signState = orderDetailEntity.getSignState(); if(signState == 2){ entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); } - entity.setWarehouseEntryTimeEnd(orderDetailEntity.getUpdateTime()); + } // 绑定部门--仓库