|
|
@ -728,12 +728,14 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { |
|
|
|
entity.setDealerCode(distributionStockArticleEntity.getDealerCode()); |
|
|
|
entity.setDealerCode(distributionStockArticleEntity.getDealerCode()); |
|
|
|
entity.setDealerName(distributionStockArticleEntity.getDealerName()); |
|
|
|
entity.setDealerName(distributionStockArticleEntity.getDealerName()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime)); |
|
|
|
|
|
|
|
|
|
|
|
if(!Objects.isNull(orderDetailEntity)){ |
|
|
|
if(!Objects.isNull(orderDetailEntity)){ |
|
|
|
Integer signState = orderDetailEntity.getSignState(); |
|
|
|
Integer signState = orderDetailEntity.getSignState(); |
|
|
|
if(signState == 2){ |
|
|
|
if(signState == 2){ |
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); |
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
entity.setWarehouseEntryTimeEnd(orderDetailEntity.getUpdateTime()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 绑定部门--仓库
|
|
|
|
// 绑定部门--仓库
|
|
|
|