From fce433da9316178106c6794d152d5abc843fe637 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 六月 2023 10:24:37 +0800
Subject: [PATCH] 换托调拨单扫码模块优化
---
WebTM/views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html | 133 +++++++++++++++++++++++++++++++-------------
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html | 5 +
2 files changed, 97 insertions(+), 41 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
index 760a84e..8d51555 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
@@ -451,13 +451,14 @@
layer.load(3);
}
else {
- layer.msg(data.Message, { icon: 5 });
+ playSound();
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
document.getElementById("cmdLoadData").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
}
layer.closeAll("loading"); //鍏抽棴鍔犺浇灞�
},
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
document.getElementById("cmdLoadData").disabled = false;
}
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/\350\260\203\346\213\250\346\215\242\346\211\230/Kf_MoveStockBill_HuanTuo_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/\350\260\203\346\213\250\346\215\242\346\211\230/Kf_MoveStockBill_HuanTuo_PDA.html"
index 4735bcd..02b54f3 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/\350\260\203\346\213\250\346\215\242\346\211\230/Kf_MoveStockBill_HuanTuo_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/\350\260\203\346\213\250\346\215\242\346\211\230/Kf_MoveStockBill_HuanTuo_PDA.html"
@@ -14,6 +14,7 @@
<script src="../../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
<style>
.layui-col-xs4 {
width: 12.333333%
@@ -158,9 +159,9 @@
var HBillNo = $('#HBillNo').val()
var HBillType = '1207'
var HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
- var HPackUnionInterID_In = $("#HPackUnionInterID_In").val() //璋冨叆缁勬墭鍗曞唴鐮�
- var HWhID = $("#HWHID").val() //璋冨叆浠撳簱
- var HSPID = $("#HSPID").val() //璋冨叆浠撲綅
+ var HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //璋冨叆缁勬墭鍗曞唴鐮�
+ var HWhID = $('#HWHID').val() //璋冨叆浠撳簱
+ var HSPID = $('#HSPID').val() //璋冨叆浠撲綅
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"]
var SourceFlag = sessionStorage["SourceFlag"]; //鎵樻潯鐮佸凡鎵爣蹇�
@@ -210,20 +211,20 @@
//#endregion
//#region 浠庣紦瀛樺垪琛ㄤ腑杩斿洖淇℃伅
- function getBillTemp() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
- var params = getBillTemp();
- var HInterID_Temp = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
- var HBillNo_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
- var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
+ //function getBillTemp() {
+ // var vars = [], hash;
+ // var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ // for (var i = 0; i < hashes.length; i++) {
+ // hash = hashes[i].split('=');
+ // vars.push(hash[0]);
+ // vars[hash[0]] = hash[1];
+ // }
+ // return vars;
+ //}
+ //var params = getBillTemp();
+ //var HInterID_Temp = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+ //var HBillNo_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
+ //var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
//#endregion
@@ -231,13 +232,12 @@
if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
+ var OperationType = 0; //鐩存帴鏂板
} else {
- var OperationType = 2;//鎿嶄綔绫诲瀷
+ var OperationType = 1; //缂撳瓨涓墦寮�
}
-
- if (HInterID_Temp == null || HInterID_Temp == 0) {
+ if (OperationType == 0 && HInterID == 0) {
//鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
$.ajax({
type: "GET",
@@ -257,26 +257,70 @@
});
SourceFlag = false;
}
+ else if (OperationType == 0 && HInterID != 0) {
+ SourceFlag = true;
+ }
//浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
- else {
- var HInterID_Temp = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
- var HBillNo_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
- var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
-
- $('#HInterID').val(HInterID_Temp)
- $('#HBillNo').val(HBillNo_Temp)
- $('#HBarCode_Pack_In').val(HBarCode_Pack_Temp)
+ else if (HInterID == 0) {
+ $("#HBarCode_Pack_In").val(params[params[0]]);
$("#HBarCode_Pack_In").attr("readonly", "readonly");
- HInterID = $('#HInterID').val()
- HBillNo = $('#HBillNo').val()
- HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
- $("#HBarCode").focus();
+ $("#HPackUnionInterID_In").val(params[params[0]]);
+ $("#HWHName").val(params[params[0]]);
+ $("#HWHID").val(params[params[0]]);
+ $("#HSPName").val(params[params[0]]);
+ $("#HSPID").val(params[params[0]]);
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ document.getElementById("cmdHBarCode_Pack_In").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
-
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
SourceFlag = true;
}
+ else {
+ SourceFlag = true;
+ }
+
+ //if (HInterID_Temp == null || HInterID_Temp == 0) {
+ // //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ // data: { "HBillType": HBillType },
+ // success: function (d) {
+ // if (d.count == 1) {
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // HInterID = $('#HInterID').val()
+ // HBillNo = $('#HBillNo').val()
+ // }
+ // else {
+ // layer.msg(d.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ // }
+ // }
+ // });
+ // SourceFlag = false;
+ //}
+ ////浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ //else {
+ // var HInterID_Temp = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+ // var HBillNo_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
+ // var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
+
+ // $('#HInterID').val(HInterID_Temp)
+ // $('#HBillNo').val(HBillNo_Temp)
+ // $('#HBarCode_Pack_In').val(HBarCode_Pack_Temp)
+ // $("#HBarCode_Pack_In").attr("readonly", "readonly");
+ // HInterID = $('#HInterID').val()
+ // HBillNo = $('#HBillNo').val()
+ // HBarCode_Pack_In = $('#HBarCode_Pack_In').val()
+ // $("#HBarCode").focus();
+ // element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
+
+ // //鏄剧ず琛ㄤ綋鏄庣粏
+ // DisBillEntryList();
+ // SourceFlag = true;
+ //}
//澶辫触鎻愮ず闊�
function playSound() {
@@ -334,8 +378,14 @@
$("#HSPID").val(result.data.hSPIDField);
$("#HBarCode").select();
$("#HBarCode").focus(); //鑾峰彇鍏夋爣
- document.getElementById("cmdHBarCode_Pack_In").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
- element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '1');
+ $('#cmdHBarCode_Pack_In').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //document.getElementById("cmdHBarCode_Pack_In").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+ element.tabChange('tab-Kf_MoveStockBill_HuanTuo_PDA', '2');
+ //鍏ㄥ眬鍙橀噺璧嬪��
+ HBarCode_Pack_In = $('#HBarCode_Pack_In').val() //璋冨叆鎵樻潯鐮�
+ HPackUnionInterID_In = $('#HPackUnionInterID_In').val() //璋冨叆缁勬墭鍗曞唴鐮�
+ HWhID = $('#HWHID').val() //璋冨叆浠撳簱
+ HSPID = $('#HSPID').val() //璋冨叆浠撲綅
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
SourceFlag = true;
@@ -404,6 +454,7 @@
playSound();
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
+ layer.closeAll("loading");
},
error: function (err) {
playSound();
@@ -430,7 +481,9 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_BarCode_MoveStockBill_HuanTuo_Json",
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ data: {
+ "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode": sBarCode, "HBarCode_Pack": HBarCode_Pack_In, "HPackUnionInterID_In": HPackUnionInterID_In, "HWhID": HWhID, "HSPID": HSPID, "HMaker": HMaker, "HStockOrgID": HStockOrgID
+ },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -533,13 +586,15 @@
layer.load(3);
}
else {
- layer.msg(data.Message, { icon: 5 });
+ playSound();
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
document.getElementById("cmdLoadData").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
}
layer.closeAll("loading"); //鍏抽棴鍔犺浇灞�
},
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ playSound();
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
document.getElementById("cmdLoadData").disabled = false;
}
});
--
Gitblit v1.9.1