wms / wms4_hh · Commits

Commit 20f1675722e1608a3ed2cd7cc64bbf586e9a122f

Authored by 谭毅彬
1 parent ba5efe1b
develop

统一库位编码，托盘编码页面显示，优化若干查询字段显示 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 40 changed files with 759 additions and 693 deletions
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiCycleCount.vue
  View file @20f1675
... ... @@ -34,7 +34,7 @@ export default {
34 34 {title: 'ID', align: 'center', width: '20%',widthRight: '70%', dataIndex: 'id'},
35 35 {title: '容器编码', align: 'center', width: '25%', dataIndex: 'containerCode'},
36 36 {title: '容器状态', align: 'center', width: '20%', dataIndex: 'containerStatus'},
37   - {title: '库位号', align: 'center', width: '20%', dataIndex: 'locationCode'},
  37 + {title: '库位编码', align: 'center', width: '20%', dataIndex: 'locationCode'},
38 38 {title: '总数量', align: 'center', width: '20%', dataIndex: 'totalQty'},
39 39 {title: '库区', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'zoneCode'},
40 40 {title: '状态', align: 'center', width: '20%', dataIndex: 'enable'},
... ...
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
  View file @20f1675
... ... @@ -18,10 +18,10 @@
18 18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21   - <a @click="handleToggleSearch" style="margin-left: 8px">
  21 + <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
22 22 {{ toggleSearchStatus ? '收起' : '展开' }}
23 23 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
24   - </a>
  24 + </a> -->
25 25 </span>
26 26 </a-col>
27 27 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
  View file @20f1675
... ... @@ -18,10 +18,6 @@
18 18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21   - <a @click="handleToggleSearch" style="margin-left: 8px">
22   - {{ toggleSearchStatus ? '收起' : '展开' }}
23   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
24   - </a>
25 21 </span>
26 22 </a-col>
27 23 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/LocationList.vue
  View file @20f1675
... ... @@ -5,6 +5,20 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-select
  10 + show-search
  11 + placeholder="请选择库区"
  12 + option-filter-prop="children"
  13 + v-model="queryParam.zoneCode"
  14 + >
  15 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  16 + {{ item.name }}
  17 + </a-select-option>
  18 + </a-select>
  19 + </a-form-item>
  20 + </a-col>
  21 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 22 <a-form-item label="库位编码">
9 23 <a-input placeholder="请输入库位编码" v-model="queryParam.code"></a-input>
10 24 </a-form-item>
... ... @@ -19,41 +33,32 @@
19 33 <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status"/>
20 34 </a-form-item>
21 35 </a-col>
  36 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  37 + <a-form-item label="库位类型">
  38 + <a-select
  39 + show-search
  40 + placeholder="请选择库位类型"
  41 + option-filter-prop="children"
  42 + v-model="queryParam.locationTypeCode"
  43 + >
  44 + <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code">
  45 + {{ item.name }}
  46 + </a-select-option>
  47 + </a-select>
  48 + </a-form-item>
  49 + </a-col>
  50 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  51 + <a-form-item label="巷道">
  52 + <a-input placeholder="请输入巷道" v-model="queryParam.roadWay"></a-input>
  53 + </a-form-item>
  54 + </a-col>
  55 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  56 + <a-form-item label="是否可用">
  57 + <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
  58 + </a-form-item>
  59 + </a-col>
22 60 <template v-if="toggleSearchStatus">
23 61 <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="库位类型">
25   - <a-select
26   - show-search
27   - placeholder="请选择库位类型"
28   - option-filter-prop="children"
29   - v-model="queryParam.locationTypeCode"
30   - >
31   - <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code">
32   - {{ item.name }}
33   - </a-select-option>
34   - </a-select>
35   - </a-form-item>
36   - </a-col>
37   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
38   - <a-form-item label="库区">
39   - <a-select
40   - show-search
41   - placeholder="请选择库区"
42   - option-filter-prop="children"
43   - v-model="queryParam.zoneCode"
44   - >
45   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
46   - {{ item.name }}
47   - </a-select-option>
48   - </a-select>
49   - </a-form-item>
50   - </a-col>
51   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
52   - <a-form-item label="巷道">
53   - <a-input placeholder="请输入巷道" v-model="queryParam.roadWay"></a-input>
54   - </a-form-item>
55   - </a-col>
56   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
57 62 <a-form-item label="行">
58 63 <a-input placeholder="请输入行" v-model="queryParam.row"></a-input>
59 64 </a-form-item>
... ... @@ -78,11 +83,6 @@
78 83 <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type"/>
79 84 </a-form-item>
80 85 </a-col>
81   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
82   - <a-form-item label="是否可用">
83   - <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
84   - </a-form-item>
85   - </a-col>
86 86 </template>
87 87 <a-col :xl="6" :lg="7" :md="8" :sm="24">
88 88 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
... ...
ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
  View file @20f1675
... ... @@ -18,10 +18,6 @@
18 18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21   - <a @click="handleToggleSearch" style="margin-left: 8px">
22   - {{ toggleSearchStatus ? '收起' : '展开' }}
23   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
24   - </a>
25 21 </span>
26 22 </a-col>
27 23 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
  View file @20f1675
... ... @@ -14,21 +14,15 @@
14 14 <a-input placeholder="请输入物料名称" v-model="queryParam.name"></a-input>
15 15 </a-form-item>
16 16 </a-col>
17   - <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="可用状态">
20   - <j-dict-select-tag placeholder="请选择可用状态" v-model="queryParam.enable" dictCode="enable_status"/>
21   - </a-form-item>
22   - </a-col>
23   - </template>
  17 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  18 + <a-form-item label="可用状态">
  19 + <j-dict-select-tag placeholder="请选择可用状态" v-model="queryParam.enable" dictCode="enable_status"/>
  20 + </a-form-item>
  21 + </a-col>
24 22 <a-col :xl="6" :lg="7" :md="8" :sm="24">
25 23 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
26 24 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
27 25 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
28   - <a @click="handleToggleSearch" style="margin-left: 8px">
29   - {{ toggleSearchStatus ? '收起' : '展开' }}
30   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
31   - </a>
32 26 </span>
33 27 </a-col>
34 28 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
  View file @20f1675
... ... @@ -18,10 +18,6 @@
18 18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21   - <a @click="handleToggleSearch" style="margin-left: 8px">
22   - {{ toggleSearchStatus ? '收起' : '展开' }}
23   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
24   - </a>
25 21 </span>
26 22 </a-col>
27 23 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
  View file @20f1675
... ... @@ -14,21 +14,15 @@
14 14 <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
15 15 </a-form-item>
16 16 </a-col>
17   - <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="单位">
20   - <a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
21   - </a-form-item>
22   - </a-col>
23   - </template>
  17 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  18 + <a-form-item label="单位">
  19 + <a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
  20 + </a-form-item>
  21 + </a-col>
24 22 <a-col :xl="6" :lg="7" :md="8" :sm="24">
25 23 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
26 24 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
27 25 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
28   - <a @click="handleToggleSearch" style="margin-left: 8px">
29   - {{ toggleSearchStatus ? '收起' : '展开' }}
30   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
31   - </a>
32 26 </span>
33 27 </a-col>
34 28 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
  View file @20f1675
... ... @@ -18,10 +18,10 @@
18 18 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
19 19 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
20 20 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
21   - <a @click="handleToggleSearch" style="margin-left: 8px">
  21 + <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
22 22 {{ toggleSearchStatus ? '收起' : '展开' }}
23 23 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
24   - </a>
  24 + </a> -->
25 25 </span>
26 26 </a-col>
27 27 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
  View file @20f1675
... ... @@ -6,41 +6,58 @@
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 8 <a-form-item label="货主">
9   - <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
  9 + <a-select
  10 + show-search
  11 + placeholder="请选择货主"
  12 + option-filter-prop="children"
  13 + v-model="queryParam.companyCode">
  14 + <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
  15 + item.name
  16 + }}
  17 + </a-select-option>
  18 + </a-select>
10 19 </a-form-item>
11 20 </a-col>
12 21 <a-col :xl="6" :lg="7" :md="8" :sm="24">
13 22 <a-form-item label="库区">
14   - <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input>
  23 + <a-select
  24 + show-search
  25 + placeholder="请选择库区"
  26 + option-filter-prop="children"
  27 + v-model="queryParam.zoneCode">
  28 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  29 + {{item.name}}
  30 + </a-select-option>
  31 + </a-select>
  32 + </a-form-item>
  33 + </a-col>
  34 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  35 + <a-form-item label="库位编码">
  36 + <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
  37 + </a-form-item>
  38 + </a-col>
  39 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  40 + <a-form-item label="容器编码">
  41 + <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
  42 + </a-form-item>
  43 + </a-col>
  44 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  45 + <a-form-item label="库存状态">
  46 + <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
  47 + </a-form-item>
  48 + </a-col>
  49 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  50 + <a-form-item label="物料编码">
  51 + <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
  52 + </a-form-item>
  53 + </a-col>
  54 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  55 + <a-form-item label="物料名称">
  56 + <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
