From 689255f057fd019330102b56634f18826af7d88f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 22 Dec 2023 10:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F=E5=92=8C?=
=?UTF-8?q?=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/basic.js | 18 ++++++++++--------
mycomponents/scan/winScanPackAndLocation.vue | 5 +++--
pages/putaway/record/putawayRecord.vue | 15 +++++++++------
static/config.json | 2 +-
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/common/basic.js b/common/basic.js
index 84ab342c..53648ae5 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -595,13 +595,12 @@ export function getInspectReasonList(value) {
// else return 'Other'
// }
-export function getPackingNumberAndBatchByList(managementList, itemCode, packingNumber,locationCode, batch) {
+export function getPackingNumberAndBatchByList(managementList, itemCode, packingNumber, locationCode, batch) {
var itemInfo = {
packingNumber: "",
batch: ""
}
-
- var manageType = queryManageModelByList(managementList, itemCode,locationCode)
+ var manageType = queryManageModelByList(managementList, itemCode, locationCode)
if (manageType == "BY_QUANTITY") {
itemInfo.packingNumber = ""
itemInfo.batch = ""
@@ -614,19 +613,22 @@ export function getPackingNumberAndBatchByList(managementList, itemCode, packing
} else if (manageType == "BY_UNIQUE_ID") {
itemInfo.packingNumber = packingNumber
itemInfo.batch = batch
+ } else if (manageType == "") {
+ itemInfo.packingNumber = packingNumber
+ itemInfo.batch = batch
}
return itemInfo;
}
-export function queryManageModelByList(managementList, itemCode,locationCode) {
- var result = managementList.filter(res => {
- if (res.itemCode == itemCode&&res.locationCode==locationCode) {
+export function queryManageModelByList(managementList, itemCode, locationCode) {
+ var result = managementList.find(res => {
+ if (res.itemCode == itemCode && res.locationCode == locationCode) {
return res.ManagementPrecision
}
})
if (result != undefined) {
- return result[0].ManagementPrecision
+ return result.ManagementPrecision
} else {
return ""
}
@@ -806,7 +808,7 @@ export function getBatch() {
var year = date.getFullYear(); //年
var month = date.getMonth() + 1; //月
var day = date.getDate(); //日
- var batch =year.toString()+month.toString()+day.toString()
+ var batch = year.toString() + month.toString() + day.toString()
return batch;
}
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 98d9f6f0..366e749f 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -21,13 +21,14 @@
来源库位
-
+
+
+ @confirm="scanLocation" style='height: 30px;border:1px solid #fff ;'>
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 45136c28..1098c737 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -163,8 +163,11 @@
}
})
if (detail == undefined) {
- let newDetail = createDetailInfo(balance, pack);
- item.subList.push(newDetail);
+ this.getRecommendLocation(balance, pack, toLocationCode => {
+ let newDetail = createDetailInfo(balance, pack);
+ newDetail.toLocationCode = toLocationCode;
+ item.subList.push(newDetail);
+ });
} else {
if (detail.scaned == true) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
@@ -276,10 +279,10 @@
//记录有目标库位，需要查询管理模式
let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
//2:获取管理模式，封装参数
- getPrecisionStrategyList(precisionStrategyParams, this.toLocationCode, res => {
+ getPrecisionStrategyList(precisionStrategyParams, res => {
if (res.success) {
this.managementList = res.list;
- var params = this.setRecordParams(true)
+ var params = this.setRecordParams()
console.log("提交参数", JSON.stringify(params));
putawayRecordSubmit(params).then(res => {
@@ -333,14 +336,14 @@
return itemList;
},
- setRecordParams(queryModel) {
+ setRecordParams() {
var subList = []
var creator = this.$store.state.user.id
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
- detail.packingNumber, detail.batch);
+ detail.packingNumber, detail.toLocationCode, detail.batch);
detail.toPackingNumber = info.packingNumber;;
detail.toContainerNumber = detail.containerNumber
detail.toBatch = info.batch;
diff --git a/static/config.json b/static/config.json
index f1ce854b..7426682e 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
"request_url": {
"name": "request_url",
- "value": "http://192.168.0.180:12080/admin-api",
+ "value": "http://dev.ccwin-in.com:25100/api/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.180:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api",