修改 修改商场名称的方式 改为根据运单号修改

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

@@ -137,4 +137,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/updateEntityByOpenOrder")
 	void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId);
+
+	@GetMapping(API_PREFIX+"/findByWaybillId")
+	List<DistributionParcelListEntity> findByWaybillId(@RequestParam String waybillId);
 }

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

@@ -289,4 +289,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		}
 
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findByWaybillId(String waybillId) {
+		return distributionParcelListService.findByWaybillId(waybillId);
+	}
 }

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

@@ -169,4 +169,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     void updateTransferStatus(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("isTransfer") Integer isTransfer);
 
     List<Map<String, Integer>> selectAllErrorReservationOrder();
+
+	List<DistributionParcelListEntity> findByWaybillId(@Param("waybillNumber") String waybillNumber);
 }

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

@@ -1079,4 +1079,9 @@
         t GROUP BY reservation_id
     </select>
 
+    <select id="findByWaybillId" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        SELECT ldpl.* FROM logpm_distribution_parcel_list ldpl
+        WHERE ldpl.waybill_number = #{waybillNumber}
+    </select>
+
 </mapper>

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

@@ -175,7 +175,9 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId);
 
-
-
+	/**
+	 * 根据运单号找
+	 */
+	List<DistributionParcelListEntity> findByWaybillId(String waybillId);
 
 }

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

@@ -34,6 +34,7 @@ import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
+import com.logpm.distribution.mapper.DistributionParcelNumberMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionParcelListBaseVO;
@@ -708,6 +709,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return orderCodes;
 	}
 
+
+
 	/**
 	 * @param distributionParcelList 包件信息
 	 * @return
@@ -918,6 +921,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		}
 		return distributionStockArticleEntity;
 	}
-
+	@Override
+	public List<DistributionParcelListEntity> findByWaybillId(String waybillId) {
+		return baseMapper.findByWaybillId(waybillId);
+	}
 
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncServiceTypeController.java

@@ -27,7 +27,6 @@ public class SyncServiceTypeController {
 	private final ISyncServiceTypeService syncServiceTypeService;
 	@ResponseBody
 	@PostMapping("/change")
-	@ApiOperation(value = "分页", notes = "传入运单号，仓库名称，商店名称")
 	public R change(@RequestParam String id, @RequestParam String warehouseName, @RequestParam String mallName) {
 		syncServiceTypeService.syncServiceType(id, warehouseName, mallName);
 		return R.success("修改成功");

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java

@@ -15,6 +15,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springblade.core.log.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Objects;
 
 @Log4j2
@@ -26,24 +27,30 @@ public class SyncServiceTypeServiceImpl implements ISyncServiceTypeService {
 
 	@Override
 	public void syncServiceType(String id, String warehouseName, String mallName) {
-		//根据包件码查询出订单号
-		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(id);
-		if (distributionParcelListEntity==null){
-			throw new ServiceException("订单号不存在");
-		}
-		Long stockArticleId = distributionParcelListEntity.getStockArticleId();
-		//判断那个是仓库名称和商店名称谁是null
-		if (Objects.isNull(warehouseName) || warehouseName.isEmpty()){
-			//用订单和商店名称来操作  //修改商场名称 id  code  服务类型  收货单位
 
-			syncServiceTypeMapper.syncServiceTypeByMallName(stockArticleId,mallName);
+		//运单号查出包件码
 
-		}else if(Objects.isNull(mallName) || mallName.isEmpty()){
-			//用订单号和仓库名称来操作
-			syncServiceTypeMapper.syncServiceTypeByWarehouseName(stockArticleId,warehouseName);
-		}else {
-			throw new ServiceException("请传入仓库名称或商店名称");
+		List<DistributionParcelListEntity> parcelList = distributionParcelListClient.findByWaybillId(id);
+		if (parcelList==null || parcelList.size()==0){
+			throw new ServiceException("运单号不存在");
 		}
+		//根据包件码查询出订单号
+		for (DistributionParcelListEntity distributionParcelList : parcelList) {
+			Long stockArticleId = distributionParcelList.getStockArticleId();
+			if (Objects.nonNull(warehouseName)&& Objects.nonNull(mallName)){
+				// 用warehouseName 和 mallName 来操作
 
+			}else
+			//判断那个是仓库名称和商店名称谁是null
+			if (Objects.nonNull(mallName) ){
+				//用订单和商店名称来操作  //修改商场名称 id  code  服务类型  收货单位
+				syncServiceTypeMapper.syncServiceTypeByMallName(stockArticleId,mallName);
+			}else if(Objects.nonNull(warehouseName) ){
+				//用订单号和仓库名称来操作
+				syncServiceTypeMapper.syncServiceTypeByWarehouseName(stockArticleId,warehouseName);
+			}else {
+				throw new ServiceException("请传入仓库名称或商店名称");
+			}
+		}
 	}
 }