From a811972fc57492c111291d33d693f3323b21b667 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Wed, 12 Jun 2024 13:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/scm/WorkOrderMapper.xml  |  4 +-
 .../service/impl/WorkOrderServiceImpl.java    | 10 ++++
 .../java/jnpf/entity/WorkOrderEntity.java     |  3 ++
 .../model/workorder/WorkOrderPagination.java  |  4 ++
 .../jnpf-web/src/views/scm/bom/index.vue      |  2 +-
 .../src/views/scm/contractLMonitor/index.vue  | 53 ++++++++++++-------
 .../src/views/scm/inventory/index.vue         | 10 ++--
 .../src/views/scm/workorder/index.vue         | 11 +++-
 8 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
index 622a2c0e..e509a545 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
@@ -38,7 +38,7 @@
         <result column="f_last_modify_time" property="lastModifyTime"></result>
         <result column="f_last_modify_user_id" property="lastModifyUserId"></result>
         <result column="realName" property="realName"></result>
-
+        <result column="productName" property="productName"></result>
     </resultMap>
 
 
@@ -105,6 +105,8 @@
         LEFT JOIN jg_business_line b ON a.businessfactory_id = b.id
         LEFT JOIN jg_business_line c ON a.business_id = c.id
         LEFT JOIN base_user d ON a.f_creator_user_id = d.f_id
+        LEFT JOIN jg_product e ON a.product_id = e.id
+
         ${ew.customSqlSegment}
         GROUP BY
         a.id
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
index 213c4a3c..7bc46717 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
@@ -245,6 +245,16 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
             }
 
