新购入库问题修改

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);
+            TmTask task = new TmTask();
-            if (count1>0){
+            task.setTaskId(taskId);
-                TmTask task = new TmTask();
+            task.setTaskStatus(28);
-                task.setTaskId(taskId);
+            task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
-                task.setTaskStatus(28);
+            task.setUpdateTime(DateUtils.getNowDate());
-                task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+            taskMapper.updateTmTask(task);
-                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);
-            }
         }
-//        // 当全部审核的时候任务改为入库状态
-//        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;
     }
 

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.check_result='通过'
-        AND (
+--         and pcd.status !=3
-        (pcd.bind_num IS NULL OR pcd.bind_num = 0) AND pcd.STATUS != 5
+--         AND (
-        OR (pcd.bind_num IS NOT NULL AND pcd.bind_num != 0)
+--         (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)
+--         )
         <if test="taskId != null ">and pcd.task_id = #{taskId}</if>
         <if test="keyWord != null and keyWord != ''">and (mt.type_name like concat('%',#{keyWord},'%')
             or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -101,7 +101,10 @@
           <span v-if="scope.row.status==1">已验收</span>
           <span v-if="scope.row.status==2">待通知</span>
           <span v-if="scope.row.status==3">验收不通过</span>
-          <span v-if="scope.row.status==4">已入库</span>
+          <span v-if="scope.row.status==4">已审核</span>
+          <span v-if="scope.row.status==5">已审核</span>
+          <span v-if="scope.row.status==6">入库待审核</span>
+          <span v-if="scope.row.status==7">已审核</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -336,7 +339,7 @@
               @click="addUser(scope.row)"
             >添加</el-button>
 
-          </template> 
+          </template>
         </el-table-column>-->
       </el-table>
 
@@ -853,4 +856,4 @@ export default {
     display: none;
   }
 }
-</style>
+</style>

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 != '待审核'
                         "

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue

@@ -134,8 +134,8 @@
                     <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
                     <span v-if="scope.row.taskStatus == '105'">入库待审核</span>
                     <span v-if="scope.row.taskStatus == '106'">已驳回</span>
-                    <span v-if="scope.row.taskStatus == '28'">已入库</span>
+                    <span v-if="scope.row.taskStatus == '28'">已审核</span>
-                    <span v-if="scope.row.taskStatus == '107'">入库驳回</span>
+                    <span v-if="scope.row.taskStatus == '107'">已审核</span>
                 </template>
             </el-table-column>
             <el-table-column

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue

@@ -142,7 +142,7 @@
             <el-table-column label="状态" align="center" prop="taskStatus">
                 <template slot-scope="scope">
                     <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
-                    <span v-if="scope.row.taskStatus == '28'">已入库</span>
+                    <span v-if="scope.row.taskStatus == '28'">已审核</span>
                     <span v-if="scope.row.taskStatus == '105'">待审核</span>
                     <span v-if="scope.row.taskStatus == '107'">已驳回</span>
                 </template>