Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java

@@ -52,6 +52,9 @@ public interface IWarehouseWaybillClient {
 	@GetMapping(API_PREFIX + "/findByWaybillNo")
 	WarehouseWaybillEntity findByWaybillNo(@RequestParam("waybillNo") String waybillNo);
 
+	@GetMapping(API_PREFIX + "/findByWaybillId")
+	WarehouseWaybillEntity findByWaybillId(@RequestParam("waybillId") Long waybillId);
+
 	@PostMapping(API_PREFIX + "/addEnntity")
 	void addEnntity(@RequestBody WarehouseWaybillEntity warehouseWaybill);
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java

@@ -37,6 +37,11 @@ public class WarehouseWaybillClient implements IWarehouseWaybillClient {
 		return warehouseWaybillService.findByWaybillNo(waybillNo);
 	}
 
+	@Override
+	public WarehouseWaybillEntity findByWaybillId(Long waybillId) {
+		return warehouseWaybillService.getById(waybillId);
+	}
+
 	@Override
 	@PostMapping(API_PREFIX + "/addEnntity")
 	public void addEnntity(WarehouseWaybillEntity warehouseWaybill) {