From 273780187a5016ccc2eb862d1ce2acf2adc27f9e Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 13 Apr 2024 13:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseMacodeInfoServiceImpl.java | 36 ++++--------------- .../material/PurchaseCheckDetailsMapper.xml | 11 +++--- .../newBuy/newDevices/newDevicesAccept.vue | 9 +++-- .../newBuy/newDevices/newDevicesList.vue | 3 ++ .../newDevicesServiceCenterList.vue | 4 +-- .../newDevices/newDevicesWarehousing.vue | 2 +- 6 files changed, 25 insertions(+), 40 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 0fe434e2..f2c31785 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -336,39 +336,17 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId); } } - //判断是否全部已操作（通过或不通过） int count=purchaseMacodeInfoMapper.isOperateAll(taskId); if (count<=0){ - //是否为全部不通过 - int count1 = purchaseMacodeInfoMapper.selectPurchaseCheckDetailsStatus(taskId); - if (count1>0){ - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); - }else { - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(107); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); - } + //全部审核任务状态改为已审核 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(28); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); } -// // 当全部审核的时候任务改为入库状态 -// Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId); -// if (count <= 0) { -// TmTask task = new TmTask(); -// task.setTaskId(taskId); -// task.setTaskStatus(28); -// task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); -// task.setUpdateTime(DateUtils.getNowDate()); -// taskMapper.updateTmTask(task); -// } - return 1; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 95caa111..82af489c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -227,11 +227,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id left join tm_task tk on pcd.task_id = tk.task_id where 1=1 - and pcd.status !=3 - AND ( - (pcd.bind_num IS NULL OR pcd.bind_num = 0) AND pcd.STATUS != 5 - OR (pcd.bind_num IS NOT NULL AND pcd.bind_num != 0) - ) + and pcd.check_result='通过' +-- and pcd.status !=3 +-- AND ( +-- (pcd.bind_num IS NULL OR pcd.bind_num = 0) AND pcd.STATUS != 5 +-- OR (pcd.bind_num IS NOT NULL AND pcd.bind_num != 0) +-- ) and pcd.task_id = #{taskId} and (mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord})) diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index df761c42..a57503be 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -101,7 +101,10 @@ 已验收 待通知 验收不通过 - 已入库 + 已审核 + 已审核 + 入库待审核 + 已审核 添加 - + --> @@ -853,4 +856,4 @@ export default { display: none; } } - \ No newline at end of file + diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue index d8bee5cc..9a92fc7d 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue @@ -217,6 +217,7 @@ icon="el-icon-edit" v-if=" scope.row.purchasingStatus != '已入库' && + scope.row.purchasingStatus != '已审核' && scope.row.purchasingStatus != '已验收合格' && scope.row.purchasingStatus != '待审核' && scope.row.purchasingStatus != '驳回' @@ -243,6 +244,7 @@ v-if=" scope.row.purchasingStatus == '已验收合格' || scope.row.purchasingStatus == '已入库' || + scope.row.purchasingStatus == '已审核' || scope.row.purchasingStatus == '待审核' " @click="handlePrint(scope.row)" @@ -255,6 +257,7 @@ icon="el-icon-delete" v-if=" scope.row.purchasingStatus != '已入库' && + scope.row.purchasingStatus != '已审核' && scope.row.purchasingStatus != '已验收合格' && scope.row.purchasingStatus != '待审核' " diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue index 9377b4ce..92b2e7a8 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue @@ -134,8 +134,8 @@ 已验收合格 入库待审核 已驳回 - 已入库 - 入库驳回 + 已审核 + 已审核