Browse Source

【nev-pc+pad】Pad完成库移+第三方更改

ag_report_nev
安虹睿 11 months ago
parent
commit
f4811b3166
  1. 77
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 36
      fe/PC/src/utils/tableColumns/index.js
  3. 23
      fe/PC/src/utils/tabsDesTions/index.js
  4. 2
      fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
  5. 4
      fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
  6. 10
      fe/PC/src/views/padManage/isPadForKittingPack.vue
  7. 92
      fe/PC/src/views/padManage/isPadForTransferLibJob.vue

77
fe/PC/src/utils/detailsTableColumns/index.js

@ -3258,19 +3258,17 @@ export const ThirdLocationRequest = [
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "申请数量", prop: "qty" },
{ label: "已发数量", prop: "issuedQty"},
{ label: "已收数量", prop: "receivedQty"},
// todo:未发数量,未收数量
{ label: "库存状态", prop: "enumInventoryStatus",type: "filter", filters:"inventoryStage" },
// { label: "申请库移数", prop: "issuedQty"},
// { label: "未收库移数", prop: 'notFinishQty' },
// { label: "已收库移数", prop: "receivedQty"},
{ label: "标包数量", prop: "stdPackQty" },
{ label: "箱码", prop: 'packingCode' },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
// { label: "计量单位", prop: "uom" },
// { label: "已发未收数量", prop: "toBeIssuedQty"},
// { label: "请求未收数量", prop: "notFinishQty"},
// { label: "标包数量", prop: "stdPackQty"},
// { label: _Public.remark, prop: "remark" },
// { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
// { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "过期时间", prop: 'expiredTime',type: "dateTime" },
{ label: "备注", prop: "remark" },
]
// 三方库任务
@ -3280,51 +3278,15 @@ export const ThirdLocationJob = [
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "推荐数量", prop: "recommendQty" },
// todo:申请数量、已发数量、已收数量、未发数量、未收数量
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "库存状态", type: "enumInventoryStatus", filters: "inventoryStage", prop: "status" },
{ label: "申请库移数", prop: "issuedQty"},
{ label: "未收库移数", prop: 'notFinishQty' },
{ label: "已收库移数", prop: "receivedQty"},
{ label: "标包数量", prop: "stdPackQty" },
{ label: "箱码", prop: 'packingCode' },
{ label: "目标库位", prop: "toLocationCode" },
// { label: "标包数量", prop: "stdPackQty"},
// { label: "单位", prop: "uom" },
// { label: "推荐箱码", prop: "recommendPackingCode" },
// { label: "实际数量", prop: 'handledQty' },
// { label: _Names.toErpCode, prop: 'toLocationErpCode' },
// { label: "请求库位", prop: 'requestLocationCode' },
// { label: "目标库区", prop: 'toLocationArea' },
// { label: "目标库位组", prop: 'toLocationGroup' },
// { label: "推荐库位", prop: 'recommendFromLocationCode' },
// { label: "实际库位", prop: 'handledFromLocationCode' },
// { label: "推荐区域", prop: 'recommendFromLocationArea' },
// { label: "实际区域", prop: 'handledFromLocationArea' },
// { label: "推荐分组", prop: 'recommendFromLocationGroup' },
// { label: "实际分组", prop: 'handledFromLocationGroup' },
// { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
// { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
// { label: "推荐批次", prop: 'recommendLot' },
// { label: "实际批次", prop: "handledLot" },
// { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
// { label: "实际供应商批次", prop: 'handledSupplierBatch' },
// { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
// { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
// { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
// { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
// { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
// { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
// { label: "过期时间", prop: 'expiredTime',type: "dateTime" },
// { label: "计划开始时间", prop: 'planBeginTime',type: "dateTime" },
// { label: "生产线", prop: 'prodLine' },
// { label: "工作中心", prop: 'workStation' },
// { label: "工序", prop: 'operation' },
// { label: "取整后数量", prop: 'roundedQty' },
// { label: "每次配送数量", prop: 'deliveryQty' },
// { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" },
// { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" },
// { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" },
// { label: "备注", prop: 'remark' },
// { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
// { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "过期时间", prop: 'expiredTime',type: "dateTime" },
]
// 三方库记录
@ -3334,8 +3296,9 @@ export const ThirdLocationNote = [
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "申请数量", prop: "qty" },
// todo:已发数量、已收数量、未发数量、未收数量
{ label: "收货数量", prop: "qty" },
// { label: "推荐数量", prop: "recommendQty"},
// { label: "实际数量", prop: "handledQty"},
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "目标库位", prop: 'toLocationCode' },

