From 05d4e08f4ab88ccc07611f4bb619ce36326f444e Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 23 Apr 2024 13:13:48 +0800
Subject: [PATCH 1/7] =?UTF-8?q?tomcat=E7=89=88=E6=9C=AC=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5e9d8d3..fa825fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-core</artifactId>
-                <version>9.0.81</version>
+                <version>9.0.86</version>
                 <scope>compile</scope>
                 <exclusions>
                     <exclusion>

From 6e6420c65c3fb18840190ee61688a89557d060a2 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 23 Apr 2024 13:44:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constructionSite/constructionSite.vue            |  2 ++
 .../views/claimAndRefund/receive/receiveApply.vue    |  2 ++
 .../claimAndRefund/receiveByCq/receiveApply.vue      |  2 ++
 .../store/newBuy/newDevices/newDevicesAccept.vue     |  1 -
 .../newBuy/newDevices/newDevicesWarehousing.vue      | 12 ++++++------
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
index 0f69eefc..b2bd6e9b 100644
--- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
@@ -543,6 +543,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.unitId = ''
+      this.queryParams.lotId  = ''
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index faa467ad..85d6af43 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -415,6 +415,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index 40b8f62a..14918e39 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -431,6 +431,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index 519abcbf..3ff849fb 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -227,7 +227,6 @@
             :autosize="{ minRows: 4, maxRows: 6}"
             placeholder="请输入通知内容"
             style="width: 80%;"
-            disabled
           />
         </el-form-item>
       </el-form>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 9201f191..7c8a8773 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -290,7 +290,7 @@
                         "
           >入库单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -300,7 +300,7 @@
                             "
             >
               <span>工程名称：</span>
-            </div>
+            </div> -->
             <div
               class="item"
               style="
@@ -312,7 +312,7 @@
             >
               <span>日期：</span>
             </div>
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -322,8 +322,8 @@
                             "
             >
               <span>领料单号</span>
-            </div>
-            <div
+            </div> -->
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -333,7 +333,7 @@
                             "
             >
               <span>车辆信息：</span>
-            </div>
+            </div> -->
           </div>
           <el-table
             :data="printTableData"

From d2d9f5b6c423fd0cbf265dd912ea0c8291956573 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 23 Apr 2024 14:35:31 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 309ebc4d..8e9334d1 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -126,7 +126,7 @@
             size="mini"
             type="primary"
             @click="handleNumReturn(scope.row)"
-            v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.num>0"
+            v-if="!isView&&(scope.row.manageType=='1'||scope.row.manageType=='2')&&scope.row.num>0"
           >数量退料</el-button>
           <el-button
             size="mini"

