Browse Source

【nev-pc】成品发运申请-添加批量生成发货单功能

ag_report_nev
安虹睿 12 months ago
parent
commit
a769953945
  1. 84
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 51
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue

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

@ -1644,6 +1644,9 @@ export const FISDeliverRequest = [
{ label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "出货库区", prop: "areaCode" },
{ label: "Mes发货单号", prop: "mesDeliveryNo" },
{ label: "Mes发货计划号", prop: "mesDeliveryPlan" },
{ label: "底盘号", prop: "identityNo" },
{ label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
{ label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@ -1700,6 +1703,9 @@ export const FISDeliverNote = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "出货库位", prop: "fromLocationCode" },
{ label: "出货ERP库位", prop: "fromLocationErpCode" },
{ label: "Mes发货单号", prop: "mesDeliveryNo" },
{ label: "Mes发货计划号", prop: "mesDeliveryPlan" },
{ label: "底盘号", prop: "identityNo" },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
@ -4689,12 +4695,12 @@ export const transferLibJob = [
{ label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
{ label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "推荐来源批次生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标批次生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源批次到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标批次到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
@ -4745,8 +4751,8 @@ export const transferLibNote = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
@ -5019,12 +5025,12 @@ export const KittingIssueJob = [
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "推荐来源批次到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标批次到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源批次生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标批次生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源批次", prop: 'recommendFromLot' },
{ label: "推荐目标批次", prop: 'recommendToLot' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
@ -5113,12 +5119,12 @@ export const KittingIssueNote = [
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "推荐来源批次到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标批次到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源批次生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标批次生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
{ label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
{ label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
{ label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "推荐来源批次", prop: 'recommendFromLot' },
{ label: "推荐目标批次", prop: 'recommendToLot' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
@ -5184,4 +5190,42 @@ export const KittingIssueNote = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 【pad】业务库移
export const padTransferLibJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求ERP库位", prop: 'requestLocationErpCode' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
{ label: "推荐目标数量", prop: 'recommendToQty' },
{ label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
{ label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
{ label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
{ label: "推荐来源批次", prop: 'recommendFromLot' },
{ label: "推荐目标批次", prop: 'recommendToLot' },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
{ label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
{ label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
{ label: "实际来源批次", prop: 'handledFromLot' },
{ label: "实际目标批次", prop: 'handledToLot' },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
{ label: "位置码", prop: 'positionCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "推荐类型", prop: 'recommendType' },
]

51
fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue

@ -9,7 +9,7 @@
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@topbutton="topbuttonHandle"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@ -22,6 +22,7 @@
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
:tableSelection="true"
>
</tablePagination>
<!--抽屉-->
@ -61,6 +62,7 @@ import {
processRequest,
getDetailed,
getPageListWip,
deliverRequestHandleList
} from "@/api/wms-api";
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
@ -98,12 +100,19 @@ export default {
//
currenButtonData: [
this.defaultImportBtn(),//
{
type: "success",
icon: "el-icon-d-arrow-right",
label: "批量生成发货单",
name: "creatDeliver",
size: "mini",
},
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
DrawerButtonData: [
...requestData(this)
// ...requestData(this)
],
};
},
@ -111,6 +120,44 @@ export default {
this.paging();
},
methods:{
topbuttonHandle(val,item){
if(val == "creatDeliver"){
if(!this.multipleSelection || this.multipleSelection.length <= 0){
this.$warningMsg("至少选择一条数据")
return
}
let _hasNoSame = 0
for(let i = 0;i<this.multipleSelection.length;i++){
if(this.multipleSelection[i].customerCode != this.multipleSelection[0].customerCode){
_hasNoSame ++
}
}
if(_hasNoSame != 0){
this.$errorMsg("所选数据的客户代码必须一致!")
return
}
let _ids = []
this.multipleSelection.forEach(select=>{ _ids.push(select.id) })
this.$confirm('是否确定批量生成发货单?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.Loading.appMainLoading = true
deliverRequestHandleList(_ids)
.then(res => {
this.Loading.appMainLoading = false
this.paging()
}).catch(err => {
this.Loading.appMainLoading = false
})
}).catch(() => {
});
}else{
this.topbutton(val,item)
}
},
printHandle(){
this.Loading.appMainLoading = true
let param = {

Loading…
Cancel
Save