From 64cbfeaba663ee4316d451a2ec62bfa32c98f567 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 15 Apr 2024 09:35:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8C=85=E4=BB=B6=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); + } // 绑定部门--仓库