1.在库订书库查询逻辑修改

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java

@@ -17,10 +17,9 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
@@ -75,6 +74,6 @@ public class BasicdataStoreBusinessEntity extends TenantEntity {
 	 * 服务类型—类型
 	 */
 	@ApiModelProperty(value = "服务类型—类型")
-	private String mold;
+	private Integer mold;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@@ -16,8 +16,9 @@
  */
 package com.logpm.basicdata.feign;
 
-import org.springblade.core.mp.support.BladePage;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @since 2023-05-16
  */
 @FeignClient(
-    value = "blade-basicdataClient"
+    value = ModuleNameConstant.APPLICATION_BASICDATA_NAME
 )
 public interface IBasicdataClientClient {
 
@@ -46,4 +47,6 @@ public interface IBasicdataClientClient {
     @GetMapping(TOP)
     BladePage<BasicdataClientEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+    @GetMapping(API_PREFIX+"/findByName")
+	BasicdataClientEntity findByName(String customerName);
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java

@@ -46,4 +46,7 @@ public interface IBasicdataStoreBusinessClient {
     @GetMapping(TOP)
     BladePage<BasicdataStoreBusinessEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	@GetMapping(API_PREFIX+"/findByClientIdAndTypeService")
+    BasicdataStoreBusinessEntity findByClientIdAndTypeService(Long clientEntityId, Integer typeService);
+
 }

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

@@ -50,4 +50,7 @@ public interface IDistributionStockArticleClient {
 
 	@PostMapping(API_PREFIX + "/addData")
     Long addData(@RequestBody  DistributionStockArticleEntity distributionStockArticleEntity);
+
+	@GetMapping(API_PREFIX + "/findByAdvanceId")
+    DistributionStockArticleEntity findByAdvanceId(@RequestParam Integer advanceId);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java

@@ -78,5 +78,6 @@ public interface IAdvanceClient {
 	@GetMapping(API_PREFIX + "/queryDataOne")
 	AdvanceEntity getQueryDataOne(@RequestParam String orderSelfNum);
 
-
+	@GetMapping(API_PREFIX + "/fingById")
+	AdvanceEntity fingById(@RequestParam Integer advanceId);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java

@@ -75,4 +75,5 @@ public interface IAdvanceDetailClient {
 	@GetMapping(API_PREFIX + "/getListByOrderSelfNum")
 	List<DistributionParcelListEntityVO> getListByOrderSelfNum(@RequestParam String orderSelfNum);
 
+	void getOneByUnitNo();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
@@ -50,4 +51,11 @@ public class BasicdataClientClient implements IBasicdataClientClient {
         return BladePage.of(page);
     }
 
+	@Override
+	public BasicdataClientEntity findByName(String customerName) {
+		QueryWrapper<BasicdataClientEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("client_name",customerName);
+		return basicdataClientService.getOne(queryWrapper);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
@@ -50,4 +51,12 @@ public class BasicdataStoreBusinessClient implements IBasicdataStoreBusinessClie
         return BladePage.of(page);
     }
 
+	@Override
+	public BasicdataStoreBusinessEntity findByClientIdAndTypeService(Long clientEntityId, Integer typeService) {
+		QueryWrapper<BasicdataStoreBusinessEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("client_id",clientEntityId)
+			.eq("type_service",typeService);
+		return basicdataStoreBusinessService.getOne(queryWrapper);
+	}
+
 }

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

@@ -16,14 +16,16 @@
  */
 package com.logpm.distribution.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.service.IDistributionStockArticleService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.service.IDistributionStockArticleService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -51,6 +53,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
     }
 
 	@Override
+	@PostMapping(API_PREFIX + "/addData")
 	public Long addData(DistributionStockArticleEntity distributionStockArticleEntity) {
 		boolean saveFlag = distributionStockArticleService.save(distributionStockArticleEntity);
 		if(saveFlag){
@@ -60,4 +63,12 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		}
 	}
 
+	@Override
+	@GetMapping(API_PREFIX + "/findByAdvanceId")
+	public DistributionStockArticleEntity findByAdvanceId(Integer advanceId) {
+		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("advance_id",advanceId);
+		return distributionStockArticleService.getOne(queryWrapper);
+	}
+
 }

blade-service/logpm-factory/pom.xml

@@ -86,6 +86,12 @@
             <version>3.1.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-basicdata-api</artifactId>
+            <version>3.1.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -6,6 +6,10 @@ 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.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
+import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
@@ -13,7 +17,9 @@ import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.factory.comfac.dto.OrderInfoDTO;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.comfac.service.IOrderStatusLogService;
-import com.logpm.factory.pan.dto.*;
+import com.logpm.factory.pan.dto.PanFactoryOrderDTO;
+import com.logpm.factory.pan.dto.PanPackageInfoDTO;
+import com.logpm.factory.pan.dto.PanPackageListDTO;
 import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.logpm.factory.pan.service.IPanFactoryOrderService;
 import com.logpm.factory.pan.service.IPanPackageInfoService;
@@ -26,12 +32,10 @@ import com.logpm.factory.snm.entity.PanPackageInfo;
 import com.logpm.factory.snm.entity.PanPackageList;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
 import com.logpm.oldproject.entity.AdvanceEntity;
-import com.logpm.oldproject.entity.OrderEntity;
 import com.logpm.oldproject.feign.IAdvanceClient;
 import com.logpm.oldproject.feign.IAdvanceDetailClient;
 import com.logpm.oldproject.feign.IOrderClient;
 import com.logpm.oldproject.feign.IWarehouseClient;
-import com.logpm.oldproject.vo.DistributionParcelListEntityVO;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,6 +73,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	private final IDistributionParcelListClient distributionParcelListClient;
 	private final IDistributionStockArticleClient distributionStockArticleClient;
 
+	private final IBasicdataClientClient basicdataClientClient;
+	private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient;
+
 //	@Override
 //	public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException {
 //
@@ -302,68 +309,73 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			}
 			//2.根据包条信息拿到订单信息
 			String orderSelfNum = advanceDetailEntity.getOrderSelfNum();//订单自编码
-			//2.1如果订单信息出现两条，就正序排列取时间最早的一条，并在存入platform的时候打上标记
-			List<OrderEntity> orderEntityList = orderClient.getOrderByOrderSelfNum(orderSelfNum);
-			AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderSelfNum);
+			Integer advanceId = advanceDetailEntity.getAdvanceId();//订单id
+			//2.1 因为会存在相同订单自编码的订单，所以为了区分订单只有通过id查询
+			AdvanceEntity advanceEntity = advanceClient.fingById(advanceId);
 			if(Objects.isNull(advanceEntity)){
-				logger.warn("#################handleDataToPlatform: 未找到对应的订单信息  orderSelfNum={}",orderSelfNum);
-				throw new CustomerException(405,"未找到对应的订单信息");
-			}
-			int size = orderEntityList.size();//数据数量
-			if(size < 1){
-				logger.warn("#################handleDataToPlatform: 未找到对应的订单信息  orderSelfNum={}",orderSelfNum);
+				logger.warn("#################handleDataToPlatform: 未找到对应的订单信息  advanceId={}",advanceId);
 				throw new CustomerException(405,"未找到对应的订单信息");
 			}
-			OrderEntity orderEntity = orderEntityList.get(0);
-			Integer warehouseId = orderEntity.getWarehouseId();//仓库id
-			Date date = CommonUtil.StringToDate(operationTime);
-			Date now = new Date();
-
-
-			//根据仓库id查询仓库
-			String warehouseName = warehouseClient.selectNameById(warehouseId);
-
-			DistributionStockArticleEntity distributionStockArticleEntity = new DistributionStockArticleEntity();
-			distributionStockArticleEntity.setServiceNumber(orderEntity.getServicenum());
-			distributionStockArticleEntity.setOrderSelfNumbering(orderEntity.getSelfnumber());
-			distributionStockArticleEntity.setMallName(advanceEntity.getStoreName());
-			distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
-			distributionStockArticleEntity.setWarehouse(warehouseName);
-			distributionStockArticleEntity.setWarehouseEntryTime(date);
-			distributionStockArticleEntity.setStoreTime(0);//TODO
-			distributionStockArticleEntity.setTotalNumber(advanceEntity.getTotal());
-			distributionStockArticleEntity.setHandQuantity(0);//TODO
-			distributionStockArticleEntity.setCompleteSet(1);//TODO
-			distributionStockArticleEntity.setBrand(advanceEntity.getType());
-			distributionStockArticleEntity.setTypeService(orderEntity.getDoor());
-			distributionStockArticleEntity.setCustomerName(orderEntity.getContact());
-			distributionStockArticleEntity.setCustomerTelephone(orderEntity.getPhone());
-			distributionStockArticleEntity.setCustomerAddress(orderEntity.getAddress());
-			distributionStockArticleEntity.setGenre(1);
-			distributionStockArticleEntity.setState(2);
-			if(size > 1){
-				distributionStockArticleEntity.setReserve1("multiple");
+
+			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
+
+			//判断新系统是否有这条订单数据
+			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId);
+
+			if(Objects.isNull(distributionStockArticleEntity)){
+				Date date = CommonUtil.StringToDate(operationTime);
+
+				distributionStockArticleEntity = new DistributionStockArticleEntity();
+				distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
+				distributionStockArticleEntity.setOrderSelfNumbering(advanceEntity.getOrderSelfNum());
+				distributionStockArticleEntity.setMallName(advanceEntity.getStoreName());
+				distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
+				distributionStockArticleEntity.setWarehouse(supplyData.get("destinationWarehouse"));
+				distributionStockArticleEntity.setWarehouseEntryTime(date);
+				distributionStockArticleEntity.setTotalNumber(advanceEntity.getTotal());
+				distributionStockArticleEntity.setHandQuantity(0);
+				distributionStockArticleEntity.setCompleteSet(1);//TODO
+				distributionStockArticleEntity.setBrand(advanceEntity.getType());
+
+				String customerName = advanceEntity.getCustomerName();//客户名称
+				//通过客户名称去查询客户的服务类型
+				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
+				if(!Objects.isNull(basicdataClientEntity)){
+					Long clientEntityId = basicdataClientEntity.getId();//基础客户
+					BasicdataStoreBusinessEntity basicdataStoreBusinessEntity =  basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId,3);
+					if(!Objects.isNull(basicdataStoreBusinessEntity)){
+						distributionStockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+					}
+				}
+				distributionStockArticleEntity.setCustomerName(customerName);
+				distributionStockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+				distributionStockArticleEntity.setCustomerAddress(advanceEntity.getCustomerRoad());
+				distributionStockArticleEntity.setGenre(1);
+				distributionStockArticleEntity.setState(2);
+				distributionStockArticleEntity.setAdvanceId(advanceId);
 			}
 			Long id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 			if(id == 0){
 				logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}",orderSelfNum);
 				throw new CustomerException(405,"保存订单信息失败");
 			}