15 57 </a-form-item>
16 58 </a-col>
17 59 <template v-if="toggleSearchStatus">
18 60 <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="容器状态">
20   - <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus" dictCode="container_status"/>
21   - </a-form-item>
22   - </a-col>
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="容器编码">
25   - <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
26   - </a-form-item>
27   - </a-col>
28   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
29   - <a-form-item label="库位编码">
30   - <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
31   - </a-form-item>
32   - </a-col>
33   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
34   - <a-form-item label="物料编码">
35   - <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
36   - </a-form-item>
37   - </a-col>
38   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
39   - <a-form-item label="物料名称">
40   - <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
41   - </a-form-item>
42   - </a-col>
43   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
44 61 <a-form-item label="物料规格">
45 62 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
46 63 </a-form-item>
... ... @@ -51,8 +68,8 @@
51 68 </a-form-item>
52 69 </a-col>
53 70 <a-col :xl="6" :lg="7" :md="8" :sm="24">
54   - <a-form-item label="库存状态">
55   - <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
  71 + <a-form-item label="容器状态">
  72 + <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus" dictCode="container_status"/>
56 73 </a-form-item>
57 74 </a-col>
58 75 <a-col :xl="6" :lg="7" :md="8" :sm="24">
... ... @@ -124,6 +141,18 @@
124 141 class="j-table-force-nowrap"
125 142 @change="handleTableChange">
126 143  
  144 + <span slot="companyCode" slot-scope="companyCode">
  145 + <a-tag :key="companyCode" color="blue">
  146 + {{ solutionCompany(companyCode) }}
  147 + </a-tag>
  148 + </span>
  149 +
  150 + <span slot="zoneCode" slot-scope="zoneCode">
  151 + <a-tag :key="zoneCode" color=blue>
  152 + {{ solutionZoneCode(zoneCode) }}
  153 + </a-tag>
  154 + </span>
  155 +
127 156 <template slot="htmlSlot" slot-scope="text">
128 157 <div v-html="text"></div>
129 158 </template>
... ... @@ -155,167 +184,204 @@
155 184  
156 185 <script>
157 186  
158   - import '@/assets/less/TableExpand.less'
159   - import { mixinDevice } from '@/utils/mixin'
160   - import { JeecgListMixin } from '@/mixins/JeecgListMixin'
161   - import InventoryChildModal from './modules/InventoryChildModal'
162   - import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
  187 +import '@/assets/less/TableExpand.less'
  188 +import { mixinDevice } from '@/utils/mixin'
  189 +import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  190 +import InventoryChildModal from './modules/InventoryChildModal'
  191 +import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
