Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IMoldDemandClient.java

@@ -1,7 +1,7 @@
 package org.springblade.desk.order.feign;
 
 import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.desk.order.pojo.entity.MoldApply;
+import org.springblade.desk.order.pojo.entity.MoldDemand;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -13,20 +13,20 @@ import org.springframework.web.bind.annotation.GetMapping;
 @FeignClient(
 	value = AppConstant.APPLICATION_DESK_NAME
 )
-public interface IMoldApplyClient {
+public interface IMoldDemandClient {
 
-	String API_PREFIX = "/feign/moldApply/";
+	String API_PREFIX = "/feign/moldDemand/";
 
-	String SAVE_BY_DEMAND = API_PREFIX + "/saveByDemand";
+	String SAVE = API_PREFIX + "/save";
 
 
 	/**
 	 * 生成模具计划
 	 *
-	 * @param moldApply
+	 * @param moldDemand
 	 * @return
 	 */
-	@GetMapping(SAVE_BY_DEMAND)
+	@GetMapping(SAVE)
-	Boolean saveByDemand(MoldApply moldApply);
+	Boolean save(MoldDemand moldDemand);
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/MoldApplyClient.java

@@ -1,53 +0,0 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
-package org.springblade.desk.order.feign;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import lombok.RequiredArgsConstructor;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.desk.order.pojo.entity.MoldApply;
-import org.springblade.desk.order.service.IMoldApplyService;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Feign 排产相关定时任务接口
- *
- * @author Chill
- */
-@NonDS
-@Hidden()
-@RestController
-@RequiredArgsConstructor
-public class MoldApplyClient implements IMoldApplyClient {
-
-	private final IMoldApplyService moldApplyService;
-
-
-	@Override
-	public Boolean saveByDemand(MoldApply moldApply) {
-		return moldApplyService.saveByDemand(moldApply);
-	}
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/MoldDemandClient.java

@@ -0,0 +1,29 @@
+package org.springblade.desk.order.feign;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.desk.order.pojo.entity.MoldDemand;
+import org.springblade.desk.order.service.IMoldDemandService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Feign 排产相关定时任务接口
+ *
+ * @author Chill
+ */
+@NonDS
+@Hidden()
+@RestController
+@RequiredArgsConstructor
+public class MoldDemandClient implements IMoldDemandClient {
+
+	private final IMoldDemandService moldDemandService;
+
+	@Override
+	@PostMapping(SAVE)
+	public Boolean save(MoldDemand moldDemand) {
+		return moldDemandService.save(moldDemand);
+	}
+}