Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

# Conflicts: # ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue # ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
# Conflicts: # ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue # ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
肖超群
2 parents a4efde3a 6ff036f9
Showing 46 changed files with 1192 additions and 1093 deletions
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiCycleCount.vue
ant-design-vue-jeecg/src/views/system/UserList.vue
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
ant-design-vue-jeecg/src/views/system/config/LocationList.vue
ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryHeaderModal.vue
ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -34,7 +34,7 @@ export default {
         {title: 'ID', align: 'center', width: '20%',widthRight: '70%', dataIndex: 'id'},
         {title: '容器编码', align: 'center', width: '25%', dataIndex: 'containerCode'},
         {title: '容器状态', align: 'center', width: '20%', dataIndex: 'containerStatus'},
-        {title: '库位号', align: 'center', width: '20%', dataIndex: 'locationCode'},
+        {title: '库位编码', align: 'center', width: '20%', dataIndex: 'locationCode'},
         {title: '总数量', align: 'center', width: '20%', dataIndex: 'totalQty'},
         {title: '库区', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'zoneCode'},
         {title: '状态', align: 'center', width: '20%', dataIndex: 'enable'},
@@ -104,6 +104,7 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
         @change="handleTableChange">
  
         <span slot="selectedWarehouses" slot-scope="selectedWarehouses" >
@@ -18,10 +18,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -18,10 +18,6 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -5,6 +5,20 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode"
+              >
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="库位编码">
               <a-input placeholder="请输入库位编码" v-model="queryParam.code"></a-input>
             </a-form-item>
@@ -19,41 +33,32 @@
               <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库位类型">
+              <a-select
+                show-search
+                placeholder="请选择库位类型"
+                option-filter-prop="children"
+                v-model="queryParam.locationTypeCode"
+              >
+                <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="巷道">
+              <a-input placeholder="请输入巷道" v-model="queryParam.roadWay"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否可用">
+              <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库位类型">
-                <a-select
-                  show-search
-                  placeholder="请选择库位类型"
-                  option-filter-prop="children"
-                  v-model="queryParam.locationTypeCode"
-                >
-                  <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库区">
-                <a-select
-                  show-search
-                  placeholder="请选择库区"
-                  option-filter-prop="children"
-                  v-model="queryParam.zoneCode"
-                >
-                  <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="巷道">
-                <a-input placeholder="请输入巷道" v-model="queryParam.roadWay"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="行">
                 <a-input placeholder="请输入行" v-model="queryParam.row"></a-input>
               </a-form-item>
@@ -78,11 +83,6 @@
                 <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否可用">
-                <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
-              </a-form-item>
-            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -18,10 +18,6 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -14,21 +14,15 @@
               <a-input placeholder="请输入物料名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="可用状态">
-                <j-dict-select-tag placeholder="请选择可用状态" v-model="queryParam.enable" dictCode="enable_status"/>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="可用状态">
+              <j-dict-select-tag placeholder="请选择可用状态" v-model="queryParam.enable" dictCode="enable_status"/>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -18,10 +18,6 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -14,21 +14,15 @@
               <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="单位">
-                <a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位">
+              <a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -18,10 +18,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
 <template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="货主">
-              <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="容器状态">
-                <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus" dictCode="container_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="容器编码">
-                <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库位编码">
-                <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料编码">
-                <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料名称">
-                <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料规格">
-                <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料单位">
-                <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库存状态">
-                <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库龄（天）">
-                <a-input placeholder="请输入库龄（天）" v-model="queryParam.inventoryAge"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="序列号">
-                <a-input placeholder="请输入序列号" v-model="queryParam.sn"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="10" :lg="11" :md="12" :sm="24">
-              <a-form-item label="创建日期">
-                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
-                <span class="query-group-split-cust"></span>
-                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
-              </a-form-item>
-            </a-col>
-          </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
+  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button v-has="'inventoryChild:superSearch'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'inventoryChild:export'" type="primary" icon="download" @click="handleExportXls('库存明细')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button v-has="'inventoryChild:import'" type="primary" icon="import">导入</a-button>
+    <div class="table-operator" v-if="mainId">
+      <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')"
+      >导出
+      </a-button
+      >
+      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
+      <a-upload
+        v-has="'inventoryDetail:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
+        <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
         </a-menu>
-        <a-button v-has="'inventoryChild:delete'" style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down"/>
+        </a-button>
       </a-dropdown>
     </div>
  
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
  
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
         bordered
         rowKey="id"
+        :scroll="{ x: true }"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="handleTableChange"
+      >
+         <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
+          <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+            {{ inventoryStatus_dictText }}
+          </a-tag>
+        </span>
+
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color="blue">
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
  
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
+
         <span slot="action" slot-scope="text, record">
-          <a v-has="'inventoryChild:edit'" @click="handleEdit(record)">编辑</a>
+          <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a v-has="'inventoryDetail:delete'">删除</a>
+          </a-popconfirm>
         </span>
       </a-table>
     </div>
  
-    <inventory-child-modal ref="modalForm" @ok="modalFormOk"></inventory-child-modal>
+    <inventoryDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></inventoryDetail-modal>
   </a-card>
 </template>
  
 <script>
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import InventoryDetailModal from './modules/InventoryDetailModal'
+import {getCompanyList, getZoneList} from '@/api/api'
  
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import InventoryChildModal from './modules/InventoryChildModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'InventoryChildList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      InventoryChildModal
-    },
-    data () {
-      return {
-        description: '库存明细管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'货主',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
-            title:'库区',
-            align:"center",
-            dataIndex: 'zoneCode'
-          },
-          {
-            title:'容器状态',
-            align:"center",
-            dataIndex: 'containerStatus_dictText'
-          },
-          {
-            title:'容器编码',
-            align:"center",
-            dataIndex: 'containerCode'
-          },
-          {
-            title:'库位编码',
-            align:"center",
-            dataIndex: 'locationCode'
-          },
-          {
-            title:'物料编码',
-            align:"center",
-            dataIndex: 'materialCode'
-          },
-          {
-            title:'物料名称',
-            align:"center",
-            dataIndex: 'materialName'
-          },
-          {
-            title:'物料规格',
-            align:"center",
-            dataIndex: 'materialSpec'
-          },
-          {
-            title:'物料单位',
-            align:"center",
-            dataIndex: 'materialUnit'
-          },
-          {
-            title:'库存状态',
-            align:"center",
-            dataIndex: 'inventoryStatus_dictText'
-          },
-          {
-            title:'库龄（天）',
-            align:"center",
-            dataIndex: 'inventoryAge'
-          },
-          {
-            title:'序列号',
-            align:"center",
-            dataIndex: 'sn'
-          },
-          {
-            title:'创建人',
-            align:"center",
-            dataIndex: 'createBy'
-          },
-          {
-            title:'创建日期',
-            align:"center",
-            dataIndex: 'createTime'
-          },
-          {
-            title:'更新人',
-            align:"center",
-            dataIndex: 'updateBy'
-          },
-          {
-            title:'更新日期',
-            align:"center",
-            dataIndex: 'updateTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+export default {
+  name: 'InventoryDetailList',
+  mixins: [JeecgListMixin],
+  components: {InventoryDetailModal},
+  props: {
+    mainId: {
+      type: String,
+      default: '',
+      required: false
+    }
+  },
+  watch: {
+    mainId: {
+      immediate: true,
+      handler(val) {
+        if (!this.mainId) {
+          this.clearList()
+        } else {
+          this.queryParam['inventoryHeaderId'] = val
+          this.loadData(1)
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      description: '库存表管理页面',
+      disableMixinCreated: true,
+      companyList: [],
+      // 表头
+      columns: [
+        {
+          title: '库存详情ID',
+          align: 'center',
+          dataIndex: 'id'
+        },
+        {
+          title: '货主',
+          align: 'center',
+          dataIndex: 'companyCode',
+          key: 'companyCode',
+          scopedSlots: {customRender: 'companyCode'}
+        },
+        // {
+        //   title: '库区',
+        //   align: "center",
+        //   dataIndex: 'zoneCode'
+        // },
+        {
+          title: '容器编码',
+          align: 'center',
+          dataIndex: 'containerCode'
+        },
+        {
+          title: '库位编码',
+          align: 'center',
+          dataIndex: 'locationCode'
+        },
+        {
+          title: '物料编码',
+          align: 'center',
+          dataIndex: 'materialCode'
+        },
+        {
+          title: '物料名称',
+          align: 'center',
+          dataIndex: 'materialName'
+        },
+        {
+          title: '物料规格',
+          align: 'center',
+          dataIndex: 'materialSpec'
+        },
+        {
+          title: '物料单位',
+          align: 'center',
+          dataIndex: 'materialUnit'
+        },
+        {
+          title: '数量',
+          align: 'center',
+          dataIndex: 'qty'
+        },
+        {
+          title: '任务锁定数量',
+          align: 'center',
+          dataIndex: 'taskQty'
+        },
+        {
+          title: '托盘填充度',
+          align: 'center',
+          dataIndex: 'fillDensity',
+          customRender: text => {
+            return text == null ? '' : text + '%'
           }
-        ],
-        url: {
-          list: "/inventory/inventoryChild/list",
-          delete: "/inventory/inventoryChild/delete",
-          deleteBatch: "/inventory/inventoryChild/deleteBatch",
-          exportXlsUrl: "/inventory/inventoryChild/exportXls",
-          importExcelUrl: "inventory/inventoryChild/importExcel",
-
         },
-        dictOptions:{},
-        superFieldList:[],
+        {
+          title: '库存状态',
+          align: 'center',
+          dataIndex: 'inventoryStatus_dictText',
+          scopedSlots: {customRender: 'inventoryStatus_dictText'}
+        },
+        {
+          title: '批次',
+          align: 'center',
+          dataIndex: 'batch'
+        },
+        {
+          title: '序列号',
+          align: "center",
+          dataIndex: 'sn'
+        },
+        {
+          title: '入库日期',
+          align: 'center',
+          dataIndex: 'receiptDate'
+        },
+        {
+          title: '库龄（天）',
+          align: 'center',
+          dataIndex: 'inventoryAge'
+        },
+        {
+          title: '创建人',
+          align: 'center',
+          dataIndex: 'createBy'
+        },
+        {
+          title: '创建日期',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
+        {
+          title: '更新人',
+          align: 'center',
+          dataIndex: 'updateBy'
+        },
+        {
+          title: '更新日期',
+          align: 'center',
+          dataIndex: 'updateTime'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: '/inventory/inventoryHeader/listInventoryDetailByMainId',
+        delete: '/inventory/inventoryHeader/deleteInventoryDetail',
+        deleteBatch: '/inventory/inventoryHeader/deleteBatchInventoryDetail',
+        exportXlsUrl: '/inventory/inventoryHeader/exportInventoryDetail',
+        importUrl: '/inventory/inventoryHeader/importInventoryDetail'
+      },
+      dictOptions: {
+        containerStatus: []
       }
+    }
+  },
+  created() {
+    this.loadFrom()
+  },
+  computed: {
+    importExcelUrl() {
+      return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
+    }
+  },
+  methods: {
+    getStatusColor(status) {
+      const colors = {
+        '良品': 'green',
+        '报废品': 'purple',
+        '待确认	': 'grey',
+        '次品': 'red',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
     },
-    created() {
-    this.getSuperFieldList();
+    loadFrom() {
+      // getZoneList().then((res) => {
+      //   if (res.success) {
+      //     this.zoneList = res.result
+      //   }
+      // });
+      getCompanyList().then(res => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      })
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+    // solutionZoneCode(value) {
+    //   var actions = []
+    //   Object.keys(this.zoneList).some((key) => {
+    //     if (this.zoneList[key].code == ('' + value)) {
+    //       actions.push(this.zoneList[key].name)
+    //       return true
+    //     }
+    //   })
+    //   return actions.join('')
+    // },
+    solutionCompany(value) {
+      var actions = []
+      Object.keys(this.companyList).some(key => {
+        if (this.companyList[key].code == '' + value) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
     },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
-        fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
-        fieldList.push({type:'string',value:'containerStatus',text:'容器状态',dictCode:'container_status'})
-        fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
-        fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
-        fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
-        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
-        fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
-        fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
-        fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
-        fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
-        fieldList.push({type:'string',value:'sn',text:'序列号',dictCode:''})
-        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
-        fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
-        this.superFieldList = fieldList
-      }
+    clearList() {
+      this.dataSource = []
+      this.selectedRowKeys = []
+      this.ipagination.current = 1
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
 \ No newline at end of file
@@ -3,10 +3,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" v-if="mainId">
       <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')"
-      >导出
-      </a-button
-      >
+      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
       <a-upload
         v-has="'inventoryDetail:import'"
         name="file"
@@ -18,28 +15,10 @@
       >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
     </div>
  
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
-        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -50,7 +29,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
       >
          <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
@@ -17,41 +17,39 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库位编码">
+              <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
+            </a-form-item>
+          </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="容器编码">
                 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
               </a-form-item>
             </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="容器状态">
-                <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus"
-                                   dictCode="container_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库位号">
-                <a-input placeholder="请输入库位号" v-model="queryParam.locationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="12" :lg="14" :md="16" :sm="24">
-              <a-form-item label="创建日期">
-                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                        class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
-                <span class="query-group-split-cust"></span>
-                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                        class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="容器状态">
+              <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus"
+                                  dictCode="container_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :lg="14" :md="16" :sm="24">
+            <a-form-item label="创建日期">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
+                      class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
+                      class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -199,7 +197,7 @@ export default {
           scopedSlots: {customRender: 'containerStatus_dictText'}
         },
         {
-          title: '库位号',
+          title: '库位编码',
           align: "center",
           dataIndex: 'locationCode'
         },
@@ -358,7 +356,7 @@ export default {
       fieldList.push({type: 'string', value: 'zoneCode', text: '库区', dictCode: ''})
       fieldList.push({type: 'string', value: 'containerCode', text: '容器编码', dictCode: ''})
       fieldList.push({type: 'string', value: 'containerStatus', text: '容器状态', dictCode: 'container_status'})
-      fieldList.push({type: 'string', value: 'locationCode', text: '库位号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'locationCode', text: '库位编码', dictCode: ''})
       fieldList.push({type: 'BigDecimal', value: 'totalQty', text: '总数量', dictCode: ''})
       fieldList.push({type: 'int', value: 'totalLines', text: '总行量', dictCode: ''})
       fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
@@ -5,8 +5,31 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode"
+              >
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="货主">
-              <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择货主"
+                option-filter-prop="children"
+                v-model="queryParam.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -25,6 +48,11 @@
                 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="物料单位">
+                <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -32,7 +60,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -43,73 +71,49 @@
  
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button v-has="'inventoryMaterialSummary:add'"  @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'inventoryMaterialSummary:export'" type="primary" icon="download" @click="handleExportXls('物料汇总主表')">导出</a-button>
-      <a-upload v-has="'inventoryMaterialSummary:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      <!-- <a-button v-has="'inventoryMaterialSummary:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
+      <a-button v-has="'inventoryMaterialSummary:export'" type="primary" icon="download" @click="handleExportXls('库存物料汇总')">导出</a-button>
     </div>
  
     <!-- table区域-begin -->
     <div>
-<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项-->
-<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
-<!--      </div>-->
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
  
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
-        rowKey="id"
+        :rowKey="(record,index) => {return record.zoneCode + '_' + record.materialCode}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
         :customRow="clickThenSelect"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio' }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <span slot="companyCode" slot-scope="companyCode">
-          <a-tag :key="companyCode" color=blue>
+          <a-tag :key="companyCode" color="blue">
             {{ solutionCompany(companyCode) }}
           </a-tag>
         </span>
  
         <span slot="zoneCode" slot-scope="zoneCode">
-          <a-tag :key="zoneCode" color=blue>
+          <a-tag :key="zoneCode" color="blue">
             {{ solutionZoneCode(zoneCode) }}
           </a-tag>
         </span>
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
       </a-table>
     </div>
  
     <a-tabs defaultActiveKey="1">
       <a-tab-pane tab="库存详情" key="1">
-        <InventoryDetailSubTable :mainId="selectedMainId"/>
+        <InventoryDetailSubTable :mainId="selectedMainId" />
       </a-tab-pane>
     </a-tabs>
  
@@ -118,169 +122,171 @@
 </template>
  
 <script>
+import '@/assets/less/TableExpand.less'
+import { filterObj } from '@/utils/util'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { getCompanyList, getZoneList, ajaxGetDictItems } from '@/api/api'
+// import InventoryDetailList from './InventoryDetailList'
+import InventoryDetailSubTable from './subTables/InventoryDetailSubTable'
  
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getCompanyList, getZoneList } from '@/api/api'
-  import InventoryDetailList from './InventoryDetailList'
-  import InventoryDetailSubTable from './subTables/InventoryDetailSubTable'
-
-  export default {
-    name: 'InventoryMaterialSummaryList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      InventoryDetailSubTable,
-      InventoryDetailList
-    },
-    data () {
-      return {
-        zoneList: [],
-        selectedMainId: '',
-        description: '物料汇总主表管理页面',
-        // 表头
-        companyList: [],
-        columns: [
-          // {
-          //   title: '库存ID',
-          //   align: "center",
-          //   dataIndex: 'id'
-          // },
-          // {
-          //   title:'仓库',
-          //   align:"center",
-          //   dataIndex: 'warehouseCode'
-          // },
-          {
-            title: '库区',
-            align: "center",
-            dataIndex: 'zoneCode',
-            key: 'zoneCode',
-            scopedSlots: {customRender: 'zoneCode'}
-          },
-          {
-            title:'货主',
-            align:"center",
-            dataIndex: 'companyCode',
-            key: 'companyCode',
-            scopedSlots: {customRender: 'companyCode'}
-          },
-          {
-            title:'物料编码',
-            align:"center",
-            dataIndex: 'materialCode'
-          },
-          {
-            title:'物料名称',
-            align:"center",
-            dataIndex: 'materialName'
-          },
-          {
-            title:'物料规格',
-            align:"center",
-            dataIndex: 'materialSpec'
-          },
-          {
-            title:'物料单位',
-            align:"center",
-            dataIndex: 'materialUnit'
-          },
-          {
-            title:'物料总数',
-            align:"center",
-            dataIndex: 'qty'
-          }
-        ],
-        url: {
-          list: "/InventoryMaterialSummary/inventoryMaterialSummary/list",
-          exportXlsUrl: "/InventoryMaterialSummary/inventoryMaterialSummary/exportXls",
-          importExcelUrl: "InventoryMaterialSummary/inventoryMaterialSummary/importExcel",
-
+export default {
+  name: 'InventoryMaterialSummaryList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    InventoryDetailSubTable
+  },
+  data() {
+    return {
+      zoneList: [],
+      companyList: [],
+      selectedMainId: '',
+      description: '物料汇总主表管理页面',
+      // 表头
+      columns: [
+        {
+          title: '库区',
+          align: 'center',
+          dataIndex: 'zoneCode',
+          key: 'zoneCode',
+          scopedSlots: { customRender: 'zoneCode' }
+        },
+        {
+          title: '货主',
+          align: 'center',
+          dataIndex: 'companyCode',
+          key: 'companyCode',
+          scopedSlots: { customRender: 'companyCode' }
+        },
+        {
+          title: '物料编码',
+          align: 'center',
+          dataIndex: 'materialCode'
+        },
+        {
+          title: '物料名称',
+          align: 'center',
+          dataIndex: 'materialName'
+        },
+        {
+          title: '物料规格',
+          align: 'center',
+          dataIndex: 'materialSpec'
         },
-        dictOptions:{},
-        superFieldList:[],
+        {
+          title: '物料单位',
+          align: 'center',
+          dataIndex: 'materialUnit'
+        },
+        {
+          title: '物料总数',
+          align: 'center',
+          dataIndex: 'qty'
+        }
+      ],
+      url: {
+        list: '/InventoryMaterialSummary/inventoryMaterialSummary/list',
+        exportXlsUrl: '/InventoryMaterialSummary/inventoryMaterialSummary/exportXls',
+        importExcelUrl: 'InventoryMaterialSummary/inventoryMaterialSummary/importExcel'
+      },
+      dictOptions: {},
+      superFieldList: []
+    }
+  },
+  created() {
+    this.getSuperFieldList()
+    this.loadFrom()
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+    getQueryParams() {
+      // 重写查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
       }
+      var param = Object.assign(sqp, this.queryParam, {}, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
     },
-    created() {
-    this.getSuperFieldList();
-      this.loadFrom();
+    solutionZoneCode(value) {
+      var actions = []
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code === '' + value) {
+          actions.push(this.zoneList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+    solutionCompany(value) {
+      var actions = []
+      Object.keys(this.companyList).some(key => {
+        if (this.companyList[key].code === '' + value) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
     },
-    methods: {
-      solutionZoneCode(value) {
-        var actions = []
-        Object.keys(this.zoneList).some(key => {
-          if (this.zoneList[key].code == '' + value) {
-            actions.push(this.zoneList[key].name)
-            return true
-          }
-        })
-        return actions.join('')
-      },
-      loadFrom() {
-        getZoneList().then((res) => {
-          if (res.success) {
-            this.zoneList = res.result
-          }
-        });
-        getCompanyList().then((res) => {
-          if (res.success) {
-            this.companyList = res.result
-          }
-        });
-      },
-
-      clickThenSelect(record) {
-        return {
-          on: {
-            click: () => {
-              this.onSelectChange(record.id.toString().split(","), [record]);
-            }
-          }
+    loadFrom() {
+      getZoneList().then(res => {
+        if (res.success) {
+          this.zoneList = res.result
         }
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedMainId = selectedRowKeys[0].toString();
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
-      onClearSelected() {
-        this.selectedMainId = ''
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-      },
-      initDictConfig(){
-      },
-      solutionCompany(value) {
-        var actions = []
-        Object.keys(this.companyList).some((key) => {
-          if (this.companyList[key].code == ('' + value)) {
-            actions.push(this.companyList[key].name)
-            return true
+      })
+      ajaxGetDictItems('box_type').then(res => {
+        if (res.success) {
+          this.boxTypeList = res.result
+        }
+      })
+      getCompanyList().then(res => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      })
+    },
+    clickThenSelect(record) {
+      return {
+        on: {
+          click: () => {
+            this.onSelectChange(record.materialCode.toString().split(','), [record])
           }
-        })
-        return actions.join('')
-      },
-
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'warehouseCode',text:'仓库',dictCode:''})
-        fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
-        fieldList.push({type:'string',value:'companyCode_dec',text:'货主',dictCode:''})
-        fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
-        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
-        fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
-        fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'qty',text:'物料总数',dictCode:''})
-        this.superFieldList = fieldList
+        }
       }
+    },
+    onSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedMainId = selectionRows[0].zoneCode.toString() + "_"  + selectionRows[0].materialCode.toString()
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectionRows
+    },
+    onClearSelected() {
+      this.selectedMainId = ''
+      this.selectedRowKeys = []
+      this.selectionRows = []
+    },
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'zoneCode', text: '库区', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialCode', text: '物料编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialName', text: '物料名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialSpec', text: '物料规格', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialUnit', text: '物料单位', dictCode: '' })
+      fieldList.push({ type: 'BigDecimal', value: 'qty', text: '物料总数', dictCode: '' })
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
 \ No newline at end of file
@@ -19,33 +19,37 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库位编码">
+              <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="容器编码">
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="交易类型">
+              <j-dict-select-tag placeholder="请选择交易类型" v-model="queryParam.type" dictCode="inventory_transaction_type"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库存状态">
+              <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料编码">
+              <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料名称">
+              <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库位编码">
-                <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="交易类型">
-                <j-dict-select-tag placeholder="请选择交易类型" v-model="queryParam.type"
-                                   dictCode="inventory_transaction_type"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料编码">
-                <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料名称">
-                <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="物料规格">
                 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
               </a-form-item>
@@ -56,12 +60,6 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库存状态">
-                <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus"
-                                   dictCode="inventory_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="批次">
                 <a-input placeholder="请输入批次" v-model="queryParam.batch"></a-input>
               </a-form-item>
@@ -6,36 +6,62 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="货主">
-              <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择货主"
+                option-filter-prop="children"
+                v-model="queryParam.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="库区">
-              <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库位编码">
+              <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="容器编码">
+              <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库存状态">
+              <j-dict-select-tag
+                placeholder="请选择库存状态"
+                v-model="queryParam.inventoryStatus"
+                dictCode="inventory_status"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料编码">
+              <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料名称">
+              <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="容器编码">
-                <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库位编码">
-                <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料编码">
-                <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料名称">
-                <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="物料规格">
                 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
               </a-form-item>
@@ -46,15 +72,6 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库存状态">
-                <j-dict-select-tag
-                  placeholder="请选择库存状态"
-                  v-model="queryParam.inventoryStatus"
-                  dictCode="inventory_status"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="批次">
                 <a-input placeholder="请输入批次" v-model="queryParam.batch"></a-input>
               </a-form-item>
@@ -64,17 +81,16 @@
                 <a-input placeholder="请输入序列号" v-model="queryParam.sn"></a-input>
               </a-form-item>
             </a-col> -->
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库日期">
-                <j-date
-                  :show-time="true"
-                  date-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择入库日期"
-                  v-model="queryParam.receiptDate"
-                ></j-date>
+            <a-col :xl="12" :lg="14" :md="16" :sm="24">
+              <a-form-item label="创建日期">
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
+                        class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
+                        class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl='6' :lg='7' :md='8' :sm='24'>
               <a-form-item label='库龄大于（天）'>
                 <a-input placeholder='请输入库龄大于（天）' v-model='queryParam.inventoryAge'></a-input>
               </a-form-item>
@@ -33,8 +33,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
-              <a-input v-model="model.locationCode" placeholder="请输入库位号"></a-input>
+            <a-form-model-item label="库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
+              <a-input v-model="model.locationCode" placeholder="请输入库位编码"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -4,37 +4,11 @@
     <div class="table-operator" v-if="mainId">
       <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
     </div>
  
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
+     <a-table
         ref="table"
         size="middle"
         bordered
@@ -54,34 +28,17 @@
         </span>
  
         <span slot="companyCode" slot-scope="companyCode">
-          <a-tag :key="companyCode" color=blue>
+
+          <a-tag :key="companyCode" color="blue">
             {{ solutionCompany(companyCode) }}
           </a-tag>
         </span>
  
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-
-
+        <span slot="zoneCode" slot-scope="zoneCode">
+          <a-tag :key="zoneCode" color="blue">
+            {{ solutionZoneCode(zoneCode) }}
+          </a-tag>
+        </span>
       </a-table>
     </div>
  
@@ -91,14 +48,17 @@
  
 <script>
  
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import InventoryDetailModal from '../modules/InventoryDetailModal'
-import {getCompanyList} from '@/api/api'
+
+import { getCompanyList, getZoneList } from '@/api/api'
  
 export default {
-  name: "InventoryDetailSubTable",
+
+  name: 'InventoryDetailSubTable',
   mixins: [JeecgListMixin],
-  components: {InventoryDetailModal},
+
+  components: { InventoryDetailModal },
   props: {
     mainId: {
       type: String,
@@ -113,90 +73,100 @@ export default {
         if (!this.mainId) {
           this.clearList()
         } else {
-          this.queryParam['id'] = val
-          this.loadData(1);
+
+          this.queryParam['zoneCode'] = val.split("_")[0];
+          this.queryParam['materialCode'] = val.split("_")[1];
+          this.loadData(1)
         }
       }
     }
   },
   data() {
     return {
-      description: '库存表管理页面',
+
+      description: '库存物料汇总详情页面',
       disableMixinCreated: true,
       companyList: [],
+      zoneList: [],
       // 表头
       columns: [
         {
           title: '库存详情ID',
-          align: "center",
+
+          align: 'center',
           dataIndex: 'id'
         },
         {
           title: '货主',
-          align: "center",
+
+          align: 'center',
           dataIndex: 'companyCode',
           key: 'companyCode',
-          scopedSlots: {customRender: 'companyCode'}
+
+          scopedSlots: { customRender: 'companyCode' }
         },
         {
           title: '库区',
-          align: "center",
-          dataIndex: 'zoneCode'
+
+          align: 'center',
+          dataIndex: 'zoneCode',
+          key: 'zoneCode',
+          scopedSlots: { customRender: 'zoneCode' }
         },
         {
-          title: '容器编码',
-          align: "center",
-          dataIndex: 'containerCode'
+          title: '库位编码',
+          align: 'center',
+          dataIndex: 'locationCode'
         },
         {
-          title: '库位编码',
+          title: '容器编码',
           align: "center",
-          dataIndex: 'locationCode'
+          dataIndex: 'containerCode'
         },
         {
           title: '物料编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialCode'
         },
         {
           title: '物料名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialName'
         },
         {
-          title: '物料规格',
-          align: "center",
-          dataIndex: 'materialSpec'
-        },
-        {
           title: '物料单位',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialUnit'
         },
         {
           title: '数量',
-          align: "center",
+          align: 'center',
           dataIndex: 'qty'
         },
         {
           title: '任务锁定数量',
-          align: "center",
+          align: 'center',
           dataIndex: 'taskQty'
         },
         {
           title: '库存状态',
-          align: "center",
+          align: 'center',
           dataIndex: 'inventoryStatus_dictText',
           scopedSlots: {customRender: 'inventoryStatus_dictText'}
         },
         {
+          title: '容器状态',
+          align: 'center',
+          dataIndex: 'containerStatus_dictText'
+        },
+        {
           title: '批次',
           align: "center",
           dataIndex: 'batch'
         },
         {
           title: '序列号',
-          align: "center",
+          align: 'center',
           dataIndex: 'sn'
         },
         {
@@ -206,44 +176,35 @@ export default {
         },
         {
           title: '库龄（天）',
-          align: "center",
+          align: 'center',
           dataIndex: 'inventoryAge'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align:"center",
-          fixed:"right",
-          width:147,
-          scopedSlots: { customRender: 'action' }
+          align: 'center',
+          dataIndex: 'updateTime'
         },
       ],
       url: {
-        list: "/InventoryMaterialSummary/inventoryMaterialSummary/inventoryMaterialSummaryChild",
-        exportXlsUrl: "/inventory/inventoryHeader/exportInventoryDetail",
         importUrl: "/inventory/inventoryHeader/importInventoryDetail",
       },
       dictOptions: {
-        containerStatus: [],
+        containerStatus: []
       }
     }
   },
@@ -252,7 +213,7 @@ export default {
   },
   computed: {
     importExcelUrl() {
-      return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
     }
   },
   methods: {
@@ -267,31 +228,47 @@ export default {
       return colors[status] || colors.default;
     },
     loadFrom() {
-      getCompanyList().then((res) => {
+
+      getCompanyList().then(res => {
         if (res.success) {
           this.companyList = res.result
         }
-      });
+      })
+      getZoneList().then(res => {
+        if (res.success) {
+          this.zoneList = res.result
+        }
+      })
     },
     solutionCompany(value) {
-      var actions = []
-      Object.keys(this.companyList).some((key) => {
-        if (this.companyList[key].code == ('' + value)) {
+
+      let actions = []
+      Object.keys(this.companyList).some(key => {
+        if (this.companyList[key].code === '' + value) {
           actions.push(this.companyList[key].name)
           return true
         }
       })
       return actions.join('')
     },
+    solutionZoneCode(value) {
+      let actions = []
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code === '' + value) {
+          actions.push(this.zoneList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
     clearList() {
       this.dataSource = []
       this.selectedRowKeys = []
       this.ipagination.current = 1
     }
-
   }
 }
 </script>
 <style scoped>
-@import '~@assets/less/common.less'
+@import '~@assets/less/common.less';
 </style>
@@ -19,22 +19,27 @@
               <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标出入口">
+              <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="创建人">
+              <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标出入口">
-                <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
-              </a-form-item>
-            </a-col>
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -24,7 +24,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="入库单类型">
               <a-select
@@ -39,38 +38,36 @@
               </a-select>
             </a-form-item>
           </a-col>
-
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="头状态">
+              <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="尾状态">
+              <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="receipt_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="上游单号">
+              <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="供应商">
+              <a-select
+                show-search
+                placeholder="请选择供应商"
+                option-filter-prop="children"
+                v-model="queryParam.supplierCode">
+                <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="头状态">
-                <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="尾状态">
-                <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="receipt_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="上游单号">
-                <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="供应商">
-                <a-select
-                  show-search
-                  placeholder="请选择供应商"
-                  option-filter-prop="children"
-                  v-model="queryParam.supplierCode">
-                  <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{
-                      item.name
-                    }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -14,33 +14,33 @@
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="shipment_task_type"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="状态">
+              <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status"
+                                  dictCode="shipment_container_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标出入口">
+              <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="创建人">
+              <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="状态">
-                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status"
-                                   dictCode="shipment_container_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标出入口">
-                <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="创建人">
-                <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
-              </a-form-item>
-            </a-col>
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -37,37 +37,37 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="头状态">
+              <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="shipment_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="尾状态">
+              <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="shipment_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="上游单号">
+              <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="客户">
+              <a-select
+                show-search
+                placeholder="请选择客户"
+                option-filter-prop="children"
+                v-model="queryParam.customerCode">
+                <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="头状态">
-                <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="shipment_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="尾状态">
-                <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="shipment_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="上游单号">
-                <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="客户">
-                <a-select
-                  show-search
-                  placeholder="请选择客户"
-                  option-filter-prop="children"
-                  v-model="queryParam.customerCode">
-                  <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
-                      item.name
-                    }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="出库单备注">
                 <a-input placeholder="请输入出库单备注" v-model="queryParam.remark"></a-input>
               </a-form-item>
@@ -5,6 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务类型">
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="agv_task_type"/>
             </a-form-item>
@@ -14,31 +19,25 @@
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="状态">
-                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="agv_task_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始点位">
-                <a-input placeholder="请输入起始点位" v-model="queryParam.fromPort"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标点位">
-                <a-input placeholder="请输入目标点位" v-model="queryParam.toPort"></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="状态">
+              <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="agv_task_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始点位">
+              <a-input placeholder="请输入起始点位" v-model="queryParam.fromPort"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标点位">
+              <a-input placeholder="请输入目标点位" v-model="queryParam.toPort"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -5,6 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务类型">
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
             </a-form-item>
@@ -14,31 +19,36 @@
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库区">
-                <a-select
-                  show-search
-                  placeholder="请选择库区"
-                  option-filter-prop="children"
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
  
-                  v-model="queryParam.zoneCode">
-                  <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{item.name}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
+                v-model="queryParam.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务状态">
+              <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始出入口">
                 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
@@ -49,11 +59,7 @@
                 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="任务状态">
-                <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
-              </a-form-item>
-            </a-col>
+
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -456,7 +462,7 @@ export default {
       fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
       fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
       fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
-      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
       fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
       fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
       fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
@@ -5,6 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务类型">
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
             </a-form-item>
@@ -14,31 +19,36 @@
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务状态">
+              <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库区">
-                <a-select
-                  show-search
-                  placeholder="请选择库区"
-                  option-filter-prop="children"
-                  v-model="queryParam.zoneCode">
-                  <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{item.name}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始出入口">
                 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
               </a-form-item>
@@ -48,11 +58,6 @@
                 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="任务状态">
-                <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
-              </a-form-item>
-            </a-col>
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -494,7 +499,7 @@ export default {
       fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
       fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
       fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
-      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
       fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
       fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
       fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
@@ -5,6 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务类型">
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
             </a-form-item>
@@ -14,36 +19,36 @@
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务状态">
+              <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库区">
-                <a-select
-                  show-search
-                  placeholder="请选择库区"
-                  option-filter-prop="children"
-                  v-model="queryParam.zoneCode">
-                  <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{item.name}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="任务状态">
-                <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+			<a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始出入口">
                 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
               </a-form-item>
@@ -493,7 +498,7 @@ export default {
       fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
       fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
       fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
-      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
       fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
       fieldList.push({type: 'string', value: 'fromPort', text: '起始出入口', dictCode: ''})
       fieldList.push({type: 'string', value: 'toPort', text: '目标出入口', dictCode: ''})
@@ -5,6 +5,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务类型">
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
             </a-form-item>
@@ -14,31 +19,36 @@
               <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="库区">
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="queryParam.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
+                  {{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="起始库位">
+              <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="目标库位">
+              <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务状态">
+              <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="库区">
-                <a-select
-                  show-search
-                  placeholder="请选择库区"
-                  option-filter-prop="children"
-                  v-model="queryParam.zoneCode">
-                  <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{item.name}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="起始库位">
-                <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="目标库位">
-                <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始出入口">
                 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
               </a-form-item>
@@ -48,11 +58,6 @@
                 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="任务状态">
-                <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
-              </a-form-item>
-            </a-col>
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
@@ -501,7 +506,7 @@ export default {
       fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
       fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
       fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
-      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
       fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
       fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
       fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
@@ -42,8 +42,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="重入库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originLocationCode">
-              <a-input v-model="model.originLocationCode" placeholder="请输入重入库位号"></a-input>
+            <a-form-model-item label="重入库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originLocationCode">
+              <a-input v-model="model.originLocationCode" placeholder="请输入重入库位编码"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -12,13 +12,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="起始库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fromLocationCode">
-              <a-input v-model="model.fromLocationCode" placeholder="请输入起始库位号"></a-input>
+            <a-form-model-item label="起始库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fromLocationCode">
+              <a-input v-model="model.fromLocationCode" placeholder="请输入起始库位编码"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="目标库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toLocationCode">
-              <a-input v-model="model.toLocationCode" placeholder="请输入目标库位号"></a-input>
+            <a-form-model-item label="目标库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toLocationCode">
+              <a-input v-model="model.toLocationCode" placeholder="请输入目标库位编码"></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -56,10 +56,10 @@ export default {
       confirmLoading: false,
       validatorRules: {
         fromLocationCode: [
-          {required: true, message: '请输入起始库位号!'},
+          {required: true, message: '请输入起始库位编码!'},
         ],
         toLocationCode: [
-          {required: true, message: '请输入目标库位号!'},
+          {required: true, message: '请输入目标库位编码!'},
         ],
       },
       url: {
@@ -8,6 +8,7 @@ import java.util.List;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.StringUtils;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -197,7 +198,7 @@ public class SysUser implements Serializable {
     private List<String> selectedWarehouses;
  
     public void setSelectedWarehouse(String selectedWarehouse) {
-        if (selectedWarehouse != null) {
+        if (!StringUtils.isEmpty(selectedWarehouse)) {
             this.selectedWarehouse = selectedWarehouse;
             this.selectedWarehouses = Arrays.asList(selectedWarehouse.split(","));
         }
@@ -10,7 +10,7 @@ import lombok.Data;
 public class CallBoxBean {
     @ApiModelProperty(value = "托盘号", required = true)
     private String containerCode;
-    @ApiModelProperty(value = "库位号", required = true)
+    @ApiModelProperty(value = "库位编码", required = true)
     private String locationCode;
     @ApiModelProperty(value = "任务类型，200补充入, 400分拣出")
     private int type;
@@ -10,7 +10,7 @@ import java.util.List;
 public class QuickReceiptBean {
     @ApiModelProperty(value = "托盘号", required = true)
     private String containerCode;
-    @ApiModelProperty(value = "库位号", required = false)
+    @ApiModelProperty(value = "库位编码", required = false)
     private String locationCode;
     @ApiModelProperty(value = "单据类型", required = true)
     private String receiptType;
@@ -219,7 +219,7 @@ public class WcsServiceImpl implements WcsService {
                     receiptContainerHeader.setId(receiptContainerDetail.getReceiptContainerId());
                     receiptContainerHeader.setToLocationCode(locationCode);
                     if (!receiptContainerHeaderService.updateById(receiptContainerHeader)) {
-                        throw new JeecgBootException("分配库位时，更新入库组盘的库位号失败");
+                        throw new JeecgBootException("分配库位时，更新入库组盘的库位编码失败");
                     }
                 }
             }
@@ -273,7 +273,7 @@ public class WcsServiceImpl implements WcsService {
         LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
         LogRecordContext.putVariable("taskHeader", taskHeader);
         LogRecordContext.putVariable("success", true);
-        log.info("完成分配库位，任务号：" + taskNo + ", 库位号：" + locationCode);
+        log.info("完成分配库位，任务号：" + taskNo + ", 库位编码：" + locationCode);
         return Result.OK(wcsTask);
     }
  
@@ -572,7 +572,7 @@ public class WcsServiceImpl implements WcsService {
         }
         String toLocationCode = taskHeader.getToLocationCode();
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("重入处理失败， 目的库位号为空");
+            return Result.error("重入处理失败， 目的库位编码为空");
         }
         // 3、找到目标库位
         Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
@@ -603,13 +603,13 @@ public class WcsServiceImpl implements WcsService {
             Material material = materialService.getMaterialByCode(materialCode);
             materialAreaCode = material.getMaterialareaCode();
         }
-        // 4. WMS重新分配库位号
+        // 4. WMS重新分配库位编码
         String locationCode =
             locationAllocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, materialAreaCode);
         if (StringUtils.isEmpty(locationCode)) {
             return Result.error("重入处理失败， 没有库位可分配");
         }
-        // 5. 任务类型为整盘入库、补充入库，更新入库组盘的库位号
+        // 5. 任务类型为整盘入库、补充入库，更新入库组盘的库位编码
         int taskType = taskHeader.getTaskType();
         if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
             ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId());
@@ -649,7 +649,7 @@ public class WcsServiceImpl implements WcsService {
             throw new JeecgBootException("重入处理失败， 更新任务信息失败");
         }
  
-        // 9. 封装返回的数据格式，包括任务号和重新分配的库位号
+        // 9. 封装返回的数据格式，包括任务号和重新分配的库位编码
         TaskReentryEntity taskReentryEntity = new TaskReentryEntity();
         taskReentryEntity.setTaskNo(Integer.parseInt(taskNo));
         taskReentryEntity.setRedirectionLocationCode(locationCode);
@@ -114,7 +114,7 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
         if (StringUtils.isNotEmpty(locationCode)) {
             Location location = locationService.getLocationByCode(locationCode, container.getWarehouseCode());
             if (location == null) {
-                throw new JeecgBootException("编辑的库位号不存在");
+                throw new JeecgBootException("编辑的库位编码不存在");
             }
         }
         boolean success = containerService.updateById(container);
 package org.jeecg.modules.wms.inventory.InventoryMaterialSummary.controller;
  
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
  
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.wms.inventory.InventoryMaterialSummary.entity.InventoryMaterialSummary;
 import org.jeecg.modules.wms.inventory.InventoryMaterialSummary.service.IInventoryMaterialSummaryService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
-import org.jeecg.modules.wms.inventory.inventoryHeader.service.impl.InventoryDetailServiceImpl;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
  
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
  
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
  
 /**
- * @Description: 物料汇总主表
+ * @Description: 库存物料汇总
  * @Author:      jeecg-boot
  * @Date:        2023-02-22
  * @Version:     V1.0
  */
-@Api(tags = "物料汇总主表")
+@Api(tags = "库存物料汇总")
 @RestController
 @RequestMapping("/InventoryMaterialSummary/inventoryMaterialSummary")
 @Slf4j
 public class InventoryMaterialSummaryController extends JeecgController<InventoryDetail, IInventoryMaterialSummaryService> {
+
     @Resource
     private IInventoryDetailService inventoryDetailService;
  
     @Resource
     private IInventoryMaterialSummaryService inventoryMaterialSummaryService;
  
+    @Resource
+    private ISysUserService sysUserService;
+
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     /**
-     * 分页列表查询
+     * 库存物料汇总-分页主表查询
      * @param  pageNo
      * @param  pageSize
      * @param  req
      * @return
      */
-    @ApiOperation(value = "物料汇总主表-分页列表查询", notes = "物料汇总主表-分页列表查询")
+    @ApiOperation(value = "库存物料汇总-分页主表查询", notes = "库存物料汇总-分页主表查询")
     @GetMapping(value = "/list")
     public Result<IPage<InventoryDetail>> queryPageList(InventoryDetail inventoryDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         HuahengJwtUtil.setWarehouseCode(req, inventoryDetail);
         QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
+        queryWrapper.select("zone_code, company_code, material_code, material_name,material_spec, material_unit, SUM(qty) as qty");
+        queryWrapper.groupBy("zone_code", "company_code", "material_code", "material_name", "material_spec", "material_unit");
         Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
         IPage<InventoryDetail> pageList = inventoryDetailService.page(page, queryWrapper);
-        // 筛选库存汇总数据的专用方法
-        pageList.setRecords(inventoryMaterialSummaryService.duplicateRemoval(pageList.getRecords()));
         return Result.OK(pageList);
     }
  
     /**
-     * 分页列表明细情况
+     * 库存物料汇总-分页明细查询
      * @param  pageNo
      * @param  pageSize
      * @param  req
      * @return
      */
-    @ApiOperation(value = "物料汇总主表-库存汇总明细子单", notes = "物料汇总主表-库存汇总明细子单")
+    @ApiOperation(value = "库存物料汇总-分页明细查询", notes = "库存物料汇总-分页明细查询")
     @GetMapping(value = "/inventoryMaterialSummaryChild")
     public Result<IPage<InventoryDetail>> inventoryMaterialSummaryChild(InventoryDetail inventoryDetail,
         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
         HttpServletRequest req) {
-        inventoryDetail = inventoryDetailService.getById(inventoryDetail.getId());
-        LambdaQueryWrapper<InventoryDetail> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(InventoryDetail::getMaterialCode, inventoryDetail.getMaterialCode()).eq(InventoryDetail::getMaterialName, inventoryDetail.getMaterialName())
-            .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()), InventoryDetail::getMaterialSpec, inventoryDetail.getMaterialSpec())
-            .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialUnit()), InventoryDetail::getMaterialUnit, inventoryDetail.getMaterialUnit());
-
+        QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
         Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
         IPage<InventoryDetail> pageList = inventoryDetailService.page(page, queryWrapper);
         inventoryDetailService.calculateInventoryAge(pageList.getRecords());// 计算库龄
@@ -90,14 +108,51 @@ public class InventoryMaterialSummaryController extends JeecgController&lt;Inventor
     }
  
     /**
-     * 导出excel
+     * 库存物料汇总-主表导出Excel
      * @param request
      * @param inventoryMaterialSummary
      */
     @RequestMapping(value = "/exportXls")
     @RequiresPermissions("inventoryMaterialSummary:export")
-    public ModelAndView exportXls(HttpServletRequest request, InventoryDetail inventoryMaterialSummary) {
-        return super.exportXls(request, inventoryMaterialSummary, InventoryDetail.class, "物料汇总主表");
+    public ModelAndView exportXls(HttpServletRequest request, InventoryDetail inventoryDetail) {
+        HuahengJwtUtil.setWarehouseCode(request, inventoryDetail);
+        QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap());
+        queryWrapper.select("zone_code, company_code, material_code, material_name, material_spec, material_spec, material_unit, SUM(qty) as qty");
+        queryWrapper.groupBy("zone_code", "company_code", "material_code", "material_name", "material_spec", "material_spec", "material_unit");
+        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        List<InventoryDetail> pageList = this.service.list(queryWrapper);
+        List<InventoryDetail> exportList = null;
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            exportList = pageList.stream().filter((item) -> {
+                return selectionList.contains(this.getItemCode(item));
+            }).collect(Collectors.toList());
+        } else {
+            exportList = pageList;
+        }
+        List<InventoryMaterialSummary> inventoryMaterialSummaryList = CollUtil.newArrayList();
+        for (InventoryDetail source : exportList) {
+            InventoryMaterialSummary target = new InventoryMaterialSummary();
+            BeanUtils.copyProperties(source, target);
+            inventoryMaterialSummaryList.add(target);
+        }
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject("fileName", "库存物料汇总");
+        mv.addObject("entity", InventoryMaterialSummary.class);
+        ExportParams exportParams = new ExportParams("库存物料汇总" + "报表", "导出人:" + sysUser.getRealname(), "库存物料汇总");
+        exportParams.setImageBasePath(this.upLoadPath);
+        mv.addObject("params", exportParams);
+        mv.addObject("data", inventoryMaterialSummaryList);
+        return mv;
+    }
+
+    private String getItemCode(InventoryDetail item) {
+        try {
+            return PropertyUtils.getProperty(item, "zoneCode").toString() + "_" + PropertyUtils.getProperty(item, "materialCode").toString();
+        } catch (Exception var3) {
+            return null;
+        }
     }
  
     /**
@@ -111,5 +166,4 @@ public class InventoryMaterialSummaryController extends JeecgController&lt;Inventor
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, InventoryDetail.class);
     }
-
 }
+package org.jeecg.modules.wms.inventory.InventoryMaterialSummary.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: 库存详情
+ * @Author:      jeecg-boot
+ * @Date:        2022-11-16
+ * @Version:     V1.0
+ */
+@Data
+@ApiModel(value = "InventoryMaterialSummary对象", description = "库存物料汇总主表")
+public class InventoryMaterialSummary implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 货主 */
+    @Excel(name = "货主", width = 15, dictTable = "company", dicText = "name", dicCode = "code")
+    @ApiModelProperty(value = "货主")
+    private String companyCode;
+
+    /** 库区 */
+    @Excel(name = "库区", width = 15, dictTable = "zone", dicText = "name", dicCode = "code")
+    @ApiModelProperty(value = "库区")
+    private String zoneCode;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称", width = 15)
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格", width = 15)
+    @ApiModelProperty(value = "物料规格")
+    private String materialSpec;
+
+    /** 物料单位 */
+    @Excel(name = "物料单位", width = 15)
+    @ApiModelProperty(value = "物料单位")
+    private String materialUnit;
+
+    /** 数量 */
+    @Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.math.BigDecimal qty;
+}
 \ No newline at end of file
@@ -235,7 +235,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
         this.inventoryDetailService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
-
+    
     /**
      * 导出
      * @return
@@ -246,11 +246,9 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
         // Step.1 组装查询条件
         QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap());
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-
         // Step.2 获取导出数据
         List<InventoryDetail> pageList = inventoryDetailService.list(queryWrapper);
         List<InventoryDetail> exportList = null;
-
         // 过滤选中数据
         String selections = request.getParameter("selections");
         if (oConvertUtils.isNotEmpty(selections)) {
@@ -259,7 +257,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
         } else {
             exportList = pageList;
         }
-
+        inventoryDetailService.calculateInventoryAge(exportList);// 计算库龄
         // Step.3 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         mv.addObject(NormalExcelConstants.FILE_NAME, "库存详情"); // 此处设置的filename无效 ,前端会重更新设置一下
@@ -53,9 +53,9 @@ public class InventoryHeader implements Serializable {
     @Dict(dicCode = "container_status")
     @ApiModelProperty(value = "容器状态")
     private String containerStatus;
-    /** 库位号 */
-    @Excel(name = "库位号", width = 15)
-    @ApiModelProperty(value = "库位号")
+    /** 库位编码 */
+    @Excel(name = "库位编码", width = 15)
+    @ApiModelProperty(value = "库位编码")
     private String locationCode;
     /** 状态 */
     @Excel(name = "状态", width = 15, dicCode = "enable_status")
@@ -353,11 +353,11 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         String fromLocationCode = receiptContainerHeader.getFromLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择分拣口时, 起始库位号为空");
+            return Result.error("选择分拣口时, 起始库位编码为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
-            return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
+            return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
         }
         String zoneCode = fromLocation.getZoneCode();
         if (StringUtils.isEmpty(zoneCode)) {
@@ -126,11 +126,11 @@ public class ShipmentCombinationController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         String fromLocationCode = shipmentContainerHeader.getFromLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择分拣口时, 起始库位号为空");
+            return Result.error("选择分拣口时, 起始库位编码为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
-            return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
+            return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
         }
         String zoneCode = fromLocation.getZoneCode();
         if (StringUtils.isEmpty(zoneCode)) {
@@ -469,12 +469,12 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         String containerCode = shipmentContainerHeader.getContainerCode();
         String toPort = shipmentContainerHeader.getToPort();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("生成出库任务时， 出库组盘头没有起始库位号");
+            return Result.error("生成出库任务时， 出库组盘头没有起始库位编码");
         }
         // 出库时，外侧库位的任务，如果对应的内侧有任务，那么内侧任务执行完成以后，再执行出库任务。
         Location location = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (location == null) {
-            return Result.error("生成出库任务时, 库位号" + fromLocationCode + "没有找到库位");
+            return Result.error("生成出库任务时, 库位编码" + fromLocationCode + "没有找到库位");
         }
         if (location.getRowFlag() == QuantityConstant.ROW_OUT) {
             Location location1 = locationService.getNear(location);
@@ -196,11 +196,11 @@ public class CycleCountDetailController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         String fromLocationCode = cycleCountDetail.getLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择分拣口时, 起始库位号为空");
+            return Result.error("选择分拣口时, 起始库位编码为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
-            return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
+            return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
         }
         String zoneCode = fromLocation.getZoneCode();
         if (StringUtils.isEmpty(zoneCode)) {
@@ -557,11 +557,11 @@ public class TaskHeaderController extends HuahengBaseController {
         }
         String fromLocationCode = container.getLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择整出口, 起始库位号为空");
+            return Result.error("选择整出口, 起始库位编码为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
-            return Result.error("选择整出口, 根据库位号" + fromLocationCode + " 没有找到库位");
+            return Result.error("选择整出口, 根据库位编码" + fromLocationCode + " 没有找到库位");
         }
         String zoneCode = fromLocation.getZoneCode();
         if (StringUtils.isEmpty(zoneCode)) {
@@ -598,11 +598,11 @@ public class TaskHeaderController extends HuahengBaseController {
         }
         String fromLocationCode = container.getLocationCode();
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("选择分拣口, 起始库位号为空");
+            return Result.error("选择分拣口, 起始库位编码为空");
         }
         Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
         if (fromLocation == null) {
-            return Result.error("选择分拣口, 根据库位号" + fromLocationCode + " 没有找到库位");
+            return Result.error("选择分拣口, 根据库位编码" + fromLocationCode + " 没有找到库位");
         }
         String zoneCode = fromLocation.getZoneCode();
         if (StringUtils.isEmpty(zoneCode)) {
@@ -97,9 +97,9 @@ public class TaskHeader implements Serializable {
     @Dict(dicCode = "is_or_not")
     @ApiModelProperty(value = "取货错")
     private Integer isPickupError;
-    /** 重入库位号 */
-    @Excel(name = "重入库位号", width = 15)
-    @ApiModelProperty(value = "重入库位号")
+    /** 重入库位编码 */
+    @Excel(name = "重入库位编码", width = 15)
+    @ApiModelProperty(value = "重入库位编码")
     private String originLocationCode;
     /** 任务状态 */
     @Excel(name = "任务状态", width = 15, dicCode = "task_header_status")
@@ -42,7 +42,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
     TaskHeader getTaskHeaderByAgvTaskId(int agvTaskId);
  
     /**
-     * 通过起始库位号，获取任务信息
+     * 通过起始库位编码，获取任务信息
      * @param  fromLocationCode
      * @param  warehouseCode
      * @return
@@ -50,7 +50,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
     TaskHeader getUnCompleteTaskByFromLocationCode(String fromLocationCode, String warehouseCode);
  
     /**
-     * 通过目标库位号，获取任务信息
+     * 通过目标库位编码，获取任务信息
      * @param  toLocationCode
      * @param  warehouseCode
      * @return
@@ -58,7 +58,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
     TaskHeader getUnCompleteTaskByToLocationCode(String toLocationCode, String warehouseCode);
  
     /**
-     * 通过库位号，获取任务信息
+     * 通过库位编码，获取任务信息
      * @param  locationCode
      * @param  warehouseCode
      * @return
@@ -356,7 +356,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result createOverStationTask(String containerCode, String fromPortCode, String toPortCode, String warehouseCode) {
-        log.info("开始创建跨站任务，容器号" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
+        log.info("开始创建跨站任务，容器编码" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
         if (StringUtils.isEmpty(containerCode)) {
             return Result.error("创建跨站任务时，容器编码为空");
         }
@@ -394,7 +394,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (!success) {
             return Result.error("创建跨站任务时, 创建任务失败");
         }
-        log.info("完成创建跨站任务，容器号" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
+        log.info("完成创建跨站任务，容器编码" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
         return Result.ok("创建跨站任务成功");
     }
  
@@ -567,7 +567,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         String containerCode = taskHeader.getContainerCode();
         String fromLocationCode = taskHeader.getFromLocationCode();
         String warehouseCode = taskHeader.getWarehouseCode();
-        // 4、容器编码、库位号、仓库编码 不能为空
+        // 4、容器编码、库位编码、仓库编码 不能为空
         if (StringUtils.isEmpty(containerCode)) {
             return Result.error("处理空出失败，容器编码为空");
         }
@@ -585,7 +585,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (fronLocation == null) {
             return Result.error("处理空出失败，没有找到库位");
         }
-        // 5、删除容器上的库位号，并设置状态为空闲，填充度状态为空盘
+        // 5、删除容器上的库位编码，并设置状态为空闲，填充度状态为空盘
         boolean success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY,
             QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
         if (!success) {
@@ -645,7 +645,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         String containerCode = taskHeader.getContainerCode();
         String originLocationCode = taskHeader.getOriginLocationCode();
         String warehouseCode = taskHeader.getWarehouseCode();
-        // 4、容器编码、库位号、仓库编码 不能为空
+        // 4、容器编码、库位编码、仓库编码 不能为空
         if (StringUtils.isEmpty(containerCode)) {
             return Result.error("处理重入失败，容器编码为空");
         }
@@ -891,7 +891,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
     /**
      * 创建空托盘入库
-     * 1. 判断托盘号、库位号是否满足要求
+     * 1. 判断托盘号、库位编码是否满足要求
      * 2. 创建任务，锁定容器、库位
      * @param  containerCode
      * @param  toLocationCode
@@ -1661,7 +1661,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         Result result = null;
         boolean success = false;
         if (StringUtils.isEmpty(containerCode)) {
-            return Result.error("任务类型" + taskType + "完成任务时, 容器号为空");
+            return Result.error("任务类型" + taskType + "完成任务时, 容器编码为空");
         }
         Container container = containerService.getContainerByCode(containerCode, warehouseCode);
         if (container == null) {
@@ -1671,21 +1671,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             case QuantityConstant.TASK_TYPE_WHOLERECEIPT:
             case QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT:
                 if (StringUtils.isEmpty(toLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
                 }
                 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY, containerFillStatus,
                     warehouseCode);
                 break;
             case QuantityConstant.TASK_TYPE_EMPTYRECEIPT:
                 if (StringUtils.isEmpty(toLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
                 }
                 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
                     QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
                 break;
             case QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT:
                 if (StringUtils.isEmpty(toLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
                 }
                 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
                     QuantityConstant.STATUS_CONTAINER_FILL_MANY, warehouseCode);
@@ -1694,7 +1694,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             case QuantityConstant.TASK_TYPE_EMPTYSHIPMENT:
             case QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT:
                 if (StringUtils.isEmpty(fromLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 起始库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 起始库位编码为空");
                 }
                 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
                     QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
@@ -1704,10 +1704,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             case QuantityConstant.TASK_TYPE_TRANSFER:
             case QuantityConstant.TASK_TYPE_CHECK_OUT:
                 if (StringUtils.isEmpty(fromLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 起始库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 起始库位编码为空");
                 }
                 if (StringUtils.isEmpty(toLocationCode)) {
-                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
+                    return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
                 }
                 InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
                 if (inventoryHeader != null) {
@@ -1777,7 +1777,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("完成空托盘入库任务时, 仓库编码为空");
         }
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("完成空托盘入库任务时, 目标库位号为空");
+            return Result.error("完成空托盘入库任务时, 目标库位编码为空");
         }
         Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYRECEIPT,
             containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
@@ -1812,10 +1812,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         String toLocationCode = taskHeader.getToLocationCode();
         boolean success = false;
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("完成盘点任务时，起始库位号为空");
+            return Result.error("完成盘点任务时，起始库位编码为空");
         }
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("完成盘点任务时，目标库位号为空");
+            return Result.error("完成盘点任务时，目标库位编码为空");
         }
         if (StringUtils.isEmpty(containerCode)) {
             return Result.error("完成盘点任务时，托盘号为空");
@@ -2085,7 +2085,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("完成空托盘出库任务时, 仓库编码为空");
         }
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("完成空托盘出库任务时, 起始库位号为空");
+            return Result.error("完成空托盘出库任务时, 起始库位编码为空");
         }
         if (StringUtils.isEmpty(toPortCode)) {
             return Result.error("完成空托盘出库任务时, 目标出入口号为空");
@@ -2136,10 +2136,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("完成移库任务时, 仓库编码为空");
         }
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("完成移库任务时, 起始库位号为空");
+            return Result.error("完成移库任务时, 起始库位编码为空");
         }
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("完成移库任务时, 目标库位号为空");
+            return Result.error("完成移库任务时, 目标库位编码为空");
         }
  
         List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
@@ -2226,13 +2226,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("完成出库查看任务时, 仓库编码为空");
         }
         if (StringUtils.isEmpty(fromLocationCode)) {
-            return Result.error("完成出库查看任务时, 起始库位号为空");
+            return Result.error("完成出库查看任务时, 起始库位编码为空");
         }
         if (StringUtils.isEmpty(toPortCode)) {
             return Result.error("完成出库查看任务时, 目标出入口号为空");
         }
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("完成出库查看任务时, 目标库位号为空");
+            return Result.error("完成出库查看任务时, 目标库位编码为空");
         }
  
         boolean success = false;
@@ -2354,7 +2354,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("完成空托盘组入库任务时, 仓库编码为空");
         }
         if (StringUtils.isEmpty(toLocationCode)) {
-            return Result.error("完成空托盘组入库任务时, 目标库位号为空");
+            return Result.error("完成空托盘组入库任务时, 目标库位编码为空");
         }
         Container container = containerService.getContainerByCode(containerCode, warehouseCode);
         if (container == null) {