163 192  
164   - export default {
165   - name: 'InventoryChildList',
166   - mixins:[JeecgListMixin, mixinDevice],
167   - components: {
168   - InventoryChildModal
169   - },
170   - data () {
171   - return {
172   - description: '库存明细管理页面',
173   - // 表头
174   - columns: [
175   - {
176   - title: '#',
177   - dataIndex: '',
178   - key:'rowIndex',
179   - width:60,
180   - align:"center",
181   - customRender:function (t,r,index) {
182   - return parseInt(index)+1;
183   - }
184   - },
185   - {
186   - title:'货主',
187   - align:"center",
188   - dataIndex: 'companyCode'
189   - },
190   - {
191   - title:'库区',
192   - align:"center",
193   - dataIndex: 'zoneCode'
194   - },
195   - {
196   - title:'容器状态',
197   - align:"center",
198   - dataIndex: 'containerStatus_dictText'
199   - },
200   - {
201   - title:'容器编码',
202   - align:"center",
203   - dataIndex: 'containerCode'
204   - },
205   - {
206   - title:'库位编码',
207   - align:"center",
208   - dataIndex: 'locationCode'
209   - },
210   - {
211   - title:'物料编码',
212   - align:"center",
213   - dataIndex: 'materialCode'
214   - },
215   - {
216   - title:'物料名称',
217   - align:"center",
218   - dataIndex: 'materialName'
219   - },
220   - {
221   - title:'物料规格',
222   - align:"center",
223   - dataIndex: 'materialSpec'
224   - },
225   - {
226   - title:'物料单位',
227   - align:"center",
228   - dataIndex: 'materialUnit'
229   - },
230   - {
231   - title:'库存状态',
232   - align:"center",
233   - dataIndex: 'inventoryStatus_dictText'
234   - },
235   - {
236   - title:'库龄（天）',
237   - align:"center",
238   - dataIndex: 'inventoryAge'
239   - },
240   - {
241   - title:'唯一号',
242   - align:"center",
243   - dataIndex: 'uniqueCode'
244   - },
245   - {
246   - title:'创建人',
247   - align:"center",
248   - dataIndex: 'createBy'
249   - },
250   - {
251   - title:'创建日期',
252   - align:"center",
253   - dataIndex: 'createTime'
254   - },
255   - {
256   - title:'更新人',
257   - align:"center",
258   - dataIndex: 'updateBy'
259   - },
260   - {
261   - title:'更新日期',
262   - align:"center",
263   - dataIndex: 'updateTime'
264   - },
265   - {
266   - title: '操作',
267   - dataIndex: 'action',
268   - align:"center",
269   - fixed:"right",
270   - width:147,
271   - scopedSlots: { customRender: 'action' }
272   - }
273   - ],
274   - url: {
275   - list: "/inventory/inventoryChild/list",
276   - delete: "/inventory/inventoryChild/delete",
277   - deleteBatch: "/inventory/inventoryChild/deleteBatch",
278   - exportXlsUrl: "/inventory/inventoryChild/exportXls",
279   - importExcelUrl: "inventory/inventoryChild/importExcel",
  193 +import {getCompanyList, getZoneList} from "@api/api";
280 194  
  195 +export default {
  196 + name: 'InventoryChildList',
  197 + mixins:[JeecgListMixin, mixinDevice],
  198 + components: {
  199 + InventoryChildModal
  200 + },
  201 + data () {
  202 + return {
  203 + zoneList: [],
  204 + companyList: [],
  205 + description: '库存明细管理页面',
  206 + // 表头
  207 + columns: [
  208 + {
  209 + title: '#',
  210 + dataIndex: '',
  211 + key:'rowIndex',
  212 + width:60,
  213 + align:"center",
  214 + customRender:function (t,r,index) {
  215 + return parseInt(index)+1;
  216 + }
  217 + },
  218 + {
  219 + title:'货主',
  220 + align:"center",
  221 + dataIndex: 'companyCode'
  222 + },
  223 + {
  224 + title:'库区',
  225 + align:"center",
  226 + dataIndex: 'zoneCode'
  227 + },
  228 + {
  229 + title:'容器状态',
  230 + align:"center",
  231 + dataIndex: 'containerStatus_dictText'
  232 + },
  233 + {
  234 + title:'容器编码',
  235 + align:"center",
  236 + dataIndex: 'containerCode'
  237 + },
  238 + {
  239 + title:'库位编码',
  240 + align:"center",
  241 + dataIndex: 'locationCode'
  242 + },
  243 + {
  244 + title:'物料编码',
  245 + align:"center",
  246 + dataIndex: 'materialCode'
  247 + },
  248 + {
  249 + title:'物料名称',
  250 + align:"center",
  251 + dataIndex: 'materialName'
281 252 },
282   - dictOptions:{},
283   - superFieldList:[],
284   - }
  253 + {
  254 + title:'物料规格',
  255 + align:"center",
  256 + dataIndex: 'materialSpec'
  257 + },
  258 + {
  259 + title:'物料单位',
  260 + align:"center",
  261 + dataIndex: 'materialUnit'
  262 + },
  263 + {
  264 + title:'库存状态',
  265 + align:"center",
  266 + dataIndex: 'inventoryStatus_dictText'
  267 + },
  268 + {
  269 + title:'库龄（天）',
  270 + align:"center",
  271 + dataIndex: 'inventoryAge'
  272 + },
  273 + {
  274 + title:'唯一号',
  275 + align:"center",
  276 + dataIndex: 'uniqueCode'
  277 + },
  278 + {
  279 + title:'创建人',
  280 + align:"center",
  281 + dataIndex: 'createBy'
  282 + },
  283 + {
  284 + title:'创建日期',
  285 + align:"center",
  286 + dataIndex: 'createTime'
  287 + },
  288 + {
  289 + title:'更新人',
  290 + align:"center",
  291 + dataIndex: 'updateBy'
  292 + },
  293 + {
  294 + title:'更新日期',
  295 + align:"center",
  296 + dataIndex: 'updateTime'
  297 + },
  298 + {
  299 + title: '操作',
  300 + dataIndex: 'action',
  301 + align:"center",
  302 + fixed:"right",
  303 + width:147,
  304 + scopedSlots: { customRender: 'action' }
  305 + }
  306 + ],
  307 + url: {
  308 + list: "/inventory/inventoryChild/list",
  309 + delete: "/inventory/inventoryChild/delete",
  310 + deleteBatch: "/inventory/inventoryChild/deleteBatch",
  311 + exportXlsUrl: "/inventory/inventoryChild/exportXls",
  312 + importExcelUrl: "inventory/inventoryChild/importExcel",
  313 +
  314 + },
  315 + dictOptions:{},
  316 + superFieldList:[],
  317 + }
  318 + },
  319 + created() {
  320 + this.getSuperFieldList();
  321 + this.loadFrom();
  322 + },
  323 + computed: {
  324 + importExcelUrl: function(){
  325 + return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
285 326 },
286   - created() {
287   - this.getSuperFieldList();
  327 + },
  328 + methods: {
  329 + loadFrom() {
  330 + getZoneList().then((res) => {
  331 + if (res.success) {
  332 + this.zoneList = res.result
  333 + }
  334 + });
  335 + getCompanyList().then(res => {
  336 + if (res.success) {
  337 + this.companyList = res.result
  338 + }
  339 + })
288 340 },
289   - computed: {
290   - importExcelUrl: function(){
291   - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
292   - },
  341 + solutionCompany(value) {
  342 + var actions = []
  343 + Object.keys(this.companyList).some(key => {
  344 + if (this.companyList[key].code == '' + value) {
  345 + actions.push(this.companyList[key].name)
  346 + return true
  347 + }
  348 + })
  349 + return actions.join('')
293 350 },
294   - methods: {
295   - initDictConfig(){
296   - },
297   - getSuperFieldList(){
298   - let fieldList=[];
299   - fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
300   - fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
301   - fieldList.push({type:'string',value:'containerStatus',text:'容器状态',dictCode:'container_status'})
302   - fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
303   - fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
304   - fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
305   - fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
306   - fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
307   - fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
308   - fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
309   - fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
310   - fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
311   - fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
312   - fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
313   - fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
314   - fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
315   - this.superFieldList = fieldList
316   - }
  351 + solutionZoneCode(value) {
  352 + var actions = []
  353 + Object.keys(this.zoneList).some((key) => {
  354 + if (this.zoneList[key].code == ('' + value)) {
  355 + actions.push(this.zoneList[key].name)
  356 + return true
  357 + }
  358 + })
  359 + return actions.join('')
  360 + },
  361 + initDictConfig(){
  362 + },
  363 + getSuperFieldList(){
  364 + let fieldList=[];
  365 + fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
  366 + fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
  367 + fieldList.push({type:'string',value:'containerStatus',text:'容器状态',dictCode:'container_status'})
  368 + fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
  369 + fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
  370 + fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
  371 + fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
  372 + fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
  373 + fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
  374 + fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
  375 + fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
  376 + fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
  377 + fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
  378 + fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
  379 + fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
  380 + fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
  381 + this.superFieldList = fieldList
317 382 }
318 383 }
  384 +}
319 385 </script>
320 386 <style scoped>
321 387 @import '~@assets/less/common.less';
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
  View file @20f1675
... ... @@ -3,10 +3,7 @@
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5 5 <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
6   - <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')"
7   - >导出
8   - </a-button
9   - >
  6 + <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
10 7 <a-upload
11 8 v-has="'inventoryDetail:import'"
12 9 name="file"
... ... @@ -18,28 +15,10 @@
18 15 >
19 16 <a-button type="primary" icon="import">导入</a-button>
20 17 </a-upload>
21   - <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
23   - <a-menu-item key="1" @click="batchDel">
24   - <a-icon type="delete"/>
25   - 删除
26   - </a-menu-item>
27   - </a-menu>
28   - <a-button style="margin-left: 8px">
29   - 批量操作
30   - <a-icon type="down"/>
31   - </a-button>
32   - </a-dropdown>
33 18 </div>
34 19  
35 20 <!-- table区域-begin -->
36 21 <div>
37   - <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
38   - <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
39   - <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
40   - <a style="margin-left: 24px" @click="onClearSelected">清空</a>
41   - </div>
42   -
43 22 <a-table
44 23 ref="table"
45 24 size="middle"
... ... @@ -50,7 +29,6 @@
50 29 :dataSource="dataSource"
51 30 :pagination="ipagination"
52 31 :loading="loading"
53   - :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
54 32 @change="handleTableChange"
55 33 >
56 34 <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @20f1675
... ... @@ -17,41 +17,39 @@
17 17 </a-select>
18 18 </a-form-item>
19 19 </a-col>
  20 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  21 + <a-form-item label="库位编码">
  22 + <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
  23 + </a-form-item>
  24 + </a-col>
20 25 <a-col :xl="6" :lg="7" :md="8" :sm="24">
21 26 <a-form-item label="容器编码">
22 27 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
23 28 </a-form-item>
24 29 </a-col>
25   - <template v-if="toggleSearchStatus">
26   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
27   - <a-form-item label="容器状态">
28   - <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus"
29   - dictCode="container_status"/>
30   - </a-form-item>
31   - </a-col>
32   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
33   - <a-form-item label="库位号">
34   - <a-input placeholder="请输入库位号" v-model="queryParam.locationCode"></a-input>
35   - </a-form-item>
36   - </a-col>
37   - <a-col :xl="12" :lg="14" :md="16" :sm="24">
38   - <a-form-item label="创建日期">
39   - <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
40   - class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
41   - <span class="query-group-split-cust"></span>
42   - <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
43   - class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
44   - </a-form-item>
45   - </a-col>
46   - </template>
  30 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  31 + <a-form-item label="容器状态">
  32 + <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus"
  33 + dictCode="container_status"/>
  34 + </a-form-item>
  35 + </a-col>
  36 + <a-col :xl="12" :lg="14" :md="16" :sm="24">
  37 + <a-form-item label="创建日期">
  38 + <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
  39 + class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
  40 + <span class="query-group-split-cust"></span>
  41 + <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
  42 + class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
  43 + </a-form-item>
  44 + </a-col>
47 45 <a-col :xl="6" :lg="7" :md="8" :sm="24">
48 46 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
49 47 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
50 48 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
51   - <a @click="handleToggleSearch" style="margin-left: 8px">
  49 + <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
52 50 {{ toggleSearchStatus ? '收起' : '展开' }}
53 51 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
54   - </a>
  52 + </a> -->
55 53 </span>
56 54 </a-col>
57 55 </a-row>
... ... @@ -199,7 +197,7 @@ export default {
199 197 scopedSlots: {customRender: 'containerStatus_dictText'}
200 198 },
201 199 {
202   - title: '库位号',
  200 + title: '库位编码',
203 201 align: "center",
204 202 dataIndex: 'locationCode'
205 203 },
... ... @@ -358,7 +356,7 @@ export default {
358 356 fieldList.push({type: 'string', value: 'zoneCode', text: '库区', dictCode: ''})
359 357 fieldList.push({type: 'string', value: 'containerCode', text: '容器编码', dictCode: ''})
360 358 fieldList.push({type: 'string', value: 'containerStatus', text: '容器状态', dictCode: 'container_status'})
361   - fieldList.push({type: 'string', value: 'locationCode', text: '库位号', dictCode: ''})
  359 + fieldList.push({type: 'string', value: 'locationCode', text: '库位编码', dictCode: ''})
362 360 fieldList.push({type: 'BigDecimal', value: 'totalQty', text: '总数量', dictCode: ''})
363 361 fieldList.push({type: 'int', value: 'totalLines', text: '总行量', dictCode: ''})
364 362 fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
  View file @20f1675
... ... @@ -6,7 +6,16 @@
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 8 <a-form-item label="货主">
9   - <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
  9 + <a-select
  10 + show-search
  11 + placeholder="请选择货主"
  12 + option-filter-prop="children"
  13 + v-model="queryParam.companyCode">
  14 + <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
  15 + item.name
  16 + }}
  17 + </a-select-option>
  18 + </a-select>
10 19 </a-form-item>
11 20 </a-col>
12 21 <a-col :xl="6" :lg="7" :md="8" :sm="24">
... ... @@ -14,26 +23,29 @@
14 23 <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
15 24 </a-form-item>
16 25 </a-col>
17   - <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="物料名称">
20   - <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
21   - </a-form-item>
22   - </a-col>
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="物料规格">
25   - <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
26   - </a-form-item>
27   - </a-col>
28   - </template>
  26 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  27 + <a-form-item label="物料名称">
  28 + <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
  29 + </a-form-item>
  30 + </a-col>
  31 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  32 + <a-form-item label="物料规格">
  33 + <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
  34 + </a-form-item>
  35 + </a-col>
  36 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  37 + <a-form-item label="物料单位">
  38 + <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
  39 + </a-form-item>
  40 + </a-col>
29 41 <a-col :xl="6" :lg="7" :md="8" :sm="24">
30 42 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
31 43 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
32 44 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
33   - <a @click="handleToggleSearch" style="margin-left: 8px">
  45 + <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
34 46 {{ toggleSearchStatus ? '收起' : '展开' }}
35 47 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
36   - </a>
  48 + </a> -->
37 49 </span>
38 50 </a-col>
39 51 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
  View file @20f1675
... ... @@ -19,33 +19,37 @@
19 19 </a-form-item>
20 20 </a-col>
21 21 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  22 + <a-form-item label="库位编码">
  23 + <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
  24 + </a-form-item>
  25 + </a-col>
  26 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
22 27 <a-form-item label="容器编码">
23 28 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
24 29 </a-form-item>
25 30 </a-col>
  31 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  32 + <a-form-item label="交易类型">
  33 + <j-dict-select-tag placeholder="请选择交易类型" v-model="queryParam.type" dictCode="inventory_transaction_type"/>
  34 + </a-form-item>
  35 + </a-col>
  36 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  37 + <a-form-item label="库存状态">
  38 + <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
  39 + </a-form-item>
  40 + </a-col>
  41 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  42 + <a-form-item label="物料编码">
  43 + <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
  44 + </a-form-item>
  45 + </a-col>
  46 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  47 + <a-form-item label="物料名称">
  48 + <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
  49 + </a-form-item>
  50 + </a-col>
26 51 <template v-if="toggleSearchStatus">
27 52 <a-col :xl="6" :lg="7" :md="8" :sm="24">
28   - <a-form-item label="库位编码">
29   - <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
30   - </a-form-item>
31   - </a-col>
32   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
33   - <a-form-item label="交易类型">
34   - <j-dict-select-tag placeholder="请选择交易类型" v-model="queryParam.type"
35   - dictCode="inventory_transaction_type"/>
36   - </a-form-item>
37   - </a-col>
38   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
39   - <a-form-item label="物料编码">
40   - <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
41   - </a-form-item>
42   - </a-col>
43   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
44   - <a-form-item label="物料名称">
45   - <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
46   - </a-form-item>
47   - </a-col>
48   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
49 53 <a-form-item label="物料规格">
50 54 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
51 55 </a-form-item>
... ... @@ -56,12 +60,6 @@
56 60 </a-form-item>
57 61 </a-col>
58 62 <a-col :xl="6" :lg="7" :md="8" :sm="24">
59   - <a-form-item label="库存状态">
60   - <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus"
61   - dictCode="inventory_status"/>
62   - </a-form-item>
63   - </a-col>
64   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
65 63 <a-form-item label="批次">
66 64 <a-input placeholder="请输入批次" v-model="queryParam.batch"></a-input>
67 65 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
  View file @20f1675
... ... @@ -6,36 +6,62 @@
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 8 <a-form-item label="货主">
9   - <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
  9 + <a-select
  10 + show-search
  11 + placeholder="请选择货主"
  12 + option-filter-prop="children"
  13 + v-model="queryParam.companyCode">
  14 + <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
  15 + item.name
  16 + }}
  17 + </a-select-option>
  18 + </a-select>
10 19 </a-form-item>
11 20 </a-col>
12 21 <a-col :xl="6" :lg="7" :md="8" :sm="24">
13 22 <a-form-item label="库区">
14   - <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input>
  23 + <a-select
  24 + show-search
  25 + placeholder="请选择库区"
  26 + option-filter-prop="children"
  27 + v-model="queryParam.zoneCode">
  28 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  29 + {{item.name}}
  30 + </a-select-option>
  31 + </a-select>
  32 + </a-form-item>
  33 + </a-col>
  34 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  35 + <a-form-item label="库位编码">
  36 + <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
  37 + </a-form-item>
  38 + </a-col>
  39 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  40 + <a-form-item label="容器编码">
  41 + <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
  42 + </a-form-item>
  43 + </a-col>
  44 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  45 + <a-form-item label="库存状态">
  46 + <j-dict-select-tag
  47 + placeholder="请选择库存状态"
  48 + v-model="queryParam.inventoryStatus"
  49 + dictCode="inventory_status"
  50 + />
  51 + </a-form-item>
  52 + </a-col>
  53 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  54 + <a-form-item label="物料编码">
  55 + <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
  56 + </a-form-item>
  57 + </a-col>
  58 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  59 + <a-form-item label="物料名称">
  60 + <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
15 61 </a-form-item>
16 62 </a-col>
17 63 <template v-if="toggleSearchStatus">
18 64 <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="容器编码">
20   - <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
21   - </a-form-item>
22   - </a-col>
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="库位编码">
25   - <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
26   - </a-form-item>
27   - </a-col>
28   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
29   - <a-form-item label="物料编码">
30   - <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
31   - </a-form-item>
32   - </a-col>
33   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
34   - <a-form-item label="物料名称">
35   - <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
36   - </a-form-item>
37   - </a-col>
38   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
39 65 <a-form-item label="物料规格">
40 66 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
41 67 </a-form-item>
... ... @@ -46,15 +72,6 @@
46 72 </a-form-item>
47 73 </a-col>
48 74 <a-col :xl="6" :lg="7" :md="8" :sm="24">
49   - <a-form-item label="库存状态">
50   - <j-dict-select-tag
51   - placeholder="请选择库存状态"
52   - v-model="queryParam.inventoryStatus"
53   - dictCode="inventory_status"
54   - />
55   - </a-form-item>
56   - </a-col>
57   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
58 75 <a-form-item label="批次">
59 76 <a-input placeholder="请输入批次" v-model="queryParam.batch"></a-input>
60 77 </a-form-item>
... ... @@ -64,17 +81,16 @@
64 81 <a-input placeholder="请输入唯一号" v-model="queryParam.uniqueCode"></a-input>
65 82 </a-form-item>
66 83 </a-col> -->
67   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
68   - <a-form-item label="入库日期">
69   - <j-date
70   - :show-time="true"
71   - date-format="YYYY-MM-DD HH:mm:ss"
72   - placeholder="请选择入库日期"
73   - v-model="queryParam.receiptDate"
74   - ></j-date>
  84 + <a-col :xl="12" :lg="14" :md="16" :sm="24">
  85 + <a-form-item label="创建日期">
  86 + <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
  87 + class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
  88 + <span class="query-group-split-cust"></span>
  89 + <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
  90 + class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
75 91 </a-form-item>
76 92 </a-col>
77   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
  93 + <a-col :xl='6' :lg='7' :md='8' :sm='24'>
78 94 <a-form-item label='库龄大于（天）'>
79 95 <a-input placeholder='请输入库龄大于（天）' v-model='queryParam.inventoryAge'></a-input>
80 96 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryHeaderModal.vue
  View file @20f1675
... ... @@ -33,8 +33,8 @@
33 33 </a-form-model-item>
34 34 </a-col>
35 35 <a-col :span="24">
36   - <a-form-model-item label="库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
37   - <a-input v-model="model.locationCode" placeholder="请输入库位号"></a-input>
  36 + <a-form-model-item label="库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
  37 + <a-input v-model="model.locationCode" placeholder="请输入库位编码"></a-input>
38 38 </a-form-model-item>
39 39 </a-col>
40 40 <a-col :span="24">
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @20f1675
... ... @@ -19,22 +19,27 @@
19 19 <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
20 20 </a-form-item>
21 21 </a-col>
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="起始库位">
  24 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  25 + </a-form-item>
  26 + </a-col>
  27 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  28 + <a-form-item label="目标库位">
  29 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  30 + </a-form-item>
  31 + </a-col>
  32 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  33 + <a-form-item label="目标出入口">
  34 + <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
  35 + </a-form-item>
  36 + </a-col>
  37 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  38 + <a-form-item label="创建人">
  39 + <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
  40 + </a-form-item>
  41 + </a-col>
22 42 <template v-if="toggleSearchStatus">
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="起始库位">
25   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
26   - </a-form-item>
27   - </a-col>
28   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
29   - <a-form-item label="目标库位">
30   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
31   - </a-form-item>
32   - </a-col>
33   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
34   - <a-form-item label="目标出入口">
35   - <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
36   - </a-form-item>
37   - </a-col>
38 43 <a-col :xl="12" :lg="14" :md="16" :sm="24">
39 44 <a-form-item label="创建日期">
40 45 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @20f1675
... ... @@ -24,7 +24,6 @@
24 24 </a-select>
25 25 </a-form-item>
26 26 </a-col>
27   -
28 27 <a-col :xl="6" :lg="7" :md="8" :sm="24">
29 28 <a-form-item label="入库单类型">
30 29 <a-select
... ... @@ -39,38 +38,36 @@
39 38 </a-select>
40 39 </a-form-item>
41 40 </a-col>
42   -
  41 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  42 + <a-form-item label="头状态">
  43 + <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
  44 + </a-form-item>
  45 + </a-col>
  46 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  47 + <a-form-item label="尾状态">
  48 + <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="receipt_status"/>
  49 + </a-form-item>
  50 + </a-col>
  51 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  52 + <a-form-item label="上游单号">
  53 + <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
  54 + </a-form-item>
  55 + </a-col>
  56 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  57 + <a-form-item label="供应商">
  58 + <a-select
  59 + show-search
  60 + placeholder="请选择供应商"
  61 + option-filter-prop="children"
  62 + v-model="queryParam.supplierCode">
  63 + <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{
  64 + item.name
  65 + }}
  66 + </a-select-option>
  67 + </a-select>
  68 + </a-form-item>
  69 + </a-col>
43 70 <template v-if="toggleSearchStatus">
44   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
45   - <a-form-item label="头状态">
46   - <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
47   - </a-form-item>
48   - </a-col>
49   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
50   - <a-form-item label="尾状态">
51   - <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="receipt_status"/>
52   - </a-form-item>
53   - </a-col>
54   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
55   - <a-form-item label="上游单号">
56   - <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
57   - </a-form-item>
58   - </a-col>
59   -
60   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
61   - <a-form-item label="供应商">
62   - <a-select
63   - show-search
64   - placeholder="请选择供应商"
65   - option-filter-prop="children"
66   - v-model="queryParam.supplierCode">
67   - <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{
68   - item.name
69   - }}
70   - </a-select-option>
71   - </a-select>
72   - </a-form-item>
73   - </a-col>
74 71 <a-col :xl="12" :lg="14" :md="16" :sm="24">
75 72 <a-form-item label="创建日期">
76 73 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @20f1675
... ... @@ -14,33 +14,33 @@
14 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="shipment_task_type"/>
15 15 </a-form-item>
16 16 </a-col>
  17 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  18 + <a-form-item label="状态">
  19 + <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status"
  20 + dictCode="shipment_container_status"/>
  21 + </a-form-item>
  22 + </a-col>
  23 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  24 + <a-form-item label="起始库位">
  25 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  26 + </a-form-item>
  27 + </a-col>
  28 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  29 + <a-form-item label="目标库位">
  30 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  31 + </a-form-item>
  32 + </a-col>
  33 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  34 + <a-form-item label="目标出入口">
  35 + <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
  36 + </a-form-item>
  37 + </a-col>
  38 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  39 + <a-form-item label="创建人">
  40 + <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
  41 + </a-form-item>
  42 + </a-col>
17 43 <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="状态">
20   - <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status"
21   - dictCode="shipment_container_status"/>
22   - </a-form-item>
23   - </a-col>
24   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
25   - <a-form-item label="起始库位">
26   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
27   - </a-form-item>
28   - </a-col>
29   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
30   - <a-form-item label="目标库位">
31   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
32   - </a-form-item>
33   - </a-col>
34   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
35   - <a-form-item label="目标出入口">
36   - <a-input placeholder="请输入目标出入口" v-model="queryParam.toPort"></a-input>
37   - </a-form-item>
38   - </a-col>
39   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
40   - <a-form-item label="创建人">
41   - <a-input placeholder="请输入创建人" v-model="queryParam.createBy"></a-input>
42   - </a-form-item>
43   - </a-col>
44 44 <a-col :xl="12" :lg="14" :md="16" :sm="24">
45 45 <a-form-item label="创建日期">
46 46 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @20f1675
... ... @@ -37,37 +37,37 @@
37 37 </a-select>
38 38 </a-form-item>
39 39 </a-col>
  40 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  41 + <a-form-item label="头状态">
  42 + <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="shipment_status"/>
  43 + </a-form-item>
  44 + </a-col>
  45 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  46 + <a-form-item label="尾状态">
  47 + <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="shipment_status"/>
  48 + </a-form-item>
  49 + </a-col>
  50 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  51 + <a-form-item label="上游单号">
  52 + <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
  53 + </a-form-item>
  54 + </a-col>
  55 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  56 + <a-form-item label="客户">
  57 + <a-select
  58 + show-search
  59 + placeholder="请选择客户"
  60 + option-filter-prop="children"
  61 + v-model="queryParam.customerCode">
  62 + <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
  63 + item.name
  64 + }}
  65 + </a-select-option>
  66 + </a-select>
  67 + </a-form-item>
  68 + </a-col>