-			//通过订单自编号查询包件信息
-			List<DistributionParcelListEntityVO> detailList = advanceDetailClient.getListByOrderSelfNum(orderSelfNum);
-
-			List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>();
-			for (DistributionParcelListEntityVO vo:detailList){
-				DistributionParcelListEntity entity = new DistributionParcelListEntity();
-				BeanUtil.copyProperties(vo,entity);
-				entity.setStockArticleId(id+"");
-				parcelListEntityList.add(entity);
-			}
-			boolean b = distributionParcelListClient.addBatch(parcelListEntityList);
-			if(!b){
-				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderSelfNum={}",orderSelfNum);
-				throw new CustomerException(405,"保存包件信息失败");
-			}
+
+			//存入包件明细
+
+
+
+//			List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>();
+//			for (DistributionParcelListEntityVO vo:detailList){
+//				DistributionParcelListEntity entity = new DistributionParcelListEntity();
+//				BeanUtil.copyProperties(vo,entity);
+//				entity.setStockArticleId(id+"");
+//				parcelListEntityList.add(entity);
+//			}
+//			boolean b = distributionParcelListClient.addBatch(parcelListEntityList);
+//			if(!b){
+//				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderSelfNum={}",orderSelfNum);
+//				throw new CustomerException(405,"保存包件信息失败");
+//			}
 
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		}else{

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java

@@ -75,4 +75,10 @@ public class AdvanceClient implements IAdvanceClient {
 		return service.advanceEntityOne(orderSelfNum);
 	}
 
+	@Override
+	@GetMapping(API_PREFIX + "/fingById")
+	public AdvanceEntity fingById(Integer advanceId) {
+		return service.fingById(advanceId);
+	}
+
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java

@@ -16,12 +16,7 @@
  */
 package com.logpm.oldproject.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.oldproject.entity.AdvanceEntity;
-
-import com.logpm.oldproject.vo.AdvanceVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -49,4 +44,7 @@ public interface AdvanceMapper  {
 
 
 	AdvanceEntity advanceEntityOne(@Param("orderSelfNum") String orderSelfNum);
+
+    AdvanceEntity fingById(@Param("advanceId") Integer advanceId);
+
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml

@@ -38,5 +38,12 @@
     </insert>
 
 
+    <select id="fingById" resultMap="advanceResultMap">
+        select * from ht_advance
+        <where>
+            delete_administrators_id = 0
+            and id = #{advanceId}
+        </where>
+    </select>
 
 </mapper>

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java

@@ -38,4 +38,6 @@ public interface IAdvanceService  {
 	Boolean addAdvanceEntity(AdvanceEntity advanceEntity);
 
 	AdvanceEntity advanceEntityOne(String orderSelfNum);
+
+    AdvanceEntity fingById(Integer advanceId);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java

@@ -20,9 +20,7 @@ import com.logpm.oldproject.dto.AdvanceDTO;
 import com.logpm.oldproject.entity.AdvanceEntity;
 import com.logpm.oldproject.mapper.AdvanceMapper;
 import com.logpm.oldproject.service.IAdvanceService;
-import io.micrometer.core.instrument.binder.BaseUnits;
 import lombok.AllArgsConstructor;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -61,4 +59,9 @@ public class AdvanceServiceImpl implements IAdvanceService {
 	public AdvanceEntity advanceEntityOne(String orderSelfNum) {
 		return advanceMapper.advanceEntityOne(orderSelfNum);
 	}
+
+	@Override
+	public AdvanceEntity fingById(Integer advanceId) {
+		return advanceMapper.fingById(advanceId);
+	}
 }