From 8359604bda5908dfd468660b3530c884049e8347 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 29 Nov 2023 20:41:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E8=AE=A2=E5=8D=95=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E9=80=BB=E8=BE=91=202.=E5=90=8C=E6=AD=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PanFactoryDataServiceImpl.java | 62 ++++++++++++------- .../impl/SyncOrderInfoServiceImpl.java | 8 ++- 2 files changed, 46 insertions(+), 24 deletions(-) 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 382d53282..d50a7c047 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 @@ -518,6 +518,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}", orderSelfNum); throw new CustomerException(405, "保存订单信息失败"); } + }else{ + distributionStockArticleEntity.setTotalNumber(total); + distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); + } //保存包件信息 @@ -532,27 +536,27 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { // logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo); // } - String waybillNumber = distributionStockArticleEntity.getWaybillNumber(); - if(!waybillNumber.contains(waybillNoNum)){ - waybillNumber = waybillNumber+","+waybillNoNum; - } - distributionStockArticleEntity.setWaybillNumber(waybillNumber); - - // 修改入库状态 - distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1); - String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity); - distributionStockArticleEntity.setOrderStatus(orderStatus); - - // 修改收货 - if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){ - distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue()); - // 更新齐套状态 - // todo 这里需要多仓齐套的查询条件 - distributionStockArticleEntity.setCompleteSet(1); - } - // 修改最新的入库时间 - distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date()); - distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); +// String waybillNumber = distributionStockArticleEntity.getWaybillNumber(); +// if(!waybillNumber.contains(waybillNoNum)){ +// waybillNumber = waybillNumber+","+waybillNoNum; +// } +// distributionStockArticleEntity.setWaybillNumber(waybillNumber); +// +// // 修改入库状态 +// distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1); +// String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity); +// distributionStockArticleEntity.setOrderStatus(orderStatus); +// +// // 修改收货 +// if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){ +// distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue()); +// // 更新齐套状态 +// // todo 这里需要多仓齐套的查询条件 +// distributionStockArticleEntity.setCompleteSet(1); +// } +// // 修改最新的入库时间 +// distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date()); +// distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); // 包件保存成功去修改订单的数量 // distributionStockArticleClient.addHandQuantity(id, 1); @@ -732,6 +736,22 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { if (!b) { logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode()); throw new CustomerException(405, "保存包件信息失败"); + }else{ + logger.info("################handleDataToPlatform: 保存包件成功 OrderPackageCode={}",vo.getPacketBarCode()); + Integer handQuantity = distributionStockArticleEntity.getHandQuantity(); + Integer totalNumber = distributionStockArticleEntity.getTotalNumber(); + + if(handQuantity+1 >= totalNumber){ + distributionStockArticleEntity.setCompleteSet(1); + distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue()); + distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue()); + }else{ + distributionStockArticleEntity.setCompleteSet(0); + distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue()); + distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue()); + } + distributionStockArticleEntity.setHandQuantity(handQuantity + 1); + distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); } } } 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 29a2e97f5..5f4920919 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 @@ -1334,6 +1334,8 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { } }else{ id = distributionStockArticleEntity.getId(); + distributionStockArticleEntity.setTotalNumber(total); + distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); } //保存包件信息 @@ -1387,9 +1389,9 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { // if(3==carsType||4 == carsType){ // entity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); // } - if(2 == signState){ - entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); - } +// if(2 == signState){ +// entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); +// } entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());