40 69 <template v-if="toggleSearchStatus">
41 70 <a-col :xl="6" :lg="7" :md="8" :sm="24">
42   - <a-form-item label="头状态">
43   - <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="shipment_status"/>
44   - </a-form-item>
45   - </a-col>
46   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
47   - <a-form-item label="尾状态">
48   - <j-dict-select-tag placeholder="请选择尾状态" v-model="queryParam.lastStatus" dictCode="shipment_status"/>
49   - </a-form-item>
50   - </a-col>
51   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
52   - <a-form-item label="上游单号">
53   - <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
54   - </a-form-item>
55   - </a-col>
56   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
57   - <a-form-item label="客户">
58   - <a-select
59   - show-search
60   - placeholder="请选择客户"
61   - option-filter-prop="children"
62   - v-model="queryParam.customerCode">
63   - <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
64   - item.name
65   - }}
66   - </a-select-option>
67   - </a-select>
68   - </a-form-item>
69   - </a-col>
70   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
71 71 <a-form-item label="出库单备注">
72 72 <a-input placeholder="请输入出库单备注" v-model="queryParam.remark"></a-input>
73 73 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
  View file @20f1675
... ... @@ -5,6 +5,11 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="任务ID">
  9 + <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 13 <a-form-item label="任务类型">