+            if(ObjectUtil.isNotEmpty(workOrderPagination.getProductName())){
+                workOrderNum++;
+
+                String value = workOrderPagination.getProductName() instanceof List ?
+                        JsonUtil.getObjectToString(workOrderPagination.getProductName()) :
+                        String.valueOf(workOrderPagination.getProductName());
+                workOrderQueryWrapper.eq("e.name",workOrderPagination.getProductName());
+            }
+
+
             if(ObjectUtil.isNotEmpty(workOrderPagination.getBusinessCode())){
             workOrderNum++;
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java
index 45fa2d4d..56d72bac 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java
@@ -79,6 +79,9 @@ public class WorkOrderEntity  {
     @TableField(exist = false)
     private String realName;
 
+    @TableField(exist = false)
+    private String prodcutName;
+
     @TableField(exist = false)
     private List<ProductWarehouseEntity> productWarehouseEntityList;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
index ca236b6d..9e3aba7f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
@@ -46,4 +46,8 @@ public class WorkOrderPagination extends Pagination {
     /** 制单时间 */
     @JsonProperty("creatorTime")
     private Object creatorTime;
+
+    /** 商品 */
+    @JsonProperty("productName")
+    private Object productName;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
index 4c56e32a..55a2a64e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
@@ -233,7 +233,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [], total: 0,
       queryData: {},
       listQuery: {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractLMonitor/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractLMonitor/index.vue
index 1eb79faa..df7e1cda 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractLMonitor/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractLMonitor/index.vue
@@ -5,20 +5,23 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="关键词">
-              <el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
+              <el-input v-model="keyword" placeholder="请输入关键词查询" clearable
+                @keyup.enter.native="search()" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="日期">
-              <el-date-picker v-model="pickerVal" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-                :picker-options="pickerOptions" value-format="timestamp" clearable :editable="false">
+              <el-date-picker v-model="pickerVal" type="daterange" start-placeholder="开始日期"
+                end-placeholder="结束日期" :picker-options="pickerOptions" value-format="timestamp"
+                clearable :editable="false">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="分类">
               <el-select v-model="flowCategory" placeholder="选择分类" clearable filterable>
-                <el-option v-for="item in categoryList" :key="item.id" :label="item.fullName" :value="item.id">
+                <el-option v-for="item in categoryList" :key="item.id" :label="item.fullName"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -26,10 +29,12 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="所属流程">
-                <el-select v-model="templateId" placeholder="选择所属流程" clearable @change="onTemplateIdChange" filterable>
+                <el-select v-model="templateId" placeholder="选择所属流程" clearable
+                  @change="onTemplateIdChange" filterable>
                   <el-option-group v-for="group in flowEngineList" :key="group.id"
                     :label="group.fullName + '【' + group.num + '】'">
-                    <el-option v-for="item in group.children" :key="item.id" :label="item.fullName" :value="item.id">
+                    <el-option v-for="item in group.children" :key="item.id" :label="item.fullName"
+                      :value="item.id">
                     </el-option>
                   </el-option-group>
                 </el-select>
@@ -37,9 +42,10 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所属名称">
-                <el-select v-model="flowId" placeholder="选择所属名称" clearable @visible-change="visibleFlowChange"
-                  filterable>
-                  <el-option v-for="item in flowOptions" :key="item.id" :label="item.fullName" :value="item.id" />
+                <el-select v-model="flowId" placeholder="选择所属名称" clearable
+                  @visible-change="visibleFlowChange" filterable>
+                  <el-option v-for="item in flowOptions" :key="item.id" :label="item.fullName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -51,7 +57,8 @@
             <el-col :span="6">
               <el-form-item label="流程状态">
                 <el-select v-model="status" placeholder="选择流程状态" clearable filterable>
-                  <el-option v-for="(item, i) in statusList" :key="i" :label="item.fullName" :value="item.id">
+                  <el-option v-for="(item, i) in statusList" :key="i" :label="item.fullName"
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -59,7 +66,8 @@
             <el-col :span="6">
               <el-form-item label="紧急程度">
                 <el-select v-model="urgent" placeholder="选择紧急程度" clearable filterable>
-                  <el-option v-for="(item, i) in urgentList" :key="i" :label="item.fullName" :value="item.id">
+                  <el-option v-for="(item, i) in urgentList" :key="i" :label="item.fullName"
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -71,7 +79,8 @@
                 {{ $t('common.search') }}</el-button>
               <el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
               </el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">展开</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
                 收起</el-button>
             </el-form-item>
@@ -85,15 +94,19 @@
           </div> -->
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" :border="true" hasC @selection-change="handleChange">
+        <JNPF-table v-loading="listLoading" :data="list" :border="true" hasC
+          @selection-change="handleChange">
           <el-table-column label="基本信息" width="250">
             <template slot-scope="scope">
               <div>
-                <div>{{ scope.row.processData.contractName }}（{{ scope.row.processData.contractType }}）</div>
+                <div>
+                  {{ scope.row.processData.contractName }}（{{ scope.row.processData.contractType }}）
+                </div>
                 <div>合同编号：{{ scope.row.processData.contractNumber }}</div>
               </div>
             </template>
@@ -111,7 +124,8 @@
           </el-table-column>
           <el-table-column prop="completion" label="合同进度">
             <template slot-scope="scope">
-              <p class="text-grey" v-if="scope.row.status == 5 || scope.row.completion == 0">----</p>
+              <p class="text-grey" v-if="scope.row.status == 5 || scope.row.completion == 0">----
+              </p>
               <p v-else-if="scope.row.completion == 100">已完成</p>
               <el-progress :percentage="scope.row.completion" v-else></el-progress>
             </template>
@@ -159,15 +173,14 @@
             </template>
           </el-table-column> -->
 
-
           <el-table-column label="操作" width="50" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" type="text" @click="toDetail(scope.row)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <FlowBox v-if="formVisible" ref="FlowBox" @close="closeForm" />
@@ -314,7 +327,7 @@ export default {
       })
     },
     initData() {
-      this.listLoading = true
+      this.listLoading = false
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
index decda3b9..b12e73ca 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
@@ -73,9 +73,11 @@
           </el-table-column>
           <el-table-column prop="warehouseName" label="仓库" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="storageAreaName" label="货区" align="center" width="150" v-if="query.searchDateType == 1 || query.searchDateType == 2">
+          <el-table-column prop="storageAreaName" label="货区" align="center" width="150"
+            v-if="query.searchDateType == 1 || query.searchDateType == 2">
           </el-table-column>
-          <el-table-column prop="batchNumber" label="批次号" align="center" width="150" v-if="query.searchDateType == 1">
+          <el-table-column prop="batchNumber" label="批次号" align="center" width="150"
+            v-if="query.searchDateType == 1">
           </el-table-column>
           <el-table-column prop="inventoryNumberSum" label="库存数量" align="center" width="150">
           </el-table-column>
@@ -196,7 +198,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [],
       total: 0,
       queryData: {},
@@ -422,7 +424,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
index 0904b9fb..f95ba183 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
@@ -8,10 +8,16 @@
               <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="外部单据编号">
               <el-input v-model="query.businessCode" placeholder="请输入" clearable> </el-input>
             </el-form-item>
+          </el-col> -->
+
+          <el-col :span="6">
+            <el-form-item label="商品名称">
+              <el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
           </el-col>
 
           <el-col :span="6">
@@ -221,6 +227,7 @@ export default {
         code: undefined,
         businessCode: undefined,
         type: undefined,
+        productName: undefined,
       },
       treeProps: {
         children: 'children',
@@ -246,7 +253,7 @@ export default {
       flowListVisible: false,
       flowList: [],
       exportBoxVisible: false,
-      typeOptions: [{ "fullName": "完工入库", "id": "1" }, { "fullName": "计划加工", "id": "2" }, { "fullName": "其他加工", "id": "3" }],
+      typeOptions: [{ "fullName": "完工入库", "id": "1" }, { "fullName": "计划加工", "id": "2" }],
       typeProps: { "label": "fullName", "value": "id" },
       tableField116_productIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
       tableField116_unitIdcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],