From ca35369ad3dc19fda644b8f10dd123ac7eb15088 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 4 Jan 2024 17:29:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=A8=E9=80=81=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=20=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 1 + .../com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java | 1 + 2 files changed, 2 insertions(+) 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());