From 409c7f4171e4c5689eda68bb1e52ae7ae2905c8d Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 13 二月 2025 13:43:37 +0800
Subject: [PATCH] 1.成品入库初步 2.其他入库优化
---
H5/Js/cprk.js | 86 +++++++++++++++++++++-------
H5/Js/Qtrk.js | 7 +-
H5/Qtrk.aspx | 2
H5/cprk.aspx | 34 +++++++++-
4 files changed, 97 insertions(+), 32 deletions(-)
diff --git a/H5/Js/Qtrk.js b/H5/Js/Qtrk.js
index 6b5f934..e095587 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -172,11 +172,12 @@
var json = res;
if (json.status == 0) {
- that.itemNo = json.data.tbBillList.form.itemNo;
- that.num = json.data.tbBillList.form.num;
+ that.itemNo = json.data.form.itemNo;
+ that.num = json.data.form.num;
that.barcode = null;
- that.ItemBlDetail = json.data.tbBillList.item
+ that.ItemBlDetail = json.data.items;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ //that.GetMesItemBlDetailByBillNo()
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Js/cprk.js b/H5/Js/cprk.js
index ef4bcbd..7977ac9 100644
--- a/H5/Js/cprk.js
+++ b/H5/Js/cprk.js
@@ -69,11 +69,11 @@
that.$refs.sectionCode.focus();
});
},
- getScan() {
+ getBarInfo() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'MesInvItemInCDetails/SaveBarCodes', {
+ that.AxiosHttp("post", 'MesCprk/GetBarInfo', {
sectionCode: that.formData.sectionCode,
userName: that.userInfo.loginAccount,
barcode: that.formData.barcode,
@@ -81,15 +81,17 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.formData.itemNo = json.data.tbBillList.itemNo;
- that.formData.sumQuantity = json.data.tbBillList.sumQuantity;
-
- that.itemInsFormData = json.data.tbBillList.itemIns;
- that.itemTableData = json.data.tbBillList.itemInDetails;
- that.tableData = json.data.tbBillList.invItemInCDetails;
- that.barMessage = json.data.tbBillList.message;
- that.$refs.barcode.focus();
- that.formData.barcode = null;
+ that.formData.itemNo = json.data.tbMesItems.itemNo;
+ that.formData.itemName = json.data.tbMesItems.itemName;
+ that.formData.itemModel = json.data.tbMesItems.itemModel;
+ that.formData.barQuantity = json.data.tbBillList.quantity;
+ that.formData.DAA001 = json.data.tbBillList.billNo;
+ //that.formData.sumQuantity = json.data.tbMesItems.quantity;
+ if (that.formData.sectionCode == "" || that.formData.sectionCode == null) {
+ that.$refs.sectionCode.focus();
+ } else {
+ that.getScan();
+ }
}
else {
that.$toast.fail(json.message);
@@ -106,33 +108,35 @@
that.$refs.barcode.focus();
});
},
- getChaiFen() {
+ getScan() {
var that = this;
- if (that.modeInfo.daa001.length <= 0) {
- that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+
+ if (that.formData.sectionCode.length * 1 <= 0) {
+ that.$toast.fail("搴撲綅缂栫爜涓嶈兘涓虹┖锛�");
return;
}
- if (that.scanInfo.splitNum * 1 <= 0) {
- that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
- return;
- }
- if (that.scanInfo.barcode.length * 1 <= 0) {
+ if (that.formData.barcode.length * 1 <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/ScanCode', {
- daa001: that.modeInfo.daa001,
+ that.AxiosHttp("post", 'MesBarCF/CPRK', {
userName: that.userInfo.loginAccount,
- barcode: that.modeInfo.barcode,
+ sectionCode: that.formData.sectionCode,
+ barcode: that.formData.barcode,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- // that.modeInfo = json.data.tbBillList;
+ // that.modeInfo = json.data.tbBillList;
+ that.$refs.barcode.focus();
+ that.formData.barcode = null;
+ that.formData.cfNum = null;
+ that.$notify({ type: 'success', message: json.message });
}
else {
that.$toast.fail(json.message);
+ that.$refs.cfNum.focus();
}
that.isLoading = false;
})
@@ -142,6 +146,42 @@
console.log(error);
});
},
+ //getChaiFen() {
+ // var that = this;
+ // if (that.modeInfo.daa001.length <= 0) {
+ // that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // if (that.scanInfo.splitNum * 1 <= 0) {
+ // that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // if (that.scanInfo.barcode.length * 1 <= 0) {
+ // that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // that.isLoading = true;
+ // that.AxiosHttp("post", 'Womdaa/ScanCode', {
+ // daa001: that.modeInfo.daa001,
+ // userName: that.userInfo.loginAccount,
+ // barcode: that.modeInfo.barcode,
+ // }, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+ // // that.modeInfo = json.data.tbBillList;
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // console.log(error);
+ // });
+ //},
cleraCode() {
this.formData.sectionCode = null;
},
diff --git a/H5/Qtrk.aspx b/H5/Qtrk.aspx
index 200fc21..2c2bbb0 100644
--- a/H5/Qtrk.aspx
+++ b/H5/Qtrk.aspx
@@ -86,5 +86,5 @@
<comback ></comback>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtrk.js?<%=1234 %>"></script>
+ <script src="Js/Qtrk.js?<%=1235 %>"></script>
</asp:Content>
diff --git a/H5/cprk.aspx b/H5/cprk.aspx
index 6164087..7de1fdf 100644
--- a/H5/cprk.aspx
+++ b/H5/cprk.aspx
@@ -34,18 +34,42 @@
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-focus.noKeyboard
- @change="getScan"
+ @change="getBarInfo"
></van-field>
<van-field
v-model="formData.itemNo"
label="鐗╂枡缂栫爜"
- placeholder="鐗╂枡缂栫爜"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemName"
+ label="鐗╂枡鍚嶇О"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemModel"
+ label="鐗╂枡瑙勬牸"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.barQuantity"
+ label="鏉＄爜鏁伴噺"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.DAA001"
+ label="宸ュ崟鍗曞彿"
+ placeholder=""
disabled
></van-field>
<van-field
v-model="formData.sumQuantity"
- label="褰撳墠鏉＄爜鍏ュ簱鏁伴噺"
- placeholder="褰撳墠鏉＄爜鍏ュ簱鏁伴噺"
+ label="褰撳墠宸ュ崟鍏ュ簱鏁伴噺"
+ placeholder=""
disabled
></van-field>
</van-cell-group>
@@ -61,5 +85,5 @@
<comback ></comback>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/cprk.js?<%=1211 %>"></script>
+ <script src="Js/cprk.js?<%=1212 %>"></script>
</asp:Content>
--
Gitblit v1.9.3