9 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="agv_task_type"/>
10 15 </a-form-item>
... ... @@ -14,31 +19,25 @@
14 19 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
15 20 </a-form-item>
16 21 </a-col>
17   - <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="状态">
20   - <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="agv_task_status"/>
21   - </a-form-item>
22   - </a-col>
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24   - <a-form-item label="起始点位">
25   - <a-input placeholder="请输入起始点位" v-model="queryParam.fromPort"></a-input>
26   - </a-form-item>
27   - </a-col>
28   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
29   - <a-form-item label="目标点位">
30   - <a-input placeholder="请输入目标点位" v-model="queryParam.toPort"></a-input>
31   - </a-form-item>
32   - </a-col>
33   - </template>
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="状态">
  24 + <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="agv_task_status"/>
  25 + </a-form-item>
  26 + </a-col>
  27 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  28 + <a-form-item label="起始点位">
  29 + <a-input placeholder="请输入起始点位" v-model="queryParam.fromPort"></a-input>
  30 + </a-form-item>
  31 + </a-col>
  32 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  33 + <a-form-item label="目标点位">
  34 + <a-input placeholder="请输入目标点位" v-model="queryParam.toPort"></a-input>
  35 + </a-form-item>
  36 + </a-col>
34 37 <a-col :xl="6" :lg="7" :md="8" :sm="24">
35 38 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
36 39 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
37 40 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
38   - <a @click="handleToggleSearch" style="margin-left: 8px">
39   - {{ toggleSearchStatus ? '收起' : '展开' }}
40   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
41   - </a>
42 41 </span>
43 42 </a-col>
44 43 </a-row>
... ...
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @20f1675
... ... @@ -5,6 +5,11 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="任务ID">
  9 + <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 13 <a-form-item label="任务类型">
9 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
10 15 </a-form-item>
... ... @@ -14,31 +19,36 @@
14 19 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
15 20 </a-form-item>
16 21 </a-col>
17   - <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="库区">
20   - <a-select
21   - show-search
22   - placeholder="请选择库区"
23   - option-filter-prop="children"
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="库区">
  24 + <a-select
  25 + show-search
  26 + placeholder="请选择库区"
  27 + option-filter-prop="children"
24 28  
25   - v-model="queryParam.zoneCode">
26   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
27   - {{item.name}}
28   - </a-select-option>
29   - </a-select>
30   - </a-form-item>
31   - </a-col>
32   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
33   - <a-form-item label="起始库位">
34   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
35   - </a-form-item>
36   - </a-col>
37   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
38   - <a-form-item label="目标库位">
39   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
40   - </a-form-item>
41   - </a-col>
  29 + v-model="queryParam.zoneCode">
  30 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  31 + {{item.name}}
  32 + </a-select-option>
  33 + </a-select>
  34 + </a-form-item>
  35 + </a-col>
  36 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  37 + <a-form-item label="起始库位">
  38 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  39 + </a-form-item>
  40 + </a-col>
  41 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  42 + <a-form-item label="目标库位">
  43 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  44 + </a-form-item>
  45 + </a-col>
  46 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  47 + <a-form-item label="任务状态">
  48 + <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
  49 + </a-form-item>
  50 + </a-col>
  51 + <template v-if="toggleSearchStatus">
42 52 <a-col :xl="6" :lg="7" :md="8" :sm="24">
43 53 <a-form-item label="起始出入口">
44 54 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
... ... @@ -49,11 +59,7 @@
49 59 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
50 60 </a-form-item>
51 61 </a-col>
52   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
53   - <a-form-item label="任务状态">
54   - <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
55   - </a-form-item>
56   - </a-col>
  62 +
57 63 <a-col :xl="12" :lg="14" :md="16" :sm="24">
58 64 <a-form-item label="创建日期">
59 65 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ... @@ -456,7 +462,7 @@ export default {
456 462 fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
457 463 fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
458 464 fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
459   - fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
  465 + fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
460 466 fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
461 467 fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
462 468 fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @20f1675
... ... @@ -5,6 +5,11 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="任务ID">
  9 + <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 13 <a-form-item label="任务类型">
9 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
10 15 </a-form-item>
... ... @@ -14,31 +19,36 @@
14 19 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
15 20 </a-form-item>
16 21 </a-col>
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="库区">
  24 + <a-select
  25 + show-search
  26 + placeholder="请选择库区"
  27 + option-filter-prop="children"
  28 + v-model="queryParam.zoneCode">
  29 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  30 + {{item.name}}
  31 + </a-select-option>
  32 + </a-select>
  33 + </a-form-item>
  34 + </a-col>
  35 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  36 + <a-form-item label="起始库位">
  37 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  38 + </a-form-item>
  39 + </a-col>
  40 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  41 + <a-form-item label="目标库位">
  42 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  43 + </a-form-item>
  44 + </a-col>
  45 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  46 + <a-form-item label="任务状态">
  47 + <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
  48 + </a-form-item>
  49 + </a-col>
17 50 <template v-if="toggleSearchStatus">
18 51 <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="库区">
20   - <a-select
21   - show-search
22   - placeholder="请选择库区"
23   - option-filter-prop="children"
24   - v-model="queryParam.zoneCode">
25   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
26   - {{item.name}}
27   - </a-select-option>
28   - </a-select>
29   - </a-form-item>
30   - </a-col>
31   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
32   - <a-form-item label="起始库位">
33   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
34   - </a-form-item>
35   - </a-col>
36   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
37   - <a-form-item label="目标库位">
38   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
39   - </a-form-item>
40   - </a-col>
41   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
42 52 <a-form-item label="起始出入口">
43 53 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
44 54 </a-form-item>
... ... @@ -48,11 +58,6 @@
48 58 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
49 59 </a-form-item>
50 60 </a-col>
51   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
52   - <a-form-item label="任务状态">
53   - <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
54   - </a-form-item>
55   - </a-col>
56 61 <a-col :xl="12" :lg="14" :md="16" :sm="24">
57 62 <a-form-item label="创建日期">
58 63 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ... @@ -494,7 +499,7 @@ export default {
494 499 fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
495 500 fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
496 501 fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
497   - fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
  502 + fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
498 503 fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
499 504 fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
500 505 fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @20f1675
... ... @@ -5,6 +5,11 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="任务ID">
  9 + <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 13 <a-form-item label="任务类型">
9 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
10 15 </a-form-item>
... ... @@ -14,36 +19,36 @@
14 19 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
15 20 </a-form-item>
16 21 </a-col>
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="库区">
  24 + <a-select
  25 + show-search
  26 + placeholder="请选择库区"
  27 + option-filter-prop="children"
  28 + v-model="queryParam.zoneCode">
  29 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  30 + {{item.name}}
  31 + </a-select-option>
  32 + </a-select>
  33 + </a-form-item>
  34 + </a-col>
  35 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  36 + <a-form-item label="起始库位">
  37 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  38 + </a-form-item>
  39 + </a-col>
  40 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  41 + <a-form-item label="目标库位">
  42 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  43 + </a-form-item>
  44 + </a-col>
  45 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  46 + <a-form-item label="任务状态">
  47 + <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
  48 + </a-form-item>
  49 + </a-col>
17 50 <template v-if="toggleSearchStatus">
18   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="库区">
20   - <a-select
21   - show-search
22   - placeholder="请选择库区"
23   - option-filter-prop="children"
24   - v-model="queryParam.zoneCode">
25   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
26   - {{item.name}}
27   - </a-select-option>
28   - </a-select>
29   - </a-form-item>
30   - </a-col>
31   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
32   - <a-form-item label="起始库位">
33   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
34   - </a-form-item>
35   - </a-col>
36   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
37   - <a-form-item label="目标库位">
38   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
39   - </a-form-item>
40   - </a-col>
41   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
42   - <a-form-item label="任务状态">
43   - <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
44   - </a-form-item>
45   - </a-col>
46   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
  51 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
47 52 <a-form-item label="起始出入口">
48 53 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
49 54 </a-form-item>
... ... @@ -493,7 +498,7 @@ export default {
493 498 fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
494 499 fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
495 500 fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
496   - fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
  501 + fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
497 502 fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
498 503 fieldList.push({type: 'string', value: 'fromPort', text: '起始出入口', dictCode: ''})
499 504 fieldList.push({type: 'string', value: 'toPort', text: '目标出入口', dictCode: ''})
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @20f1675
... ... @@ -5,6 +5,11 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="任务ID">
  9 + <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
  10 + </a-form-item>
  11 + </a-col>
  12 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 13 <a-form-item label="任务类型">
9 14 <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="task_type"/>
10 15 </a-form-item>
... ... @@ -14,31 +19,36 @@
14 19 <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
15 20 </a-form-item>
16 21 </a-col>
  22 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  23 + <a-form-item label="库区">
  24 + <a-select
  25 + show-search
  26 + placeholder="请选择库区"
  27 + option-filter-prop="children"
  28 + v-model="queryParam.zoneCode">
  29 + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
  30 + {{item.name}}
  31 + </a-select-option>
  32 + </a-select>
  33 + </a-form-item>
  34 + </a-col>
  35 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  36 + <a-form-item label="起始库位">
  37 + <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
  38 + </a-form-item>
  39 + </a-col>
  40 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  41 + <a-form-item label="目标库位">
  42 + <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
  43 + </a-form-item>
  44 + </a-col>
  45 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  46 + <a-form-item label="任务状态">
  47 + <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
  48 + </a-form-item>
  49 + </a-col>
17 50 <template v-if="toggleSearchStatus">
18 51 <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="库区">
20   - <a-select
21   - show-search
22   - placeholder="请选择库区"
23   - option-filter-prop="children"
24   - v-model="queryParam.zoneCode">
25   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
26   - {{item.name}}
27   - </a-select-option>
28   - </a-select>
29   - </a-form-item>
30   - </a-col>
31   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
32   - <a-form-item label="起始库位">
33   - <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
34   - </a-form-item>
35   - </a-col>
36   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
37   - <a-form-item label="目标库位">
38   - <a-input placeholder="请输入目标库位" v-model="queryParam.toLocationCode"></a-input>
39   - </a-form-item>
40   - </a-col>
41   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
42 52 <a-form-item label="起始出入口">
43 53 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
44 54 </a-form-item>
... ... @@ -48,11 +58,6 @@
48 58 <a-input placeholder="请输入目标出入口" v-model="queryParam.toPortCode"></a-input>
49 59 </a-form-item>
50 60 </a-col>
51   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
52   - <a-form-item label="任务状态">
53   - <j-dict-select-tag placeholder="请选择任务状态" v-model="queryParam.status" dictCode="task_header_status"/>
54   - </a-form-item>
55   - </a-col>
56 61 <a-col :xl="12" :lg="14" :md="16" :sm="24">
57 62 <a-form-item label="创建日期">
58 63 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
... ... @@ -501,7 +506,7 @@ export default {
501 506 fieldList.push({type: 'string', value: 'toLocationCode', text: '目标库位', dictCode: ''})
502 507 fieldList.push({type: 'string', value: 'isEmptyOut', text: '是否空出', dictCode: 'is_or_not'})
503 508 fieldList.push({type: 'int', value: 'isDoubleIn', text: '是否重入', dictCode: 'is_or_not'})
504   - fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位号', dictCode: ''})
  509 + fieldList.push({type: 'string', value: 'originLocationCode', text: '重入库位编码', dictCode: ''})
505 510 fieldList.push({type: 'int', value: 'status', text: '任务状态', dictCode: 'task_header_status'})
506 511 fieldList.push({type: 'string', value: 'fromPortCode', text: '起始出入口', dictCode: ''})
507 512 fieldList.push({type: 'string', value: 'toPortCode', text: '目标出入口', dictCode: ''})
... ...
ant-design-vue-jeecg/src/views/system/task/modules/TaskHeaderModal.vue
  View file @20f1675
... ... @@ -42,8 +42,8 @@
42 42 </a-form-model-item>
43 43 </a-col>
44 44 <a-col :span="24">
45   - <a-form-model-item label="重入库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originLocationCode">
46   - <a-input v-model="model.originLocationCode" placeholder="请输入重入库位号"></a-input>
  45 + <a-form-model-item label="重入库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originLocationCode">
  46 + <a-input v-model="model.originLocationCode" placeholder="请输入重入库位编码"></a-input>
47 47 </a-form-model-item>
48 48 </a-col>
49 49 <a-col :span="24">
... ...
ant-design-vue-jeecg/src/views/system/task/modules/TransferTaskModal.vue
  View file @20f1675
... ... @@ -12,13 +12,13 @@
12 12 <a-form-model ref="form" :model="model" :rules="validatorRules">
13 13 <a-row>
14 14 <a-col :span="24">
15   - <a-form-model-item label="起始库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fromLocationCode">
16   - <a-input v-model="model.fromLocationCode" placeholder="请输入起始库位号"></a-input>
  15 + <a-form-model-item label="起始库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fromLocationCode">
  16 + <a-input v-model="model.fromLocationCode" placeholder="请输入起始库位编码"></a-input>
17 17 </a-form-model-item>
18 18 </a-col>
19 19 <a-col :span="24">
20   - <a-form-model-item label="目标库位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toLocationCode">
21   - <a-input v-model="model.toLocationCode" placeholder="请输入目标库位号"></a-input>
  20 + <a-form-model-item label="目标库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toLocationCode">
  21 + <a-input v-model="model.toLocationCode" placeholder="请输入目标库位编码"></a-input>
22 22 </a-form-model-item>
23 23 </a-col>
24 24 </a-row>
... ... @@ -56,10 +56,10 @@ export default {
56 56 confirmLoading: false,
57 57 validatorRules: {
58 58 fromLocationCode: [
59   - {required: true, message: '请输入起始库位号!'},
  59 + {required: true, message: '请输入起始库位编码!'},
60 60 ],
61 61 toLocationCode: [
62   - {required: true, message: '请输入目标库位号!'},
  62 + {required: true, message: '请输入目标库位编码!'},
63 63 ],
64 64 },
65 65 url: {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/entity/CallBoxBean.java
  View file @20f1675
... ... @@ -10,7 +10,7 @@ import lombok.Data;
10 10 public class CallBoxBean {
11 11 @ApiModelProperty(value = "托盘号", required = true)
12 12 private String containerCode;
13   - @ApiModelProperty(value = "库位号", required = true)
  13 + @ApiModelProperty(value = "库位编码", required = true)
14 14 private String locationCode;
15 15 @ApiModelProperty(value = "任务类型，200补充入, 400分拣出")
16 16 private int type;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/entity/QuickReceiptBean.java
  View file @20f1675
... ... @@ -10,7 +10,7 @@ import java.util.List;
10 10 public class QuickReceiptBean {
11 11 @ApiModelProperty(value = "托盘号", required = true)
12 12 private String containerCode;
13   - @ApiModelProperty(value = "库位号", required = false)
  13 + @ApiModelProperty(value = "库位编码", required = false)
14 14 private String locationCode;
15 15 @ApiModelProperty(value = "单据类型", required = true)
16 16 private String receiptType;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
  View file @20f1675
... ... @@ -219,7 +219,7 @@ public class WcsServiceImpl implements WcsService {
219 219 receiptContainerHeader.setId(receiptContainerDetail.getReceiptContainerId());
220 220 receiptContainerHeader.setToLocationCode(locationCode);
221 221 if (!receiptContainerHeaderService.updateById(receiptContainerHeader)) {
222   - throw new JeecgBootException("分配库位时，更新入库组盘的库位号失败");
  222 + throw new JeecgBootException("分配库位时，更新入库组盘的库位编码失败");
223 223 }
224 224 }
225 225 }
... ... @@ -273,7 +273,7 @@ public class WcsServiceImpl implements WcsService {
273 273 LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
274 274 LogRecordContext.putVariable("taskHeader", taskHeader);
275 275 LogRecordContext.putVariable("success", true);
276   - log.info("完成分配库位，任务号：" + taskNo + ", 库位号：" + locationCode);
  276 + log.info("完成分配库位，任务号：" + taskNo + ", 库位编码：" + locationCode);
277 277 return Result.OK(wcsTask);
278 278 }
279 279  
... ... @@ -572,7 +572,7 @@ public class WcsServiceImpl implements WcsService {
572 572 }
573 573 String toLocationCode = taskHeader.getToLocationCode();
574 574 if (StringUtils.isEmpty(toLocationCode)) {
575   - return Result.error("重入处理失败， 目的库位号为空");
  575 + return Result.error("重入处理失败， 目的库位编码为空");
576 576 }
577 577 // 3、找到目标库位
578 578 Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
... ... @@ -603,13 +603,13 @@ public class WcsServiceImpl implements WcsService {
603 603 Material material = materialService.getMaterialByCode(materialCode);
604 604 materialAreaCode = material.getMaterialareaCode();
605 605 }
606   - // 4. WMS重新分配库位号
  606 + // 4. WMS重新分配库位编码
607 607 String locationCode =
608 608 locationAllocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, materialAreaCode);
609 609 if (StringUtils.isEmpty(locationCode)) {
610 610 return Result.error("重入处理失败， 没有库位可分配");
611 611 }
612   - // 5. 任务类型为整盘入库、补充入库，更新入库组盘的库位号
  612 + // 5. 任务类型为整盘入库、补充入库，更新入库组盘的库位编码
613 613 int taskType = taskHeader.getTaskType();
614 614 if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
615 615 ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId());
... ... @@ -649,7 +649,7 @@ public class WcsServiceImpl implements WcsService {
649 649 throw new JeecgBootException("重入处理失败， 更新任务信息失败");
650 650 }
651 651  
652   - // 9. 封装返回的数据格式，包括任务号和重新分配的库位号
  652 + // 9. 封装返回的数据格式，包括任务号和重新分配的库位编码
653 653 TaskReentryEntity taskReentryEntity = new TaskReentryEntity();
654 654 taskReentryEntity.setTaskNo(Integer.parseInt(taskNo));
655 655 taskReentryEntity.setRedirectionLocationCode(locationCode);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
  View file @20f1675
... ... @@ -114,7 +114,7 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
114 114 if (StringUtils.isNotEmpty(locationCode)) {
115 115 Location location = locationService.getLocationByCode(locationCode, container.getWarehouseCode());
116 116 if (location == null) {
117   - throw new JeecgBootException("编辑的库位号不存在");
  117 + throw new JeecgBootException("编辑的库位编码不存在");
118 118 }
119 119 }
120 120 boolean success = containerService.updateById(container);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryHeader.java
  View file @20f1675
... ... @@ -53,9 +53,9 @@ public class InventoryHeader implements Serializable {
53 53 @Dict(dicCode = "container_status")
54 54 @ApiModelProperty(value = "容器状态")
55 55 private String containerStatus;
56   - /** 库位号 */
57   - @Excel(name = "库位号", width = 15)
58   - @ApiModelProperty(value = "库位号")
  56 + /** 库位编码 */
  57 + @Excel(name = "库位编码", width = 15)
  58 + @ApiModelProperty(value = "库位编码")
59 59 private String locationCode;
60 60 /** 状态 */
61 61 @Excel(name = "状态", width = 15, dicCode = "enable_status")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @20f1675
... ... @@ -351,11 +351,11 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
351 351 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
352 352 String fromLocationCode = receiptContainerHeader.getFromLocationCode();
353 353 if (StringUtils.isEmpty(fromLocationCode)) {
354   - return Result.error("选择分拣口时, 起始库位号为空");
  354 + return Result.error("选择分拣口时, 起始库位编码为空");
355 355 }
356 356 Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
357 357 if (fromLocation == null) {
358   - return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
  358 + return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
359 359 }
360 360 String zoneCode = fromLocation.getZoneCode();
361 361 if (StringUtils.isEmpty(zoneCode)) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
  View file @20f1675
... ... @@ -126,11 +126,11 @@ public class ShipmentCombinationController {
126 126 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
127 127 String fromLocationCode = shipmentContainerHeader.getFromLocationCode();
128 128 if (StringUtils.isEmpty(fromLocationCode)) {
129   - return Result.error("选择分拣口时, 起始库位号为空");
  129 + return Result.error("选择分拣口时, 起始库位编码为空");
130 130 }
131 131 Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
132 132 if (fromLocation == null) {
133   - return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
  133 + return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
134 134 }
135 135 String zoneCode = fromLocation.getZoneCode();
136 136 if (StringUtils.isEmpty(zoneCode)) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
  View file @20f1675
... ... @@ -469,12 +469,12 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
469 469 String containerCode = shipmentContainerHeader.getContainerCode();
470 470 String toPort = shipmentContainerHeader.getToPort();
471 471 if (StringUtils.isEmpty(fromLocationCode)) {
472   - return Result.error("生成出库任务时， 出库组盘头没有起始库位号");
  472 + return Result.error("生成出库任务时， 出库组盘头没有起始库位编码");
473 473 }
474 474 // 出库时，外侧库位的任务，如果对应的内侧有任务，那么内侧任务执行完成以后，再执行出库任务。
475 475 Location location = locationService.getLocationByCode(fromLocationCode, warehouseCode);
476 476 if (location == null) {
477   - return Result.error("生成出库任务时, 库位号" + fromLocationCode + "没有找到库位");
  477 + return Result.error("生成出库任务时, 库位编码" + fromLocationCode + "没有找到库位");
478 478 }
479 479 if (location.getRowFlag() == QuantityConstant.ROW_OUT) {
480 480 Location location1 = locationService.getNear(location);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
  View file @20f1675
... ... @@ -196,11 +196,11 @@ public class CycleCountDetailController extends HuahengBaseController {
196 196 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
197 197 String fromLocationCode = cycleCountDetail.getLocationCode();
198 198 if (StringUtils.isEmpty(fromLocationCode)) {
199   - return Result.error("选择分拣口时, 起始库位号为空");
  199 + return Result.error("选择分拣口时, 起始库位编码为空");
200 200 }
201 201 Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
202 202 if (fromLocation == null) {
203   - return Result.error("选择分拣口时, 根据库位号" + fromLocationCode + " 没有找到库位");
  203 + return Result.error("选择分拣口时, 根据库位编码" + fromLocationCode + " 没有找到库位");
204 204 }
205 205 String zoneCode = fromLocation.getZoneCode();
206 206 if (StringUtils.isEmpty(zoneCode)) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
  View file @20f1675
... ... @@ -557,11 +557,11 @@ public class TaskHeaderController extends HuahengBaseController {
557 557 }
558 558 String fromLocationCode = container.getLocationCode();
559 559 if (StringUtils.isEmpty(fromLocationCode)) {
560   - return Result.error("选择整出口, 起始库位号为空");
  560 + return Result.error("选择整出口, 起始库位编码为空");
561 561 }
562 562 Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
563 563 if (fromLocation == null) {
564   - return Result.error("选择整出口, 根据库位号" + fromLocationCode + " 没有找到库位");
  564 + return Result.error("选择整出口, 根据库位编码" + fromLocationCode + " 没有找到库位");
565 565 }
566 566 String zoneCode = fromLocation.getZoneCode();
567 567 if (StringUtils.isEmpty(zoneCode)) {
... ... @@ -598,11 +598,11 @@ public class TaskHeaderController extends HuahengBaseController {
598 598 }
599 599 String fromLocationCode = container.getLocationCode();
600 600 if (StringUtils.isEmpty(fromLocationCode)) {
601   - return Result.error("选择分拣口, 起始库位号为空");
  601 + return Result.error("选择分拣口, 起始库位编码为空");
602 602 }
603 603 Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
604 604 if (fromLocation == null) {
605   - return Result.error("选择分拣口, 根据库位号" + fromLocationCode + " 没有找到库位");
  605 + return Result.error("选择分拣口, 根据库位编码" + fromLocationCode + " 没有找到库位");
606 606 }
607 607 String zoneCode = fromLocation.getZoneCode();
608 608 if (StringUtils.isEmpty(zoneCode)) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskHeader.java
  View file @20f1675
... ... @@ -97,9 +97,9 @@ public class TaskHeader implements Serializable {
97 97 @Dict(dicCode = "is_or_not")
98 98 @ApiModelProperty(value = "取货错")
99 99 private Integer isPickupError;
100   - /** 重入库位号 */
101   - @Excel(name = "重入库位号", width = 15)
102   - @ApiModelProperty(value = "重入库位号")
  100 + /** 重入库位编码 */
  101 + @Excel(name = "重入库位编码", width = 15)
  102 + @ApiModelProperty(value = "重入库位编码")
103 103 private String originLocationCode;
104 104 /** 任务状态 */
105 105 @Excel(name = "任务状态", width = 15, dicCode = "task_header_status")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
  View file @20f1675
... ... @@ -42,7 +42,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
42 42 TaskHeader getTaskHeaderByAgvTaskId(int agvTaskId);
43 43  
44 44 /**
45   - * 通过起始库位号，获取任务信息
  45 + * 通过起始库位编码，获取任务信息
46 46 * @param fromLocationCode
47 47 * @param warehouseCode
48 48 * @return
... ... @@ -50,7 +50,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
50 50 TaskHeader getUnCompleteTaskByFromLocationCode(String fromLocationCode, String warehouseCode);
51 51  
52 52 /**
53   - * 通过目标库位号，获取任务信息
  53 + * 通过目标库位编码，获取任务信息
54 54 * @param toLocationCode
55 55 * @param warehouseCode
56 56 * @return
... ... @@ -58,7 +58,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
58 58 TaskHeader getUnCompleteTaskByToLocationCode(String toLocationCode, String warehouseCode);
59 59  
60 60 /**
61   - * 通过库位号，获取任务信息
  61 + * 通过库位编码，获取任务信息
62 62 * @param locationCode
63 63 * @param warehouseCode
64 64 * @return
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @20f1675
... ... @@ -356,7 +356,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
356 356 @Override
357 357 @Transactional(rollbackFor = Exception.class)
358 358 public Result createOverStationTask(String containerCode, String fromPortCode, String toPortCode, String warehouseCode) {
359   - log.info("开始创建跨站任务，容器号" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
  359 + log.info("开始创建跨站任务，容器编码" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
360 360 if (StringUtils.isEmpty(containerCode)) {
361 361 return Result.error("创建跨站任务时，容器编码为空");
362 362 }
... ... @@ -394,7 +394,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
394 394 if (!success) {
395 395 return Result.error("创建跨站任务时, 创建任务失败");
396 396 }
397   - log.info("完成创建跨站任务，容器号" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
  397 + log.info("完成创建跨站任务，容器编码" + containerCode + ",起始站台号" + fromPortCode + ",目标站台号" + toPortCode);
398 398 return Result.ok("创建跨站任务成功");
399 399 }
400 400  
... ... @@ -567,7 +567,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
567 567 String containerCode = taskHeader.getContainerCode();
568 568 String fromLocationCode = taskHeader.getFromLocationCode();
569 569 String warehouseCode = taskHeader.getWarehouseCode();
570   - // 4、容器编码、库位号、仓库编码 不能为空
  570 + // 4、容器编码、库位编码、仓库编码 不能为空
571 571 if (StringUtils.isEmpty(containerCode)) {
572 572 return Result.error("处理空出失败，容器编码为空");
573 573 }
... ... @@ -585,7 +585,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
585 585 if (fronLocation == null) {
586 586 return Result.error("处理空出失败，没有找到库位");
587 587 }
588   - // 5、删除容器上的库位号，并设置状态为空闲，填充度状态为空盘
  588 + // 5、删除容器上的库位编码，并设置状态为空闲，填充度状态为空盘
589 589 boolean success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY,
590 590 QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
591 591 if (!success) {
... ... @@ -645,7 +645,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
645 645 String containerCode = taskHeader.getContainerCode();
646 646 String originLocationCode = taskHeader.getOriginLocationCode();
647 647 String warehouseCode = taskHeader.getWarehouseCode();
648   - // 4、容器编码、库位号、仓库编码 不能为空
  648 + // 4、容器编码、库位编码、仓库编码 不能为空
649 649 if (StringUtils.isEmpty(containerCode)) {
650 650 return Result.error("处理重入失败，容器编码为空");
651 651 }
... ... @@ -891,7 +891,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
891 891  
892 892 /**
893 893 * 创建空托盘入库
894   - * 1. 判断托盘号、库位号是否满足要求
  894 + * 1. 判断托盘号、库位编码是否满足要求
895 895 * 2. 创建任务，锁定容器、库位
896 896 * @param containerCode
897 897 * @param toLocationCode
... ... @@ -1660,7 +1660,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1660 1660 Result result = null;
1661 1661 boolean success = false;
1662 1662 if (StringUtils.isEmpty(containerCode)) {
1663   - return Result.error("任务类型" + taskType + "完成任务时, 容器号为空");
  1663 + return Result.error("任务类型" + taskType + "完成任务时, 容器编码为空");
1664 1664 }
1665 1665 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
1666 1666 if (container == null) {
... ... @@ -1670,21 +1670,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1670 1670 case QuantityConstant.TASK_TYPE_WHOLERECEIPT:
1671 1671 case QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT:
1672 1672 if (StringUtils.isEmpty(toLocationCode)) {
1673   - return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
  1673 + return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
1674 1674 }
1675 1675 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY, containerFillStatus,
1676 1676 warehouseCode);
1677 1677 break;
1678 1678 case QuantityConstant.TASK_TYPE_EMPTYRECEIPT:
1679 1679 if (StringUtils.isEmpty(toLocationCode)) {
1680   - return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
  1680 + return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
1681 1681 }
1682 1682 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
1683 1683 QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
1684 1684 break;
1685 1685 case QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT:
1686 1686 if (StringUtils.isEmpty(toLocationCode)) {
1687   - return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
  1687 + return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
1688 1688 }
1689 1689 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
1690 1690 QuantityConstant.STATUS_CONTAINER_FILL_MANY, warehouseCode);
... ... @@ -1693,7 +1693,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1693 1693 case QuantityConstant.TASK_TYPE_EMPTYSHIPMENT:
1694 1694 case QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT:
1695 1695 if (StringUtils.isEmpty(fromLocationCode)) {
1696   - return Result.error("任务类型" + taskType + "完成任务时, 起始库位号为空");
  1696 + return Result.error("任务类型" + taskType + "完成任务时, 起始库位编码为空");
1697 1697 }
1698 1698 success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY,
1699 1699 QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
... ... @@ -1703,10 +1703,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1703 1703 case QuantityConstant.TASK_TYPE_TRANSFER:
1704 1704 case QuantityConstant.TASK_TYPE_CHECK_OUT:
1705 1705 if (StringUtils.isEmpty(fromLocationCode)) {
1706   - return Result.error("任务类型" + taskType + "完成任务时, 起始库位号为空");
  1706 + return Result.error("任务类型" + taskType + "完成任务时, 起始库位编码为空");
1707 1707 }
1708 1708 if (StringUtils.isEmpty(toLocationCode)) {
1709   - return Result.error("任务类型" + taskType + "完成任务时, 目标库位号为空");
  1709 + return Result.error("任务类型" + taskType + "完成任务时, 目标库位编码为空");
1710 1710 }
1711 1711 InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
1712 1712 if (inventoryHeader != null) {
... ... @@ -1776,7 +1776,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1776 1776 return Result.error("完成空托盘入库任务时, 仓库编码为空");
1777 1777 }
1778 1778 if (StringUtils.isEmpty(toLocationCode)) {
1779   - return Result.error("完成空托盘入库任务时, 目标库位号为空");
  1779 + return Result.error("完成空托盘入库任务时, 目标库位编码为空");
1780 1780 }
1781 1781 Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYRECEIPT,
1782 1782 containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
... ... @@ -1811,10 +1811,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1811 1811 String toLocationCode = taskHeader.getToLocationCode();
1812 1812 boolean success = false;
1813 1813 if (StringUtils.isEmpty(fromLocationCode)) {
1814   - return Result.error("完成盘点任务时，起始库位号为空");
  1814 + return Result.error("完成盘点任务时，起始库位编码为空");
1815 1815 }
1816 1816 if (StringUtils.isEmpty(toLocationCode)) {
1817   - return Result.error("完成盘点任务时，目标库位号为空");
  1817 + return Result.error("完成盘点任务时，目标库位编码为空");
1818 1818 }
1819 1819 if (StringUtils.isEmpty(containerCode)) {
1820 1820 return Result.error("完成盘点任务时，托盘号为空");
... ... @@ -2084,7 +2084,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2084 2084 return Result.error("完成空托盘出库任务时, 仓库编码为空");
2085 2085 }
2086 2086 if (StringUtils.isEmpty(fromLocationCode)) {
2087   - return Result.error("完成空托盘出库任务时, 起始库位号为空");
  2087 + return Result.error("完成空托盘出库任务时, 起始库位编码为空");
2088 2088 }
2089 2089 if (StringUtils.isEmpty(toPortCode)) {
2090 2090 return Result.error("完成空托盘出库任务时, 目标出入口号为空");
... ... @@ -2135,10 +2135,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2135 2135 return Result.error("完成移库任务时, 仓库编码为空");
2136 2136 }
2137 2137 if (StringUtils.isEmpty(fromLocationCode)) {
2138   - return Result.error("完成移库任务时, 起始库位号为空");
  2138 + return Result.error("完成移库任务时, 起始库位编码为空");
2139 2139 }
2140 2140 if (StringUtils.isEmpty(toLocationCode)) {
2141   - return Result.error("完成移库任务时, 目标库位号为空");
  2141 + return Result.error("完成移库任务时, 目标库位编码为空");
2142 2142 }
2143 2143  
2144 2144 List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
... ... @@ -2225,13 +2225,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2225 2225 return Result.error("完成出库查看任务时, 仓库编码为空");
2226 2226 }
2227 2227 if (StringUtils.isEmpty(fromLocationCode)) {
2228   - return Result.error("完成出库查看任务时, 起始库位号为空");
  2228 + return Result.error("完成出库查看任务时, 起始库位编码为空");
2229 2229 }
2230 2230 if (StringUtils.isEmpty(toPortCode)) {
2231 2231 return Result.error("完成出库查看任务时, 目标出入口号为空");
2232 2232 }
2233 2233 if (StringUtils.isEmpty(toLocationCode)) {
2234   - return Result.error("完成出库查看任务时, 目标库位号为空");
  2234 + return Result.error("完成出库查看任务时, 目标库位编码为空");
2235 2235 }
2236 2236  
2237 2237 boolean success = false;
... ... @@ -2353,7 +2353,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2353 2353 return Result.error("完成空托盘组入库任务时, 仓库编码为空");
2354 2354 }
2355 2355 if (StringUtils.isEmpty(toLocationCode)) {
2356   - return Result.error("完成空托盘组入库任务时, 目标库位号为空");
  2356 + return Result.error("完成空托盘组入库任务时, 目标库位编码为空");
2357 2357 }
2358 2358 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
2359 2359 if (container == null) {
... ...