diff --git a/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue b/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue
index 0a298fa..13fc654 100644
--- a/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue
+++ b/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue
@@ -10,6 +10,10 @@
{{fixedInfo.matName}}
+
+
+ {{fixedInfo.matBatch}}
+
{{fixedInfo.matSpec}}
@@ -147,6 +151,7 @@
matCode: '示例名称',
matName: '这是一段示例描述',
matSpec: '',
+ matBatch: '',
matQty: 0,
stocktakingQty: 0,
});
@@ -158,6 +163,7 @@
fixedInfo.value.matName = info.matName;
fixedInfo.value.matCode = info.matCode;
fixedInfo.value.matSpec = info.matSpec;
+ fixedInfo.value.matBatch = info.matBatch;
fixedInfo.value.matQty = info.matQty;
inputValue.value = fixedInfo.value.matQty;
@@ -339,7 +345,8 @@
return;
}
//货架送回区域是否选择
- if (this.shelfAreaOptions[this.selectedShelfAreaIndex].locationAreaName == '请先扫货架码' || this.shelfAreaOptions[this.selectedShelfAreaIndex].locationAreaName == '请选择') {
+ if (this.shelfAreaOptions[this.selectedShelfAreaIndex].locationAreaName == '请先扫货架码' || this
+ .shelfAreaOptions[this.selectedShelfAreaIndex].locationAreaName == '请选择') {
uni.showToast({
title: '请选择货架送回区域!',
icon: 'none',
@@ -362,7 +369,8 @@
"shelfCode": this.shelfCode,
"destinationLocationAreaId": this.shelfAreaOptions[this.selectedShelfAreaIndex].id,
- "destinationLocationAreaName": this.shelfAreaOptions[this.selectedShelfAreaIndex].locationAreaName,
+ "destinationLocationAreaName": this.shelfAreaOptions[this.selectedShelfAreaIndex]
+ .locationAreaName,
"ShelfTypeStr": this.shelfTypeOptions[this.selectedShelfTypeIndex].text,
@@ -382,7 +390,7 @@
icon: 'none',
duration: 1500
});
-
+
return;
} else {
uni.showToast({
diff --git a/PDA/PDA/pages/stockTaking/stockTaking.vue b/PDA/PDA/pages/stockTaking/stockTaking.vue
index 2153d18..3a3e977 100644
--- a/PDA/PDA/pages/stockTaking/stockTaking.vue
+++ b/PDA/PDA/pages/stockTaking/stockTaking.vue
@@ -10,6 +10,10 @@
{{fixedInfo.matName}}
+
+
+ {{fixedInfo.matBatch}}
+
{{fixedInfo.matSpec}}
@@ -130,6 +134,7 @@
infoId: 0,
matCode: '示例名称',
matName: '这是一段示例描述',
+ matBatch:'',
matSpec: '',
matQty: 0,
stocktakingQty: 0,
@@ -141,6 +146,7 @@
fixedInfo.value.matName = info.matName;
fixedInfo.value.matCode = info.matCode;
+ fixedInfo.value.matBatch = info.matBatch;
fixedInfo.value.matSpec = info.matSpec;
fixedInfo.value.matQty = info.matQty;
fixedInfo.value.stocktakingQty = info.stocktakingQty;
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index 0997b0c..76fe00c 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -3563,6 +3563,7 @@ if (uni.restoreGlobal) {
infoId: 0,
matCode: "示例名称",
matName: "这是一段示例描述",
+ matBatch: "",
matSpec: "",
matQty: 0,
stocktakingQty: 0
@@ -3573,6 +3574,7 @@ if (uni.restoreGlobal) {
fixedInfo.infoId = info.id;
fixedInfo.value.matName = info.matName;
fixedInfo.value.matCode = info.matCode;
+ fixedInfo.value.matBatch = info.matBatch;
fixedInfo.value.matSpec = info.matSpec;
fixedInfo.value.matQty = info.matQty;
fixedInfo.value.stocktakingQty = info.stocktakingQty;
@@ -3686,10 +3688,10 @@ if (uni.restoreGlobal) {
this.userName = getConfig("userName", "admin");
const self = this;
recive(function(res) {
- formatAppLog("log", "at pages/stockTaking/stockTaking.vue:285", "Success:" + res.data);
+ formatAppLog("log", "at pages/stockTaking/stockTaking.vue:291", "Success:" + res.data);
self.analysisScanCode(res.data);
}, function(err) {
- formatAppLog("log", "at pages/stockTaking/stockTaking.vue:288", "Error:", JSON.stringify(err));
+ formatAppLog("log", "at pages/stockTaking/stockTaking.vue:294", "Error:", JSON.stringify(err));
});
},
methods: {
@@ -3703,11 +3705,11 @@ if (uni.restoreGlobal) {
cameraScanCode() {
uni.scanCode({
success: (res) => {
- formatAppLog("log", "at pages/stockTaking/stockTaking.vue:302", "扫码结果:", res.result);
+ formatAppLog("log", "at pages/stockTaking/stockTaking.vue:308", "扫码结果:", res.result);
this.analysisScanCode(res.result);
},
fail: (err) => {
- formatAppLog("error", "at pages/stockTaking/stockTaking.vue:306", "扫码失败:", err);
+ formatAppLog("error", "at pages/stockTaking/stockTaking.vue:312", "扫码失败:", err);
}
});
},
@@ -3776,7 +3778,7 @@ if (uni.restoreGlobal) {
this.clear();
},
complete: (event) => {
- formatAppLog("log", "at pages/stockTaking/stockTaking.vue:385", "请求完成", event);
+ formatAppLog("log", "at pages/stockTaking/stockTaking.vue:391", "请求完成", event);
}
});
},
@@ -3840,6 +3842,16 @@ if (uni.restoreGlobal) {
/* TEXT */
)
]),
+ vue.createElementVNode("view", { class: "info-item" }, [
+ vue.createElementVNode("label", null, "物料批次："),
+ vue.createElementVNode(
+ "text",
+ null,
+ vue.toDisplayString($setup.fixedInfo.matBatch),
+ 1
+ /* TEXT */
+ )
+ ]),
vue.createElementVNode("view", { class: "info-item" }, [
vue.createElementVNode("label", null, "物料规格："),
vue.createElementVNode(
@@ -4895,6 +4907,7 @@ if (uni.restoreGlobal) {
matCode: "示例名称",
matName: "这是一段示例描述",
matSpec: "",
+ matBatch: "",
matQty: 0,
stocktakingQty: 0
});
@@ -4902,10 +4915,11 @@ if (uni.restoreGlobal) {
const inputValue = vue.ref("");
const showPopup = (info) => {
fixedInfo.infoId = info.id;
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:157", fixedInfo.infoId);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:162", fixedInfo.infoId);
fixedInfo.value.matName = info.matName;
fixedInfo.value.matCode = info.matCode;
fixedInfo.value.matSpec = info.matSpec;
+ fixedInfo.value.matBatch = info.matBatch;
fixedInfo.value.matQty = info.matQty;
inputValue.value = fixedInfo.value.matQty;
popup.value.open();
@@ -5040,10 +5054,10 @@ if (uni.restoreGlobal) {
this.userName = getConfig("userName", "admin");
const self = this;
recive(function(res) {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:311", "Success:" + res.data);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:317", "Success:" + res.data);
self.analysisScanCode(res.data);
}, function(err) {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:314", "Error:", JSON.stringify(err));
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:320", "Error:", JSON.stringify(err));
});
},
methods: {
@@ -5127,7 +5141,7 @@ if (uni.restoreGlobal) {
});
},
complete: (event) => {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:417", "请求完成", event);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:425", "请求完成", event);
}
});
},
@@ -5135,11 +5149,11 @@ if (uni.restoreGlobal) {
cameraScanCode() {
uni.scanCode({
success: (res) => {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:425", "扫码结果:", res.result);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:433", "扫码结果:", res.result);
this.analysisScanCode(res.result);
},
fail: (err) => {
- formatAppLog("error", "at pages/productionLineCallOut/productionLineCallOut.vue:429", "扫码失败:", err);
+ formatAppLog("error", "at pages/productionLineCallOut/productionLineCallOut.vue:437", "扫码失败:", err);
}
});
},
@@ -5211,7 +5225,7 @@ if (uni.restoreGlobal) {
this.clear();
},
complete: (event) => {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:516", "请求完成", event);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:524", "请求完成", event);
}
});
},
@@ -5286,7 +5300,7 @@ if (uni.restoreGlobal) {
this.clear();
},
complete: (event) => {
- formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:599", "请求完成", event);
+ formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:607", "请求完成", event);
}
});
},
@@ -5350,6 +5364,16 @@ if (uni.restoreGlobal) {
/* TEXT */
)
]),
+ vue.createElementVNode("view", { class: "info-item" }, [
+ vue.createElementVNode("label", null, "物料批次："),
+ vue.createElementVNode(
+ "text",
+ null,
+ vue.toDisplayString($setup.fixedInfo.matBatch),
+ 1
+ /* TEXT */
+ )
+ ]),
vue.createElementVNode("view", { class: "info-item" }, [
vue.createElementVNode("label", null, "物料规格："),
vue.createElementVNode(