diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java index efc24be8..bdb81419 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IOrderClient.java @@ -4,6 +4,7 @@ import org.springblade.core.launch.constant.AppConstant; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * 模具计划接口声明 @@ -22,6 +23,7 @@ public interface IOrderClient { String INIT_YIELD_ORDER_DAILY_ASSIGN = API_PREFIX + "/initYieldOrderDailyAssign"; String DATA_VERIFY = API_PREFIX + "/dataVerify"; + String CREATE_BLB_YIELD_ORDER = API_PREFIX + "/createBlbYieldOrder"; /** * 生成玻璃饼烧结计划并下达 @@ -52,4 +54,13 @@ public interface IOrderClient { @GetMapping(DATA_VERIFY) void dataVerify(); + /** + * 生成玻璃饼烧结计划并下达 + * + * @param yieldPlan + * @return + */ + @GetMapping(CREATE_BLB_YIELD_ORDER) + Boolean createBlbYieldOrder(@RequestParam("partCode")String partCode, @RequestParam("qty")Double qty, @RequestParam("memo")String memo); + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 3bf20dad..615a112f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -352,4 +352,12 @@ public class YieldOrderController extends BladeController { String code = yieldOrderService.generateMdCode(); return R.data(code); } + + /** + * 根据零件号获取工装 + */ + @GetMapping("/createBlbYieldOrder") + public R createBlbYieldOrder(@RequestParam String partCode,@RequestParam Double qty,@RequestParam String memo) { + return R.data(yieldOrderService.createBlbYieldOrder(partCode,qty,memo)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java index 5bb271be..fb028039 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java @@ -80,4 +80,9 @@ public class OrderClient implements IOrderClient { orderService.dataVerify(idList); } } + + @Override + public Boolean createBlbYieldOrder(String partCode, Double qty, String memo) { + return orderService.createBlbYieldOrder(partCode,qty,memo); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index 4b14c321..cd924352 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -293,4 +293,6 @@ public interface IYieldOrderService extends BaseService { List confirm(String cardNo,String mark); String generateMdCode(); + + boolean createBlbYieldOrder(String partCode,Double qty,String memo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 2905cae4..c28a770a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -1357,7 +1357,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl