From f4811b316617f1949451f13e0252cec3b251ba19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 24 Jun 2024 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc+pad=E3=80=91Pad=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=BA=93=E7=A7=BB+=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 77 ++++------------ fe/PC/src/utils/tableColumns/index.js | 36 +++----- fe/PC/src/utils/tabsDesTions/index.js | 23 ++--- .../ThirdLocationManage/ThirdLocationJob.vue | 2 +- .../ThirdLocationRequest.vue | 4 +- .../views/padManage/isPadForKittingPack.vue | 10 +- .../padManage/isPadForTransferLibJob.vue | 92 +++++++++++++++---- 7 files changed, 129 insertions(+), 115 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 7e76430dc..512402da5 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/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' }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index d15a88fc4..44321506f 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/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" }, ] diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 37daf9e6e..44c062a7c 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/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" }, ] diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue index 45c4ba21b..6ea22cba0 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue +++ b/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' }, diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue index c682597b1..d617cfd9f 100644 --- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue +++ b/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' }, diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue index b1883e036..e773b264d 100644 --- a/fe/PC/src/views/padManage/isPadForKittingPack.vue +++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue @@ -56,16 +56,16 @@ > - + > --> - + > --> @@ -39,6 +41,7 @@ :searchData="compeletFormData" :searchForm="compeletForm" :rules="compeletRule" + @changeInput="compeletChangeInput" > { 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) {