Browse Source

领料单物料显示

master
常熟吴彦祖 1 month ago
parent
commit
dc0f7e1ae5
  1. 4
      src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue
  2. 11
      src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue
  3. 11
      src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue
  4. 11
      src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue
  5. 11
      src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue
  6. 12
      src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue

4
src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue

@ -119,8 +119,8 @@
<el-tab-pane label="预定标签清单" name="labelDetail">
<el-table :data="detailList" :height="detailHeight" border v-loading="detailLoading" style="width: 100%;">
<el-table-column prop="itemNo" label="订单序号" min-width="80" header-align="center" align="right"></el-table-column>
<el-table-column prop="bomItemNo" label="订单物料行号" min-width="110" header-align="center" align="right"></el-table-column>
<el-table-column prop="componentPartNo" label="物料号" min-width="120" header-align="center" align="left"></el-table-column>
<!-- 预定标签料号取关联物料行的component_part_no,关联缺失时留空 - rqrq -->
<el-table-column prop="componentPartNo" label="料号" min-width="120" header-align="center" align="left"></el-table-column>
<el-table-column prop="serialNo" label="标签号" min-width="150" header-align="center" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskRef" label="立库任务号" min-width="120" header-align="center" align="left"></el-table-column>
<el-table-column prop="taskItem" label="立库任务行号" min-width="100" header-align="center" align="right"></el-table-column>

11
src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue

@ -1417,22 +1417,23 @@ export default {
columnWidth: 80,
},
{
// 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq
userId: this.$store.state.user.name,
functionId: 444002,
serialNumber: '444002Table6BomItemNo',
serialNumber: '444002Table6ComponentPartNo',
tableId: '444002Table6',
tableName: '预定标签清单表',
columnProp: 'bomItemNo',
columnProp: 'componentPartNo',
headerAlign: 'center',
align: 'right',
columnLabel: '订单物料行号',
align: 'left',
columnLabel: '料号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 110,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,

11
src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue

@ -1408,22 +1408,23 @@ export default {
fixed: '',
columnWidth: 80
},{
// 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table6BOMItemNo',
serialNumber: '701002Table6ComponentPartNo',
tableId: "701002Table6",
tableName: "预定标签清单表",
columnProp: "bomItemNo",
columnProp: "componentPartNo",
headerAlign: "center",
align: "right",
columnLabel: "订单物料行号",
align: "left",
columnLabel: "料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 701002,

11
src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue

@ -1408,22 +1408,23 @@ export default {
fixed: '',
columnWidth: 80
},{
// 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table6BOMItemNo',
serialNumber: '701002Table6ComponentPartNo',
tableId: "701002Table6",
tableName: "预定标签清单表",
columnProp: "bomItemNo",
columnProp: "componentPartNo",
headerAlign: "center",
align: "right",
columnLabel: "订单物料行号",
align: "left",
columnLabel: "料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 701002,

11
src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue

@ -1408,22 +1408,23 @@ export default {
fixed: '',
columnWidth: 80
},{
// 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table6BOMItemNo',
serialNumber: '701002Table6ComponentPartNo',
tableId: "701002Table6",
tableName: "预定标签清单表",
columnProp: "bomItemNo",
columnProp: "componentPartNo",
headerAlign: "center",
align: "right",
columnLabel: "订单物料行号",
align: "left",
columnLabel: "料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 701002,

12
src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue

@ -51,6 +51,13 @@
<el-option label="否" value="N" />
</el-select>
</el-form-item>
<!-- 空托盘筛选直接传haian_pallet.empty_flag的Y/N;清空后不限制,列表与导出使用同一条件 - rqrq -->
<el-form-item label="是否空托盘">
<el-select v-model="queryData.emptyFlag" placeholder="请选择" style="width: 110px;" clearable>
<el-option label="是" value="Y" />
<el-option label="否" value="N" />
</el-select>
</el-form-item>
<el-form-item style="margin-top: 20px;">
<el-button type="primary" :loading="queryLoading" :disabled="queryLoading" @click="getDataList">查询</el-button>
@ -351,6 +358,8 @@ export default {
locationCode: '',
area: '',
inStockFlag: '',
// 空值不筛选;Y/N由托盘列表SQL按haian_pallet.empty_flag精确查询 - rqrq
emptyFlag: '',
partNo: '',
batchNo: '',
page: 1,
@ -454,6 +463,7 @@ export default {
this.queryData.palletType = ''
this.queryData.area = ''
this.queryData.inStockFlag = ''
this.queryData.emptyFlag = '' // 切换主工厂时清除旧工厂的空托盘筛选状态 - rqrq
this.palletFamilyOptions = []
this.palletTypeOptions = []
this.areaOptions = []
@ -631,6 +641,8 @@ export default {
locationCode: '',
area: '',
inStockFlag: '',
// 重置为空表示不限制空托盘,后续列表及导出请求沿用此值 - rqrq
emptyFlag: '',
partNo: '',
batchNo: '',
page: 1,

Loading…
Cancel
Save