From 3e31789df986b39c033613cfd3e84520948574a7 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 12 Dec 2023 22:46:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/feign/DistributionParcelListClient.java | 4 ++++ .../com/logpm/oldproject/service/impl/AdvanceServiceImpl.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index feddab1d0..fec07146f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -183,6 +183,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie @Override public Long addReturnId(DistributionParcelListEntity entity) { distributionParcelListService.save(entity); + String orderCode = entity.getOrderCode(); + Long warehouseId = entity.getWarehouseId(); + distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); + return entity.getId(); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java index 1e76768b5..60735b8fe 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java @@ -21,6 +21,7 @@ import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.mapper.AdvanceMapper; import com.logpm.oldproject.service.IAdvanceService; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -32,6 +33,7 @@ import java.util.List; * @author slwk * @since 2023-05-10 */ +@Slf4j @Service @AllArgsConstructor public class AdvanceServiceImpl implements IAdvanceService { @@ -57,6 +59,7 @@ public class AdvanceServiceImpl implements IAdvanceService { @Override public AdvanceEntity advanceEntityOne(String orderSelfNum) { + log.info("###################advanceEntityOne: 查询订单号orderSelfNum={}",orderSelfNum); return advanceMapper.advanceEntityOne(orderSelfNum); } From 519fdc8d17e13e9db3ade8696a97fae041413b8f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 13 Dec 2023 00:13:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/entity/AdvanceEntity.java | 3 +- .../impl/PanFactoryDataServiceImpl.java | 28 +++++++++---------- .../logpm/oldproject/feign/AdvanceClient.java | 11 +++++++- .../impl/SyncOrderInfoServiceImpl.java | 28 +++++++++---------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java index 3f2f2c383..3467c1a91 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java @@ -25,6 +25,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.sql.Date; import java.sql.Timestamp; @@ -38,7 +39,7 @@ import java.sql.Timestamp; @Data @TableName("ht_advance") @ApiModel(value = "Advance对象", description = "预仓订单头表") -public class AdvanceEntity { +public class AdvanceEntity implements Serializable { @ApiModelProperty(value = "id") @TableId( 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 888c22a91..3d1c4c875 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 @@ -754,20 +754,20 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { 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); +// 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-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java index 97fbb2b44..ae23452e6 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.service.IAdvanceService; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,6 +34,7 @@ import java.util.List; * @author slwk * @since 2023-05-10 */ +@Slf4j @ApiIgnore() @RestController @AllArgsConstructor @@ -72,7 +74,14 @@ public class AdvanceClient implements IAdvanceClient { @Override @GetMapping(API_PREFIX + "/queryDataOne") public AdvanceEntity getQueryDataOne(String orderSelfNum) { - return service.advanceEntityOne(orderSelfNum); + log.info("#########getQueryDataOne: orderSelfNum={}",orderSelfNum); + try{ + AdvanceEntity advanceEntity = service.advanceEntityOne(orderSelfNum); + return advanceEntity; + }catch (Exception e){ + log.error("#######系统异常orderSelfNum= "+orderSelfNum,e); + return null; + } } @Override 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 c2235e090..0a79022a4 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 @@ -1455,20 +1455,20 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { log.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode()); }else{ log.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); +// 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); } }