36
fe/PC/src/utils/tableColumns/index.js

@ -3638,9 +3638,6 @@ export const ThirdLocationRequest = [
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
{ label: _Public.remark, prop: "remark" },
{ label: "操作员", prop: 'worker' },
{ label: "生产线", prop: 'prodLine' },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -3650,22 +3647,19 @@ export const ThirdLocationJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "承接时间", prop: 'completeTime', type: "dateTime" },
// { label: "完成者用户名", prop: 'completeUserName' },
// { label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
// { label: "任务描述", prop: 'jobDescription' },
// { label: "工作组", prop: 'workGroupCode' },
// { label: "优先级", prop: 'priority' },
// { label: "优先级增量", prop: 'priorityIncrement' },
// { label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -3677,11 +3671,11 @@ export const ThirdLocationNote = [
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: 'worker' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "发料时间", prop: 'issueTime', type: "dateTime" },
{ label: "收货时间", prop: 'receiptTime', type: "dateTime" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]

23
fe/PC/src/utils/tabsDesTions/index.js

@ -2461,9 +2461,9 @@ export const ThirdLocationRequest = [
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
{ label: _Public.remark, prop: "remark" },
{ label: "操作员", prop: 'worker' },
{ label: "生产线", prop: 'prodLine' },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: _Names.toErpCode, prop: "toLocationErpCode" },
// { label: "生产线", prop: 'prodLine' },
// { label: "目标库位代码", prop: "toLocationCode" },
// { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -2474,21 +2474,18 @@ export const ThirdLocationJob = [
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "承接时间", prop: 'completeTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -2500,11 +2497,11 @@ export const ThirdLocationNote = [
{ label: "任务单号", prop: 'jobNumber' },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: 'worker' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "发料时间", prop: 'issueTime', type: "dateTime" },
{ label: "收货时间", prop: 'receiptTime', type: "dateTime" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]

2
fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue

