Merge branch 'fix-bug-20231211' into dev

# Conflicts:
#	blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

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(

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();
 	}
 

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

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);
 	}