From 2ef3d4dbe497c5db6e70283e46d3b75830a2e262 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 23 Apr 2024 14:53:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E7=BC=96=E7=A0=81=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 8e9334d1..1abaebf2 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -810,7 +810,7 @@ export default {
         let arr = [
           {
             parentId: this.codeQuery.parentId,
-            typeId: row.modelId,
+            typeId: row.typeId,
             backNum: 1,
             backStatus: type,
             manageType: 0,

From ae0b637828fbbd95c0dd9817bf3f630973168fde Mon Sep 17 00:00:00 2001
From: jackal <13856223047@163.com>
Date: Tue, 23 Apr 2024 16:16:08 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E8=B4=AD=E5=B7=A5?=
 =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=85=A5=E5=BA=93=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newDevices/newDevicesWarehousing.vue      | 268 ++++--------------
 sgzb-ui/vue.config.js                         |   6 +-
 2 files changed, 59 insertions(+), 215 deletions(-)

diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 7c8a8773..c4912952 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -1,37 +1,14 @@
 <template>
   <div class="app-container" id="newDevicesWarehousing">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="关键字" prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="设备类型" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择设备类型"
-          clearable
-          filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="typeItem in typesList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
+        <el-select v-model="queryParams.typeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
+          <el-option v-for="typeItem in typesList" :key="typeItem.typeId" :label="typeItem.typeName"
+            :value="typeItem.typeId" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -42,14 +19,8 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:dict:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -57,62 +28,15 @@
     <el-table v-loading="loading" :data="tableList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" width="55px" />
-      <el-table-column
-        label="采购单号"
-        align="center"
-        prop="code"
-        :show-overflow-tooltip="true"
-        width="160"
-      />
-      <el-table-column
-        label="采购日期"
-        align="center"
-        prop="purchaseTime"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="到货日期"
-        align="center"
-        prop="arrivalTime"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="采购机具设备"
-        align="center"
-        prop="purchasingTypeName"
-        :show-overflow-tooltip="true"
-        width="250"
-      />
-      <el-table-column
-        label="采购员"
-        align="center"
-        prop="purchaserName"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="入库人员"
-        align="center"
-        prop="updateBy"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="入库时间"
-        align="center"
-        prop="updateTime"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column
-        label="发布时间"
-        align="center"
-        prop="createTime"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
+      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" width="160" />
+      <el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true"
+        width="250" />
+      <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="taskStatus">
         <template slot-scope="scope">
@@ -127,54 +51,25 @@
         <template slot-scope="scope">
           <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
 
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            v-if="
-                            scope.row.taskStatus == '26' ||
-                            scope.row.taskStatus == '105'
-                        "
-            @click="handleUpdate(scope.row)"
-          >审核</el-button>
-          <el-button
-            size="mini"
-            type="info"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus == '28'"
-            @click="handlePrint(scope.row)"
-          >入库单</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-edit" v-if="
+            scope.row.taskStatus == '26' ||
+            scope.row.taskStatus == '105'
+          " @click="handleUpdate(scope.row)">审核</el-button>
+          <el-button size="mini" type="info" icon="el-icon-edit" v-if="scope.row.taskStatus == '28'"
+            @click="handlePrint(scope.row)">入库单</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!--审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form
-        :model="query"
-        ref="query"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="68px"
-      >
+      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="关键字" prop="dictName">
-          <el-input
-            v-model="query.dictName"
-            placeholder="请输入关键字"
-            clearable
-            maxlength="50"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="query.dictName" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
 
         <el-form-item>
@@ -200,95 +95,53 @@
         <!--          >导出</el-button>-->
         <!--        </el-col>-->
       </el-row>
-      <el-table
-        v-loading="loading"
-        :data="detailTableList"
-        @selection-change="handleSelectionChange"
-        height="400"
-      >
+      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
         <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="规格型号"
-          align="center"
-          prop="specificationType"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
         <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="编号"
-          align="center"
-          prop="maCode"
-          :show-overflow-tooltip="true"
-          width="200"
-        />
+        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200" />
         <el-table-column label="管理模式" align="center" prop="manageType">
           <template slot-scope="scope">
-            <span v-if="scope.row.manageType=='0'">编码管理</span>
-            <span v-if="scope.row.manageType=='1'">数量管理</span>
+            <span v-if="scope.row.manageType == '0'">编码管理</span>
+            <span v-if="scope.row.manageType == '1'">数量管理</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <span v-if="scope.row.status=='0'">未入库</span>
-            <span v-if="scope.row.status=='1'">已入库</span>
-            <span v-if="scope.row.status=='2'">已驳回</span>
+            <span v-if="scope.row.status == '0'">未入库</span>
+            <span v-if="scope.row.status == '1'">已入库</span>
+            <span v-if="scope.row.status == '2'">已驳回</span>
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          v-if="showHandle"
-          width="150"
-        >
-          <template
-            slot-scope="scope"
-            v-if="
-                            scope.row.manageType == '1' ||
-                            (scope.row.manageType == '0' && scope.row.maCode)
-                        "
-          >
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == '0'"
-              @click="pass(scope.row)"
-            >通过</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == '0'"
-              @click="refused(scope.row)"
-            >不通过</el-button>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
+          <template slot-scope="scope" v-if="
+            scope.row.manageType == '1' || scope.row.manageType == '2' ||
+            (scope.row.manageType == '0' && scope.row.maCode)
+          ">
+            <el-button size="mini" type="text" v-if="scope.row.status == '0'" @click="pass(scope.row)">通过</el-button>
+            <el-button size="mini" type="text" v-if="scope.row.status == '0'"
+              @click="refused(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination
-        v-show="dialogTotal > 0"
-        :total="dialogTotal"
-        :page.sync="query.pageNum"
-        :limit.sync="query.pageSize"
-        @pagination="getDialogTable"
-      />
+      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
+        @pagination="getDialogTable" />
     </el-dialog>
 
     <!-- 入库单弹窗 -->
     <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
       <div style="height: 600px; overflow-y: scroll">
         <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-          <div
-            class="title"
-            style="
+          <div class="title" style="
                             text-align: center;
                             font-weight: 600;
                             font-size: 16px;
-                        "
-          >入库单</div>
+                        ">入库单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
             <!-- <div
               class="item"
@@ -301,15 +154,12 @@
             >
               <span>工程名称：</span>
             </div> -->
-            <div
-              class="item"
-              style="
+            <div class="item" style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
-                            "
-            >
+                            ">
               <span>日期：</span>
             </div>
             <!-- <div
@@ -335,16 +185,11 @@
               <span>车辆信息：</span>
             </div> -->
           </div>
-          <el-table
-            :data="printTableData"
-            class="table"
-            style="
+          <el-table :data="printTableData" class="table" style="
                             margin-top: 20px;
                             padding-bottom: 1px;
                             padding-right: 1px;
-                        "
-            border
-          >
+                        " border>
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="类型名称" align="center" prop="typeName" />
@@ -355,14 +200,11 @@
             <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
           </el-table>
 
-          <div
-            class="fillIn"
-            style="
+          <div class="fillIn" style="
                             margin-top: 20px;
                             display: flex;
                             justify-content: space-between;
-                        "
-          >
+                        ">
             <div class="item" style="width: 25%">
               <span>审核：</span>
             </div>
@@ -711,6 +553,7 @@ export default {
     font-weight: 600;
     font-size: 16px;
   }
+
   .info {
     margin-top: 10px;
     display: flex;
@@ -730,6 +573,7 @@ export default {
     justify-content: space-between;
   }
 }
+
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
   margin-bottom: 10px;
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 7520d4d8..7bdc90ee 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -35,14 +35,14 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target:  `http://112.29.103.165:21626`,//线上环境-重庆
+        // target: `http://112.29.103.165:21626`, //线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-        target: `http://192.168.0.14:21624`,//测试环境
+        // target: `http://192.168.0.14:21624`, //测试环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`, //超
+        target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.153:8080`, //帅

From 5490fd2e8f5bbb5dda12f2a15ba1c9bc4d2517f2 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 23 Apr 2024 17:36:00 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=88=90=E5=A5=97=E6=8A=B1=E6=9D=86?=
 =?UTF-8?q?=E6=9C=BA=E5=85=B7=E9=AA=8C=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/material/domain/MachinePart.java   |  1 +
 .../material/mapper/PurchaseMacodeInfoMapper.java |  3 +++
 .../impl/PurchaseMacodeInfoServiceImpl.java       | 15 +++++++++++++++
 .../mapper/material/PurchaseCheckInfoMapper.xml   |  1 +
 .../mapper/material/PurchaseMacodeInfoMapper.xml  |  4 ++++
 5 files changed, 24 insertions(+)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java
index 04cb1536..e168051d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java
@@ -12,4 +12,5 @@ public class MachinePart {
     private String unitName;
     private String typeName;
     private Integer partNum;
+    private Integer typeId;
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
index 44f617af..37ede482 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
@@ -7,6 +7,7 @@ import com.bonus.sgzb.base.api.domain.MaMachineLabel;
 import com.bonus.sgzb.base.api.domain.MaType;
 import com.bonus.sgzb.material.domain.InputApplyDetails;
 import com.bonus.sgzb.material.domain.MaInputRecord;
+import com.bonus.sgzb.material.domain.MachinePart;
 import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -277,4 +278,6 @@ public interface PurchaseMacodeInfoMapper {
      * @return
      */
     int selectPurchaseCheckDetailsStatus(Long taskId);
+
+    int updateMaTypeNum(MachinePart wholeSetDetail);
 }
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 f2c31785..bfef04db 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
@@ -13,6 +13,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.*;
 import com.bonus.sgzb.material.mapper.*;
+import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
 import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
@@ -39,6 +40,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     @Resource
     private TaskMapper taskMapper;
 
+    @Autowired
+    private IPurchaseCheckInfoService purchaseCheckInfoService;
+
     @Resource
     private BmQrcodeInfoMapper qrcodeInfoMapper;
 
@@ -298,6 +302,17 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                         .add(maType.getNum() == null ? new BigDecimal(0) : maType.getNum()));
                 purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
 
+                //判断是否是成套机具，是的话配件库存也要增加
+                if ("2".equals(maType.getManageType())){
+                    PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo();
+                    purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString());
+                    purchaseCheckInfo.setTypeId(maInputRecord.getTypeId());
+                    List<MachinePart> wholeSetDetails = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo);
+                    for (MachinePart wholeSetDetail : wholeSetDetails) {
+                        purchaseMacodeInfoMapper.updateMaTypeNum(wholeSetDetail);
+                    }
+                }
+
                 BigDecimal inputNum = checkDetailsMapper.selectInputNumByTypeId(taskId, typeId);
                 PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
                 purchaseCheckDetails.setTaskId(taskId);
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index e097c7a1..649bc681 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -312,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getWholeSetDetails" resultType="com.bonus.sgzb.material.domain.MachinePart">
         SELECT
             mt2.type_name AS typeModelName,
+            mt2.type_id as typeId,
             mt3.type_name AS typeName,
             aa.part_num * #{purchaseNum} AS partNum,
             mt2.unit_name as unitName
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index ee665c61..05a64e5b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -534,4 +534,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and type_id = #{typeId}
           and ma_code = #{maCode}
     </update>
+    <update id="updateMaTypeNum">
+        UPDATE ma_type
+        SET num = ifnull( num, 0 ) + #{partNum} WHERE type_id = #{typeId}
+    </update>
 </mapper>
\ No newline at end of file

From 82e8a6db4ab0f4d3f3828b3b47667012e6f30758 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Wed, 24 Apr 2024 14:05:18 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/BackReceiveController.java |  2 +-
 .../bonus/sgzb/app/domain/BackApplyInfo.java  |  1 +
 .../sgzb/app/mapper/BackReceiveMapper.java    |  2 ++
 .../app/mapper/LeaseOutDetailsMapper.java     |  2 ++
 .../sgzb/app/service/BackReceiveService.java  |  2 ++
 .../service/impl/BackReceiveServiceImpl.java  | 32 +++++++++++++++----
 .../impl/LeaseOutDetailsServiceImpl.java      | 18 ++++++++---
 .../mapper/app/BackReceiveMapper.xml          | 26 +++++++++++++++
 .../mapper/app/LeaseOutDetailsMapper.xml      |  7 ++--
 .../material/PurchaseCheckInfoMapper.xml      |  4 +--
 10 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index 01851002..30394be8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -278,7 +278,7 @@ public class BackReceiveController extends BaseController {
     @PostMapping("backReceiveRecordWeb")
     public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) {
         try {
-            List<BackApplyInfo> list = backReceiveService.backReceiveRecord(record);
+            List<BackApplyInfo> list = backReceiveService.backReceiveRecordWeb(record);
             Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
             Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
             return AjaxResult.success(ListPagingUtil.paging(pageIndex,pageSize, list));
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
index 4ee721dc..3c108b28 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
@@ -21,6 +21,7 @@ public class BackApplyInfo {
      */
     private String userName;
     private String badId;
+    private String[] typeIds;
 
     @Excel(name = "退料状态",sort = 9)
     private String taskName;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
index a8d6b0e0..1254e837 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
@@ -198,4 +198,6 @@ public interface BackReceiveMapper {
     int selectNumByTypeId(@Param("parentId")Integer parentId,@Param("typeId") String typeId);
 
     int selectTaskStatus(int taskId);
+
+    BackApplyInfo backReceiveRecordWeb(BackApplyInfo record);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java
index 47b392e5..89e7e4dc 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java
@@ -99,4 +99,6 @@ public interface LeaseOutDetailsMapper {
     MachinePart getMachineParts(TmTask typeId);
 
     int updateMaTypeStockNumCt(TmTask record);
+
+    int getmaChineByCt(LeaseOutDetails record);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
index 10e057b7..634fc3c9 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
@@ -95,4 +95,6 @@ public interface BackReceiveService {
     List<TmTask> getRecord(TmTask task);
 
     int revoke(BackApplyInfo record);
+
+    List<BackApplyInfo> backReceiveRecordWeb(BackApplyInfo record);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index a04958fd..94058fd7 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -83,10 +83,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
             if (res == 0) {
                 throw new RuntimeException("插入back_check_details异常");
             }
-         /*   int insSltInfoNum = insSltInfo(lTask.getAgreementId().toString(), leaseOutDetail);
-            if (insSltInfoNum < 1) {
-                return res;
-            }*/
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage());
         }
@@ -115,7 +111,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                         break;
                     }
                     //根据maId和taskId查询是否已接收
-                     re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
+                    re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
                     if (re > 0) {
                         res = -1;
                         break;
@@ -325,6 +321,21 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return res;
     }
 
+    @Override
+    public List<BackApplyInfo> backReceiveRecordWeb(BackApplyInfo record) {
+        String typeId = record.getTypeId();
+        String[] split = typeId.split(",");
+        List<BackApplyInfo> backApplyInfoList = new ArrayList<>();
+        for (String s : split) {
+            record.setTypeId(s);
+            BackApplyInfo backApplyInfo = backReceiveMapper.backReceiveRecordWeb(record);
+            if (backApplyInfo != null) {
+                backApplyInfoList.add(backApplyInfo);
+            }
+        }
+        return backApplyInfoList;
+    }
+
     private int insertRad(int taskId, List<BackApplyInfo> wxList) {
         int result = 0;
         if (wxList != null) {
@@ -452,8 +463,17 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     //机具状态变为在用
                     backReceiveMapper.updateMaStatus(s, "16");
                 }
+                res = backReceiveMapper.deleteCheckDetails(record);
+            } else if ("2".equals(manageType)) {
+                String[] split = record.getTypeIds();
+                for (String s : split) {
+                    record.setTypeId(s);
+                    res = backReceiveMapper.deleteCheckDetails(record);
+                }
+            } else {
+                res = backReceiveMapper.deleteCheckDetails(record);
             }
-            res = backReceiveMapper.deleteCheckDetails(record);
+
         }
 
         return res;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index 66052870..e8182fdb 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -158,7 +158,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
                 if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) {
                     record.setOutNum(record.getInputNum().doubleValue());
                 }
-                //2、判断库存是否足够
+                //2、判断成套机具出库库存是否足够
                 if (record.getManageType() == 2) {
                     res = checkStorageNumCt(record);
                     if (res == 0) {
@@ -206,8 +206,10 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             // 插入领料出库明细表（lease_out_details）
             res = leaseOutDetailsMapper.insertSelective(record);
             if (res > 0) {
-                if (record.getManageType() == 2){
+                if (record.getManageType() == 2) {
                     // 成套机具减少 (ma_type 设备规格表)的库存数量
+                    res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
+                    // 成套机具减少 (ma_type 设备规格表)配件的库存数量
                     List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
                     typeIds.removeIf(item -> item == null);
                     for (TmTask typeId : typeIds) {
@@ -216,7 +218,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
                         typeId.setNum(machinePart.getNum() - machinePart.getPartNum());
                         res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId);
                     }
-                }else {
+                } else {
                     // 普通机具减少 (ma_type 设备规格表)的库存数量
                     res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
                 }
@@ -268,14 +270,20 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
     }
 
     private int checkStorageNumCt(LeaseOutDetails record) {
+        int res = 0;
         double outNum = 0.1;
         if (StringUtils.isNull(record)) {
-            return 0;
+            return res;
         }
 
         if (record.getOutNum() == null || record.getOutNum() < outNum) {
             record.setOutNum(0.00);
         }
+        //先判断成套机具的库存是否足够
+        int num = leaseOutDetailsMapper.getmaChineByCt(record);
+        if (num < record.getOutNum()) {
+            return res;
+        }
         //判断(ma_type 设备规格表)中的库存够不够出库的
         List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
         typeIds.removeIf(item -> item == null);
@@ -283,7 +291,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId);
             machinePart.setPartNum((int) (typeId.getPartNum() * record.getOutNum()));
             if (machinePart.getNum() < machinePart.getPartNum()) {
-                return 0;
+                return res;
             }
         }
         return 1;
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 48ef85a8..62f1348a 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -959,4 +959,30 @@
       ) res
     HAVING backNum > -1
   </select>
+  <select id="backReceiveRecordWeb" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+    mt2.type_name AS typeName,
+    mt1.type_name AS typeCode,
+    ifnull(sum( bcd.back_num ), 0) AS backNum,
+    mm.ma_code as maCode,
+    bcd.create_time AS backTime,
+    bcd.type_id as modelId,
+    bcd.back_status AS backStatus
+    FROM
+    back_check_details bcd
+    LEFT JOIN ma_type mt1 ON mt1.type_id = bcd.type_id
+    LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+    LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
+    WHERE
+    bcd.parent_id = #{parentId}
+    AND bcd.type_id = #{typeId}
+    <if test="maCode != null and maCode != ''">
+      and mm.ma_code like concat('%', #{maCode}, '%')
+    </if>
+    GROUP BY
+    bcd.type_id
+    ORDER BY
+    bcd.create_time DESC
+  </select>
+
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
index c1f3214f..e476aa13 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
@@ -303,7 +303,7 @@
         UPDATE
             ma_type
         SET
-            num = num - #{num} ,update_time = NOW()
+            num = #{num} ,update_time = NOW()
         WHERE
             type_id = #{typeId}
     </update>
@@ -412,7 +412,7 @@
         SELECT
             mt.type_name AS typeModelName,
             mt.unit_name as unitName,
-            mt.num as num,
+            ifnull(mt.num , 0) as num,
             m2.type_name As typeName
         FROM
             ma_type mt
@@ -420,4 +420,7 @@
         WHERE
             mt.type_id = #{typeId}
     </select>
+    <select id="getmaChineByCt" resultType="java.lang.Integer">
+        select num from ma_type WHERE type_id = #{typeId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 649bc681..ac6cffa5 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -330,8 +330,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     mt.type_id = #{typeId}
             ) aa ON aa.type_id = mt2.type_id
         <if test="keyWord != null  and keyWord != ''">
-           WHERE mt2.type_name like concat('%', #{keyWord}, '%')
+           WHERE (mt2.type_name like concat('%', #{keyWord}, '%')
+           or mt3.type_name like concat('%', #{keyWord}, '%'))
         </if>
-
     </select>
 </mapper>
\ No newline at end of file