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 6e319e6da..438c1f6c6 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 @@ -701,6 +701,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber()); entity.setWaybillNumber(waybillNo); + entity.setBrandName(distributionStockArticleEntity.getBrand()); // if(ObjectUtil.isNotEmpty(warehouseWaybill)){ // entity.setWarehouseId(warehouseWaybill.getId()); // } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 09e090dcb..cc9dfb3b5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1440,6 +1440,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); entity.setStockArticleId(distributionStockArticleEntity.getId()); entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + entity.setBrandName(distributionStockArticleEntity.getBrand()); //状态:1到货,2分拣,3装车,4卸货,5出库,6配送 // if(1 == status){ // entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());