1.bug修复

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

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