sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改调拨入库和直接上架

wms3.0_pda
niexiting 11 months ago
parent
1930f8887b
commit
3ebfe853f0
6 changed files with 211 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      api/request2.js
  2. 43
      common/balance.js
  3. 1
      common/record.js
  4. 1
      common/style/pdabasic.css
  5. 130
      pages/putaway/record/putawayRecord.vue
  6. 94
      pages/transfer/job/receiptDetail.vue

16
api/request2.js
View File

@ -304,6 +304,22 @@ export function getBasicLocationByCode(code) {
});
}
/**
* 校验库位零件关系
* @param {*}
*
*/
export function validateItemAndLocation(parmas) {
return request({
url: baseApi + "/wms/location/validate",
method: "post",
data: parmas,
});
}
/**
* 查询物品信息接口
* @param {*} code 物品代码

43
common/balance.js
View File

@ -4,6 +4,47 @@ import {
getBalanceByFilter
} from '@/api/request2.js';
/**
*
获取管理精度查询策略参数
* @param {*}
*
*/
export function getPrecisionStrategyParams(dataSource) {
}
/**
*
获取管理精度查询策略参数
* @param {*}
*
*/
export function getPrecisionStrategyParamsByLocation(detailSource,toLocationCode) {
var itemList = []
detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
detail.toLocationCode = toLocationCode;
var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode &&
res.locationCode == detail.toLocationCode) {
return res
}
})
//去掉重复元素
if (filterResult.length == 0) {
var result = {
itemCode: item.itemCode,
locationCode: detail.toLocationCode
}
itemList.push(result)
}
}
})
})
return itemList;
}
/**
* "itemCode": [],
@ -19,7 +60,7 @@ export function getPrecisionStrategyList(itemList, callback) {
success: true,
message: ''
};
getPrecisionStrategy(itemList).then(res => {
if (res.data == null) {
result.success = false

1
common/record.js
View File

@ -19,6 +19,7 @@ export function createItemInfo(balance, pack) {
}
return item;
}
export function createDetailInfo(data, pack) {
data.scaned = true;
// data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;

1
common/style/pdabasic.css
View File

@ -725,6 +725,7 @@ page {
.page-header .header_item {
/* padding-left: 10rpx; */
padding: 5rpx 10rpx;
font-size:15px ;
}
.page-header .header_job_top {

130
pages/putaway/record/putawayRecord.vue
View File

@ -41,7 +41,8 @@
<script>
import {
putawayRequestSubmit,
putawayRecordSubmit
putawayRecordSubmit,
validateItemAndLocation
} from '@/api/request2.js';
import {
@ -63,7 +64,9 @@
} from '@/common/record.js';
import {
getManagementPrecisions
getManagementPrecisions,
getPrecisionStrategyList,
getPrecisionStrategyParamsByLocation
} from '@/common/balance.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
@ -89,22 +92,16 @@
data() {
return {
id: '',
receiptJob: {},
received: false,
dataContent: {}, //内容
detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
businessTypeInfo: {},
fromLocationInfo: {},
fromLocationCode: "",
toLocationCode: "",
isShowLocation: false,
fromlocationTypeList: [],
tolocationTypeList: [],
inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态
businessType: {},
fromType: "",
showToLoaction: true
};
},
@ -240,40 +237,97 @@
return;
}
uni.showLoading({
title: "提交中....",
mask: true
});
//查询库位零件关系
// uni.showLoading({
// title: "提交中....",
// mask: true
// });
//记录有目标库位，需要查询管理模式
var itemCodes = []
//1:查询库位零件关系
// var itemCodes = []
// let conditions = [];
// this.detailSource.forEach(item => {
// debugger;
// let condition = {
// itemCode: item.itemCode,
// batch: item.batch,
// inventoryStatus: item.inInventoryStatus,
// locationCode: this.toLocationCode
// };
// conditions.push(condition)
// })
let itemAndLocationRelations = this.getItemAndLocationRelations();
validateItemAndLocation(itemAndLocationRelations, res => {
debugger;
});
let precisionStrategyParams = getPrecisionStrategyParamsByLocation(this.detailSource, this.toLocationCode);
return;
//2:获取管理模式，封装参数
// getManagementPrecisions(itemCodes, this.toLocationCode, res => {
// if (res.success) {
// this.managementList = res.list;
// var params = this.setRecordParams(true)
// console.log("提交参数", JSON.stringify(params));
// putawayRecordSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("提交成功<br>生成采购上架记录" + res.data, )
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
// } else {
// uni.hideLoading();
// this.showErrorMessage(res.message);
// }
// });
},
getItemAndLocationRelations() {
var itemList = []
this.detailSource.forEach(item => {
itemCodes.push(item.itemCode)
})
//获取管理模式，封装参数
getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) {
this.managementList = res.list;
var params = this.setRecordParams(true)
console.log("提交参数", JSON.stringify(params));
putawayRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架记录" + res.data, )
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
item.subList.forEach(detail => {
if (detail.scaned) {
detail.toLocationCode = this.toLocationCode;
var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode &&
res.locationCode == detail.toLocationCode &&
res.batch == detail.batch &&
res.inventoryStatus == detail.inventoryStatus) {
return res
}
})
//去掉重复元素
if (filterResult.length == 0) {
var result = {
itemCode: item.itemCode,
locationCode: detail.toLocationCode,
batch: detail.batch,
inventoryStatus: detail.inventoryStatus,
}
itemList.push(result)
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
}
});
}
})
})
return itemList;
},
setRecordParams(queryModel) {
@ -289,7 +343,7 @@
detail.toBatch = info.batch;
detail.toInventoryStatus = detail.inventoryStatus
detail.toLocationCode = this.toLocationCode
detail.package=null;
detail.package = null;
subList.push(detail)
}
})