@ -97,7 +97,7 @@ export default {
{
type: 'success',
label: '完成',
hide: () => { return this.hideButton([1,4])},//,
hide: () => { return this.hideButton([1,2,4])},//,
name: "close",
size: 'mini'
},

4
fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue

@ -97,14 +97,14 @@ export default {
{
type: 'danger',
label: '取消',
hide: () => { return this.hideButton([1,5])},//
hide: () => { return this.hideButton([1,5,9])},//
name: "cancel",
size: 'mini'
},
{
type: 'success',
label: '完成',
hide: () => { return this.hideButton([9])},//
hide: () => { return this.hideButton([1,5,9])},//
name: "complete",
size: 'mini'
},

10
fe/PC/src/views/padManage/isPadForKittingPack.vue

@ -56,16 +56,16 @@
></el-table-column>
<el-table-column
prop="chassisNumber"
label="底盘"
label="底盘"
></el-table-column>
<el-table-column
prop="itemCode"
label="ERP料号"
></el-table-column>
<el-table-column
<!-- <el-table-column
prop="itemName"
label="料号名称"
></el-table-column>
></el-table-column> -->
<el-table-column
prop="itemDesc1"
label="料号描述"
@ -101,10 +101,10 @@
prop="chassisIndex"
label="底盘序号"
></el-table-column>
<el-table-column
<!-- <el-table-column
prop="itemName"
label="料号名称"
></el-table-column>
></el-table-column> -->
<el-table-column
prop="itemDesc1"
label="料号描述"

92
fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@ -8,7 +8,7 @@
:searchForm="searchForm"
:headerButton="headerButton"
:padMainColumn="padMainColumn"
:padDeatilColumn="padDeatilColumn"
:padDeatilColumn="padDeatilColumn_list"
:listRowButton="listRowButton"
:padListLoading="padListLoading"
:padListPager="padListPager"
@ -20,6 +20,8 @@
@headerButtonClick="headerButtonClick"
@headerSearchHandle="headerSearchHandle"
@resetSearchHandle="resetSearchHandle"
:mainColumnNum="4"
:detailColumnNum="4"
:padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]"
></padListPage>
<!-- :mainIsShowDetail="true" -->
@ -39,6 +41,7 @@
:searchData="compeletFormData"
:searchForm="compeletForm"
:rules="compeletRule"
@changeInput="compeletChangeInput"
></currenForm>
<curren-descriptions
v-if="compeletHandleVisible"
@ -96,7 +99,7 @@ import { padListPageMixins } from "@/mixins/padListPageMixins"
import padListPage from "./components/padListPage/index"
import currenForm from "@/components/currenForm"
import currenDescriptions from "@/components/currenDescriptions"
import { getInventoryByPackingCode } from '@/api/wms-api'
import { getInventoryByPackingCode,getPageList } from '@/api/wms-api'
import { transferLibJobHandel } from '@/api/wms-job'
import { inventoryBalanceRecommendList } from '@/api/wms-pad'
import { filterSelectMixins } from '@/mixins/filter-Select'
@ -162,21 +165,31 @@ export default {
// { label: "", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true },
{ label: "传入申请单号", prop: "callRequestNumber" },
{ label: "传入任务单号", prop: "callJobNumber" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// { label: "", prop: 'jobDescription' },
// { label: "使", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
// { label: "", prop: 'confirmTime' },
// { label: "", prop: "remark" },
// { label: "", prop: "worker" },
// { label: "", prop: "acceptUserName" },
// { label: "", prop: 'acceptTime', type: "dateTime" },
// { label: "", prop: 'completeUserName' },
// { label: "", prop: "completeTime", type: "dateTime" },
// { label: "", prop: 'creationTime', type: "dateTime" },
// { label: "", prop: "lastModificationTime", type: "dateTime" },
// { label: "", prop: "callServerName" },
// { label: "", prop: "callBusinessType" },
],
padDeatilColumn_list:[
{ label: _Names.itemCode, prop: "itemCode"},
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
],
padDeatilColumn:[
{ label: _Names.itemCode, prop: "itemCode"},
{ label: _Names.itemName, prop: "itemName" },
@ -236,8 +249,8 @@ export default {
},
compeletForm: [
{ type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, },
{ type: "input", label: "来源库位", prop: 'fromLocationCode', colSpan: 12, },
{ type: "input", label: "目标库位", prop: 'toLocationCode', colSpan: 12, },
{ type: "input", disabled:true, label: "来源库位", prop: 'fromLocationCode', colSpan: 12, },
{ type: "input", disabled:true, label: "目标库位", prop: 'toLocationCode', colSpan: 12, },
// filterSelect
// { type: "filterSelect", label: "", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code",
// focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},colSpan: 12
@ -280,13 +293,56 @@ export default {
{ label: "到货时间", prop: "arriveDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
],
canCompeletHandle:false,//
}
},
mounted(){
this.initPage()
},
methods: {
//
compeletChangeInput(prop, val){
if(prop == 'packingCode'){
this.compeletFormData.fromLocationCode = ""
this.compeletFormData.toLocationCode = ""
if(val == ""){
return
}
let _data = {
Sorting: "",
SkipCount: 0,
MaxResultCount: 1000,
condition: {filters: [
{
logic: 'And',
column: "packingCode",
action: "==",
value: val
}
]},
}
this.compeletLoading = true
this.canCompeletHandle = false
getPageList(_data, 'wms/inventory/inventory-balance')
.then(res => {
this.compeletLoading = false
if(!res.items || res.items.length <= 0){
return this.$errorMsg("当前箱码无库存信息,请更改箱码")
}
let _inventory = res.items[0]
if(_inventory.locationCode != this.currentRowData.details[0].recommendFromLocationCode){
return this.$errorMsg("当前箱码的库位与推荐来源库位不符,请更改箱码")
}
this.canCompeletHandle = true
this.compeletFormData.fromLocationCode = _inventory.locationCode
this.compeletFormData.toLocationCode = this.currentRowData.details[0].recommendToLocationCode
}).catch(err => {
this.compeletLoading = false
this.$errorMsg("获取库存失败")
})
}
},
//
headerButtonClick(item,index){
if(item.name == 'showCanHandle'){
@ -358,6 +414,10 @@ export default {
},
// -
compeletHandleSure(val){
if(!this.canCompeletHandle){
this.$errorMsg("当前箱码不符合移库标准,请检查")
return
}
let _form = this.$refs.compeletHandleForm_Ref.$refs.form
_form.validate((valid) => {
if (valid) {

Loading…
Cancel
Save