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 9103eeda..d3a31686 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 @@ -185,8 +185,9 @@ public class YieldOrderController extends BladeController { */ @PostMapping("/confirm") @Operation(summary = "订单接收", description = "传入流程卡号") - public R confirm(@Parameter(description = "流程卡号", required = true) @RequestParam String cardNo) { - List list = yieldOrderService.confirm(cardNo); + public R confirm(@Parameter(description = "流程卡号", required = true) @RequestParam String cardNo, + @Parameter(description = "是否场内", required = true) @RequestParam String mark) { + List list = yieldOrderService.confirm(cardNo,mark); return R.data(list); } 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 07762700..31ff31eb 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 @@ -289,5 +289,5 @@ public interface IYieldOrderService extends BaseService { void calculateCoatingMaterial(); - List confirm(String cardNo); + List confirm(String cardNo,String mark); } 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 ea7834c4..cf2ce44c 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 @@ -1038,9 +1038,12 @@ public class YieldOrderServiceImpl extends BaseServiceImpl confirm(String cardNo) { + public List confirm(String cardNo,String mark) { YieldOrder yieldOrder = this.getOne(Wrappers.lambdaQuery().eq(YieldOrder::getCardNo,cardNo)); if(yieldOrder != null){ + if("1".equals(mark)){ + yieldOrder.setSiteWork(true); + } boolean result = this.verifyYieldOrderResource(yieldOrder); if(result){ List list = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraft::getYoId,yieldOrder.getId()));