From d801158d546e8dafcca65bfd0c23102dd546cdd1 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Wed, 31 Jan 2024 13:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/controller/BackApplyController.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 16c7eaca..6f01d66b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -143,19 +143,11 @@ public class BackApplyController extends BaseController { if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { // 对领料任务表的对象做数据处理 BackApplyInfo backApplyInfo = bean.getBackApplyInfo(); -<<<<<<< HEAD - // 创建领料单号 - backApplyInfo.setCode(code); - // 设置任务ID - backApplyInfo.setTaskId(taskId); - // 设置设备所属分公司,用于交给哪家审核 -======= /* 创建领料单号*/ backApplyInfo.setCode(code); /*设置任务ID*/ backApplyInfo.setTaskId(taskId); /*设置设备所属分公司,用于交给哪家审核*/ ->>>>>>> origin/dev backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 创建领料任务，返回领料任务编号 @@ -166,11 +158,7 @@ public class BackApplyController extends BaseController { Long backApplyInfoId = backApplyInfo.getId(); if (StringUtils.isNotNull(backApplyInfoId)) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { -<<<<<<< HEAD - // 设置领料任务ID -======= /* 设置领料任务ID*/ ->>>>>>> origin/dev leaseApplyDetails.setId(backApplyInfoId); // 插入领料任务明细 boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;