订单接收-sjx

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<YieldOrderCraft> list = yieldOrderService.confirm(cardNo);
+	public R confirm(@Parameter(description = "流程卡号", required = true) @RequestParam String cardNo,
+					 @Parameter(description = "是否场内", required = true) @RequestParam String mark) {
+		List<YieldOrderCraft> list = yieldOrderService.confirm(cardNo,mark);
 		return R.data(list);
 	}
 

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

@@ -289,5 +289,5 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 
 	void calculateCoatingMaterial();
 
-	List<YieldOrderCraft> confirm(String cardNo);
+	List<YieldOrderCraft> confirm(String cardNo,String mark);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -1038,9 +1038,12 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	}
 
 	@Override
-	public List<YieldOrderCraft> confirm(String cardNo) {
+	public List<YieldOrderCraft> confirm(String cardNo,String mark) {
 		YieldOrder yieldOrder = this.getOne(Wrappers.<YieldOrder>lambdaQuery().eq(YieldOrder::getCardNo,cardNo));
 		if(yieldOrder != null){
+			if("1".equals(mark)){
+				yieldOrder.setSiteWork(true);
+			}
 			boolean result = this.verifyYieldOrderResource(yieldOrder);
 			if(result){
 				List<YieldOrderCraft> list = yieldOrderCraftService.list(Wrappers.<YieldOrderCraft>lambdaQuery().eq(YieldOrderCraft::getYoId,yieldOrder.getId()));