chenlu
2024-09-06 3b57e97dc5180bf730357a93d5ded238a6ea80d1
流程卡多选删除
7个文件已修改
112 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -229,7 +229,7 @@
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td    colspan="29">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <div style="float: left;">补片单号:{{itemFlow.patch_id}}</div>
          <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡</div>
north-glass-erp/northglass-erp/src/lang/en.js
@@ -87,6 +87,7 @@
            deleteSuccess:'Deletion success',
            deleteFail:'Deletion failure',
            cancelReviewFail:'Review failure',
            cancelReviewFailWork:'Counter-audit failed please check whether to report',
            reviewFail:'Audit failure',
            noProductDataInTheTable:'There is no product data in the table',
            tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -83,6 +83,7 @@
            deleteSuccess:'Удалить успешно',
            deleteFail:'Ошибка удаления',
            cancelReviewFail:'Отменить проверку ошибка',
            cancelReviewFailWork:'Контрсудебное разбирательство не удалось',
            reviewFail:'Ошибка аудита',
            noProductDataInTheTable:'Данные о продуктах отсутствуют в таблице',
            tableDataExceedsMaximumLimit:'Данные таблицы превышают максимальный лимит',
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -257,7 +257,7 @@
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
    {title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
    {title: t('basicData.operate'), width: 90, slots: {default: 'button_slot'}, fixed: "left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
    {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -294,6 +294,7 @@
  toolbarConfig: {
    buttons: [
      {code: 'update', name: t('processCard.composing'), status: 'primary'},
      {code: 'delete', name: t('basicData.delete'), status: 'primary'},
    ],
    import: false,
    // export: true,
@@ -356,6 +357,43 @@
              } else {
                ElMessage.warning(t('basicData.msg.saveFail'))
              }
            })
          }
          return;
        }
        case 'delete': {
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if (selectRecords.length == 0) {
              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
              return;
            }
            //简化勾选的值
            const extractedData = selectRecords.map(item => ({
              orderId: item.orderId,
              processId: item.processId
            }));
            let composingData = ref({
              composing: extractedData,
              userId: user.user.userId,
              userName:user.user.userName
            })
            //多选删除流程卡
            request.post("/processCard/checkboxDelete", composingData.value).then((res) => {
              if (res.code == 200 && res.data === true) {
                ElMessage.success(t('basicData.msg.deleteSuccess'))
                router.push({
                  path: '/main/processCard/SelectProcessCard',
                  query: {random: Math.random()}
                })
              } else {
                ElMessage.warning(t('basicData.msg.deleteFail'))
              }
            })
@@ -447,11 +485,11 @@
        <!--        <el-button v-else-if="row.layoutStatus=='不可排版'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
        <!--        <el-button v-else-if="row.layoutStatus=='已排版'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
        <!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
        <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
          <template #reference>
            <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
<!--        <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
<!--          <template #reference>-->
<!--            <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
<!--          </template>-->
<!--        </el-popconfirm>-->
      </template>
      <template #num1_filter="{ column, $panel }">
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -343,5 +343,14 @@
        return Result.seccess(flowCardService.getProcessCard(processCards));
    }
    @ApiOperation("复选框删除流程卡")
    @SaCheckPermission("SelectProcessCard.delete")
    @PostMapping("/checkboxDelete")
    public Result checkboxDelete(
            @RequestBody Map<String, Object> object
    ) {
        return Result.seccess(flowCardService.checkboxDeleteSv(object));
    }
}
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -716,6 +716,52 @@
        return flowCardList;
    }
    public Boolean checkboxDeleteSv(Map<String, Object> object) {
        String userName = "";
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }
        String userId = "";
        if (object.get("userId") != null) {
            userId = object.get("userId").toString();
        }
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
            for (FlowCard flowCard : flowCardList) {
                Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
                if (count == 0) {
                    //修改分架状态
                    flowCardMapper.updateDeleteState(flowCard.getOrderId(), flowCard.getProcessId());
                    //删除报工流程明细表数据
                    flowCardMapper.deleteReportingWork(flowCard.getProcessId());
                    //删除分架明细
                    flowCardMapper.deleteFlowCardMp(flowCard.getOrderId(), flowCard.getProcessId());
                    //删除排序表数据
                    flowCardMapper.deleteflowCardSort(flowCard.getOrderId(), flowCard.getProcessId());
                    //判断该订单流程卡是否全部删除
                    Integer flowNumber = flowCardMapper.selectFlowCardCount(flowCard.getOrderId());
                    if (flowNumber == 0) {
                        //修改订单表分架状态为0,全部删除
                        flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 0);
                    } else {
                        //修改订单表分架状态为1,删除部分
                        flowCardMapper.updateProcessingCard(flowCard.getOrderId(), 1);
                    }
                    //保存日志
                    Log log = new Log();
                    log.setContent(flowCard.getOrderId()+flowCard.getProcessId());
                    log.setFunction("checkboxDeleteSv流程卡删除");
                    log.setOperatorId(userId);
                    log.setOperator(userName);
                    logService.saveLog(log);
                } else {
                    return false;
                }
            }
            return true;
    }
}
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1271,7 +1271,8 @@
               dd.responsible_team,
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               dd.responsible_personnel,
               #{mergeTechnologyNumber} as  mergeTechnologyNumber
               #{mergeTechnologyNumber} as  mergeTechnologyNumber,
               pl.patch_id
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and