From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 161 insertions(+), 12 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\350\260\203\346\213\250/Kf_MoveStockBill_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/Kf_MoveStockBill_PDA.html"
index 87094d4..7e878dd 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/Kf_MoveStockBill_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/Kf_MoveStockBill_PDA.html"
@@ -82,11 +82,18 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
</div>
- <div class="layui-col-xs7">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT">纭畾</button>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width:55px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>
+ <div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 40px; margin-left: 0px;padding-left:10px">OK</button>
+ </div>
</div>
</div>
<div class="layui-row">
@@ -116,7 +123,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
</div>
<div class="layui-col-xs9">
- <select name=" HStockStyle" id="HStockStyle"disabled>
+ <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
<option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
<option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
</select>
@@ -312,7 +319,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
</div>
<div class="layui-col-xs10">
- <select name=" HStockOutOrgID" id="HStockOutOrgID"disabled>
+ <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -324,7 +331,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
</div>
<div class="layui-col-xs10">
- <select name=" HStockInOrgID" id="HStockInOrgID"disabled>
+ <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -476,6 +483,7 @@
<input type="hidden" name="HBillType" id="HBillType">
<input type="hidden" name="HBillerID" id="HBillerID">
<input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+ <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs" hidden controls>
@@ -610,7 +618,7 @@
$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
$("#HBillType").val("1207");
$("#HRedBlueFlag").val("false");
- if (sessionStorage["HSCWHSPFlag"]) {
+ if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
$("#HStockPlaceName").attr("disabled", "disabled");
@@ -622,7 +630,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- if (sessionStorage["HWhSPFlag"]) {
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
$("#HOutStockPlaceName").attr("disabled", "disabled");
@@ -1258,6 +1266,13 @@
//鎵弿璋冨叆浠撳簱鏉＄爜
$('#HWHName').on('keydown', function (event) {
if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
var HWHName = $('#HWHName').val()
if (HWHName == '') {
playSound();
@@ -1325,6 +1340,13 @@
//璋冨叆浠撳簱鎸夐挳
form.on('submit(HWHID-BT)', function () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1346,6 +1368,13 @@
//鎵弿璋冨叆浠撲綅鏉＄爜
$('#HStockPlaceName').on('keydown', function (event) {
if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
//璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
@@ -1406,6 +1435,13 @@
//璋冨叆浠撲綅鎸夐挳
form.on('submit(HSpID-BT)', function () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
//璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
@@ -1912,6 +1948,57 @@
//#endregion
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '1402') {
+ HSourceTitle = "鍙戣揣閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '1243') {
+ HSourceTitle = "璋冩嫧鐢宠鍗�";
+ }
+ else if (HSourceBillType == '3720') {
+ HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1604') {
+ HSourceTitle = "濮斿鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1214') {
+ HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '3721') {
+ HSourceTitle = "鐢熶骇澶囨枡鍗�";
+ }
+ else if (HSourceBillType == '1242') {
+ HSourceTitle = "鍑哄簱鐢宠鍗�";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ if ($("#HSourceBillListCtl").val() == '1') {
+ GetMeesageBySourceBillNo();
+ $("#HSourceBillListCtl").val("0"); //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+ }
+ }
+ })
+ });
+
+ //#endregion
+
+
//#region 鎵弿婧愬崟鏉＄爜
//鎵弿婧愬崟鏉＄爜
@@ -2136,7 +2223,7 @@
layer.load(3)
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
@@ -2299,13 +2386,14 @@
var optionHtml = '';
optionHtml += "<option value = '-1' >" + '鎵嬪伐褰曞叆' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
- layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
//婧愬崟鍗曞彿鏀逛负涓嶅彲缂栬緫妯″紡
$("#HSourceBillNo").val("");
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").attr("disabled", true);
+ layui.form.render('select');
element.tabChange('tab-Kf_MoveStockBill_PDA', '3');
}
}
@@ -2463,6 +2551,60 @@
//#endregion
+ //#region 閫夋嫨璋冩嫧绫诲瀷
+ form.on('select(HStockStyle)', function (data) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�') {
+ $("#HStockInOrgID").attr("disabled", false);
+ form.render('select');
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ else {
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockInOrgID").attr("disabled", true);
+ form.render('select');
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ }
+ });
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冨叆缁勭粐
+ form.on('select(HStockInOrgID)', function (data) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+
+ //#endregion
+
+
});
@@ -2558,6 +2700,13 @@
$("#HSupID").val(obj[0].HItemID);
}
}
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
--
Gitblit v1.9.1