94
pages/transfer/job/receiptDetail.vue
View File

@ -7,6 +7,9 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class="header_item">
来源仓库 : {{jobContent.fromWarehouseCode}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
@ -37,7 +40,8 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<com-message ref="comMessage"></com-message>
@ -57,7 +61,8 @@
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
getDirectoryItemArray
getDirectoryItemArray,
compareAsc
} from '@/common/basic.js';
import {
@ -75,17 +80,18 @@
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import winScanPack from "@/mycomponents/scan/winScanPack.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'returnDetail',
components: {
winScanButton,
requiredLocation,
comMessage,
winScanPackAndLocation,
winScanPack,
comDetailCard,
detailInfoPopup,
jobTop
@ -101,7 +107,7 @@
toLocationCode: "",
businessTypeInfo: {},
managementList: [],
tolocationTypeList:[]
tolocationTypeList: []
};
},
onLoad(option) {
@ -227,29 +233,45 @@
},
openScanPopup() {
let fromlocationCode = '';
let fromlocationList = [];
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
item.subList.forEach(l => {
//重复的库位不往里面插入
var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
if (location.length == 0) {
fromlocationList.push(l.fromLocationCode);
}
//来源库位赋默认值
if (fromlocationCode == '') {
if (!l.scaned) {
fromlocationCode = l.fromLocationCode;
this.$refs.scanPopup.openScanPopup();
},
getScanResult(result) {
try {
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
var qty = result.label.qty;
var itemCode = result.label.itemCode;
var detail = this.detailSource.find(r => r.itemCode == itemCode);
if (detail == undefined) {
this.showMessage("物料号【" + itemCode + "】不在列表中")
} else {
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
if (itemDetail == undefined) {
this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
} else {
if (itemDetail.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
itemDetail.handleQty = Number(result.label.qty);
itemDetail.toLocationCode = this.toLocationCode;
itemDetail.labelQty = Number(result.label.qty);
calcHandleQty(this.detailSource);
this.continueScan()
this.$forceUpdate()
var list = this.detailSource[0].subList;
}
}
})
}
} catch (e) {
this.showErrorMessage(e.message)
}
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
},
getScanResult(result) {
getScanResult1(result) {
try {
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
@ -272,15 +294,16 @@
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续入库?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
@ -288,20 +311,21 @@
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});
}
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) ;
itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
@ -350,7 +374,7 @@
},
submitJob() {
uni.showLoading({
title: "提交中....",
mask: true
@ -379,7 +403,7 @@
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)

Write Preview
Loading…
Cancel
Save