Merge branch 'dev' into test

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java

@@ -56,5 +56,8 @@ public interface IDistributionStockArticleClient {
     DistributionStockArticleEntity findByAdvanceId(@RequestParam Integer advanceId);
 
 	@PostMapping(API_PREFIX + "/saveOrUpdate")
-    void saveOrUpdate(DistributionStockArticleEntity distributionStockArticleEntity);
+    void saveOrUpdate(@RequestBody DistributionStockArticleEntity distributionStockArticleEntity);
+
+	@GetMapping(API_PREFIX + "/addHandQuantity")
+	void addHandQuantity(@RequestParam("id") Long id,@RequestParam("num") int num);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -77,4 +77,10 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		distributionStockArticleService.saveOrUpdate(distributionStockArticleEntity);
 	}
 
+	@Override
+	@GetMapping(API_PREFIX + "/addHandQuantity")
+	public void addHandQuantity(Long id, int num) {
+		distributionStockArticleService.addHandQuantity(id,num);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java

@@ -51,4 +51,5 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 */
 	List<DistributionStockArticleExcel> exportDistributionStockArticle(@Param("ew") Wrapper<DistributionStockArticleEntity> queryWrapper);
 
+    void addHandQuantity(@Param("id") Long id,@Param("num") int num);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -50,4 +50,8 @@
         SELECT * FROM logpm_distribution_stock_article ${ew.customSqlSegment}
     </select>
 
+    <update id="addHandQuantity" >
+        update  logpm_distribution_stock_article set hand_quantity = hand_quantity + #{num} where id = #{id}
+    </update>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -65,4 +65,7 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
     Boolean saveStockRow(DistributionStockArticleDTO distributionStockArticleDTO);
 
 	R<List<DistributionStockArticleVO>> getStockArticleInfo(String ids);
+
+    void addHandQuantity(Long id, int num);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -16,35 +16,31 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
-import com.logpm.distribution.dto.DistributionStockDTO;
 import com.logpm.distribution.entity.*;
-import com.logpm.distribution.service.*;
-import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
-import com.sun.org.apache.xpath.internal.operations.Bool;
+import com.logpm.distribution.service.*;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.RandomType;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 /**
  * 配送在库订单 服务实现类
@@ -242,4 +238,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return R.data(distributionStockArticleEntityList);
 	}
 
+	@Override
+	public void addHandQuantity(Long id, int num) {
+		baseMapper.addHandQuantity(id,num);
+	}
+
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryDataService.java

@@ -1,5 +1,6 @@
 package com.logpm.factory.mt.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.logpm.factory.comfac.dto.OrderInfoDTO;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.comfac.dto.ReceiveInfoDTO;
@@ -15,7 +16,7 @@ public interface IMtFactoryDataService {
 
 	R handleData(OrderInfoDTO orderInfoDTO);
 
-	R handleStatusData(OrderStatusDTO orderStatusDTO);
+	R handleStatusData(OrderStatusDTO orderStatusDTO) throws JsonProcessingException;
 
 	R sendReceiveInfo(ReceiveInfoDTO receiveInfoDTO);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.logpm.factory.comfac.dto.*;
 import com.logpm.factory.mt.dto.*;
 import com.logpm.factory.mt.service.IMtFactoryDataService;
@@ -239,7 +242,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 
 	@Override
-	public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException {
+	public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException {
 
 		String status = orderStatusDTO.getStatus();
 		String orderNo = orderStatusDTO.getOrderNo();
@@ -279,7 +282,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		mtOrderStatusDTO.setWarehouse(mtFactoryOrderMain.getCenterWarehouseCode());
 		mtOrderStatusDTO.setDealerName(mtFactoryOrder.getDealerName());
 
-		String s = JSONObject.toJSONString(mtOrderStatusDTO);
+		ObjectMapper objectMapper = new JsonMapper();
+
+		String s = objectMapper.writeValueAsString(mtOrderStatusDTO);
 
 		//先获取token
 		String token = getMtToken();

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -363,8 +363,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setGenre(1);
 				distributionStockArticleEntity.setState(2);
 				distributionStockArticleEntity.setAdvanceId(advanceId);
-
-				logger.info("#################handleDataToPlatform: 保存新的在库订单数据 {}",distributionStockArticleEntity);
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 				if(id == 0){
 					logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}",orderSelfNum);
@@ -386,10 +384,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderSelfNum={}",orderSelfNum);
 				throw new CustomerException(405,"保存包件信息失败");
 			}
-			distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity()+1);
-
-			logger.info("#################handleDataToPlatform: 更新的数据 {}",distributionStockArticleEntity);
-			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
+			//包件保存成功去修改订单的数量
+			distributionStockArticleClient.addHandQuantity(id,1);
 
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		}else{