From 45012c55d231a88bd17d3e6bc8c19a9940266d4e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:09:01 +0800
Subject: [PATCH] fix: 修正 客户分类复制页面 供应商分类复制页面 审核按钮禁用异常
---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 794 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 494 insertions(+), 300 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index d1f5125..7c4b846 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -29,7 +29,7 @@
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
@@ -41,7 +41,7 @@
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
</div>
@@ -52,8 +52,8 @@
<li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
<li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
- <li lay-id="5" style="padding:1px;">搴撳瓨淇℃伅</li>
- <li lay-id="6" style="padding:1px;min-width: 35px;">姹囨��</li>
+ <!--<li lay-id="5" style="padding:1px;">搴撳瓨淇℃伅</li>
+ <li lay-id="6" style="padding:1px;min-width: 35px;">姹囨��</li>-->
</ul>
<div class="layui-tab-content">
<!--閫夋嫨婧愬崟-->
@@ -83,7 +83,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <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="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
@@ -93,10 +93,10 @@
<div class="layui-form-item" style="padding:0px;margin:0px;">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
<div class="layui-col-xs8">
- <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
+ <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
@@ -179,7 +179,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -193,7 +193,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -207,7 +207,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -221,7 +221,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -235,7 +235,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">鐝粍</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -249,7 +249,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -263,7 +263,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -277,7 +277,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -346,13 +346,13 @@
<table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
</div>
<!--搴撳瓨淇℃伅-->
- <div class="layui-tab-item">
+ <!--<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
- </div>
+ </div>-->
<!--姹囨��-->
- <div class="layui-tab-item">
+ <!--<div class="layui-tab-item">
<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
- </div>
+ </div>-->
</div>
<!--<div class="layui-form-item" style="margin-bottom: 20px;">
<div class="layui-row">
@@ -410,7 +410,86 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var HBillType = '1207'
+ var HMaker = sessionStorage["HUserName"]
+ var HSourceFlag = sessionStorage["SourceFlag"];
+ var OperationType = 0;//鎿嶄綔绫诲瀷
+ var option = [];
$("#HSourceBillNo").focus();
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ var FIFOlistOption = {
+ elem: '#FIFOlist-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HWhName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ var listOption1 = {
+ elem: '#mx-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
//$("#HSCWHID").val(sessionStorage["HWHID"]);
@@ -438,16 +517,14 @@
$("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
$("#HStockInOrgName").val(sessionStorage["Organization"]);
$("#HBillSubType").val(sessionStorage["HBillSubType"]);
- var HSourceFlag = sessionStorage["SourceFlag"];
-
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -460,32 +537,58 @@
}
return vars;
}
+ //var params = getUrlVars();
+ //var HInterID_Temp = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
var params = getUrlVars();
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HSourceBillType = params[params[1]]; //鐢ㄤ簬鍒ゆ柇婧愬崟绫诲瀷
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var OperationType = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷 1鏂板 2浠庣紦瀛樺垪琛ㄤ腑杩斿洖
+ var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+ var HSourceBillType = params[params[2]]; //鐢ㄤ簬鍒ゆ柇婧愬崟绫诲瀷
+
//鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
- $("#HBillNo").val("");
+ if (HInterID != 0) {
+ HSourceFlag = true;
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else if (OperationType == 2) {
+ RoadBillMain(HInterID_Temp);
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //$('#QueDin2').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //document.getElementById("QueDin2").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ HSourceFlag = true;
+ }
+ else {
+ OperationType = 1;
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
- data: { "HBillType": '1207' },
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
+ 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' });
+ }
}
});
+
//鑾峰彇鍗曟嵁瀛愮被鍨�
var HBillSubType = '';
var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
$.ajax({
- url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -502,43 +605,17 @@
layer.closeAll("loading");
}
})
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid);
- RoadBillSub(linterid);
+
+ HSourceFlag = false;
}
- if (HSourceBillType == 1402) { //鍙戣揣閫氱煡鍗�
- $("#HBillType").val(1402);
-
- } else if (HSourceBillType == 1243) { //璋冩嫧鐢宠鍗�
- $("#HBillType").val(1243);
-
- } else if (HSourceBillType == 1214) { //鐢熶骇鍙戞枡閫氱煡鍗�
- $("#HBillType").val(1214);
-
- } else if (HSourceBillType == 1604) { //濮斿鐢ㄦ枡娓呭崟
- $("#HBillType").val(1604);
-
- } else if (HSourceBillType == 1242) { //鍑哄簱鐢宠鍗�
- $("#HBillType").val(1242);
- } else {
- $("#HBillType").val(-1);
- }
-
- //鐩存帴璋冩嫧 鎵皟鍑轰粨搴�--璋冨叆浠撳簱--鏉＄爜
- if ($("#HBillType").val() == -1) {
- element.tabChange('tab-MoveStockBill', '2');
-
- $("#HSCWHNAME").focus();//璋冨嚭浠撳簱
- }
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ function RoadBillMain(HInterID_Temp)//鍔犺浇琛ㄥご
{
$.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
type: "GET",
- data: { "HInterID": linterid },
+ url: GetWEBURL() + "/Web/GetPonderationBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID_Temp },
success: function (d) {
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -609,7 +686,7 @@
$("#HBillType").attr("readonly", "readonly");
}
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
- $("#HSourceBillNo").attr("disabled","true");
+ $("#HSourceBillNo").attr("disabled", "true");
//$("#HSourceBillNo").append.readonly = true;
HSourceFlag = true;
//$("#HWHID").val(d.data[0].HWhID);
@@ -624,8 +701,9 @@
var HBillSubType = '';
var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
$.ajax({
- url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -642,7 +720,81 @@
}
- function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+
+ ////鍒ゆ柇鏄惁鏂板
+ //if (HInterID_Temp == null || HInterID_Temp == 0) {
+ // //鑾峰彇鏈�澶у崟鎹彿 new
+ // $("#HInterID").val("");
+ // $("#HBillNo").val("");
+ // $.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ // type: "GET",
+ // data: { "HBillType": '1207' },
+ // success: function (d) {
+ // //console.log(d.data);
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // }
+ // });
+ // //鑾峰彇鍗曟嵁瀛愮被鍨�
+ // var HBillSubType = '';
+ // var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+ // $.ajax({
+ // url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ // type: "GET",
+ // data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // var data = result.data;
+ // for (var i = 0; i < data.length; i++) {
+ // HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
+ // }
+ // $("#HBillSubType").append(HBillSubType);
+ // if (HSourceBillType == 1402) { //鍙戣揣閫氱煡鍗�
+ // $("#HBillSubType").val("ZJDB02_SYS"); //鍗曟嵁绫诲瀷榛樿涓哄瘎鍞�
+ // }
+ // form.render('select');
+ // }
+ // layer.closeAll("loading");
+ // }
+ // })
+ //}
+ //else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ // RoadBillMain(HInterID_Temp);
+ // RoadBillSub(HInterID_Temp);
+ //}
+
+ if (HSourceBillType == 1402) { //鍙戣揣閫氱煡鍗�
+ $("#HBillType").val(1402);
+
+ } else if (HSourceBillType == 1243) { //璋冩嫧鐢宠鍗�
+ $("#HBillType").val(1243);
+
+ } else if (HSourceBillType == 1214) { //鐢熶骇鍙戞枡閫氱煡鍗�
+ $("#HBillType").val(1214);
+
+ } else if (HSourceBillType == 3720) { //鐢熶骇鐢ㄦ枡娓呭崟
+ $("#HBillType").val(3720);
+
+ } else if (HSourceBillType == 1604) { //濮斿鐢ㄦ枡娓呭崟
+ $("#HBillType").val(1604);
+
+ } else if (HSourceBillType == 1242) { //鍑哄簱鐢宠鍗�
+ $("#HBillType").val(1242);
+ } else {
+ $("#HBillType").val(-1);
+ }
+
+ //鐩存帴璋冩嫧 鎵皟鍑轰粨搴�--璋冨叆浠撳簱--鏉＄爜
+ if ($("#HBillType").val() == -1) {
+ element.tabChange('tab-MoveStockBill', '2');
+
+ $("#HSCWHNAME").focus();//璋冨嚭浠撳簱
+ }
+
+
+
+ function RoadBillSub(HInterID_Temp)//鍔犺浇琛ㄤ綋
{
table.render({
elem: '#wl-table'
@@ -651,7 +803,7 @@
, page: true
, limit: 100
, defaultToolbar: []
- , where: { HBillID: linterid, HBillType: '1207', sWhere: '' }
+ , where: { HBillID: HInterID_Temp, HBillType: '1207', sWhere: '' }
, cols: [[
{ type: 'radio' }
, { field: 'HQty', title: '鏁伴噺', width: 150 }
@@ -952,21 +1104,46 @@
//缂栬緫
form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ })
+ }
+ else {
+ layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+ }
+
+ //var sSubStr = table.cache['wl-table'];
+ ////if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ //layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '鏄庣粏鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ //})
// }
});
@@ -1036,7 +1213,7 @@
{
type: "Get",
url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": sInterID, "HBillType": HBillType },
dataType: "json",
success: function (data) {
@@ -1072,7 +1249,7 @@
{
type: "POST",
url: GetWEBURL() + "/MoveStockBill/set_SaveMoveStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "oMain": sMainStr },
dataType: "json",
success: function (data) {
@@ -1085,7 +1262,10 @@
//window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
parent.location.href = "../../../views/index.html"
}//鍏抽棴
- }, function () { window.location.reload(); });//鏂板
+ }, function () {
+ //window.location.reload();
+ location.replace('Kf_MoveStockBill_Fast.html?OperationType=1&HInterID=0');
+ });//鏂板
}
else {
layer.close(index);
@@ -1136,8 +1316,9 @@
var HFIFOWhID = $("#HFIFOWHID").val()
var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
$.ajax({
- url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": HStockOutOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1178,35 +1359,38 @@
//鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨嚭浠撳簱涓�
$("#HSCWHNAME").focus();
}
-
- $.ajax({
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- type: "GET",
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.Materlist;
- table.render(listOption);
- FIFOlistOption.data = result.data.FIFOlist;
- table.render(FIFOlistOption);
- //console.log(result.data.list2);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.Materlist.length; i++) {
- count += result.data.Materlist[i].HQty;
- count1 += result.data.Materlist[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //$.ajax({
+ // url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ // type: "GET",
+ // data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.Materlist;
+ // table.render(listOption);
+ // FIFOlistOption.data = result.data.FIFOlist;
+ // table.render(FIFOlistOption);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.Materlist.length; i++) {
+ // count += result.data.Materlist[i].HQty;
+ // count1 += result.data.Materlist[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
}
else {
playSound();
@@ -1275,41 +1459,44 @@
}
$.ajax(
{
- type: "Get",
+ type: "GET",
url: GetWEBURL() + "/ProductIn/Delete_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- $.ajax({
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- type: "GET",
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.Materlist;
- table.render(listOption);
- FIFOlistOption.data = result.data.FIFOlist;
- table.render(FIFOlistOption);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
- //console.log(result.data.list2);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.Materlist.length; i++) {
- count += result.data.Materlist[i].HQty;
- count1 += result.data.Materlist[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ // type: "GET",
+ // data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.Materlist;
+ // table.render(listOption);
+ // FIFOlistOption.data = result.data.FIFOlist;
+ // table.render(FIFOlistOption);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.Materlist.length; i++) {
+ // count += result.data.Materlist[i].HQty;
+ // count1 += result.data.Materlist[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
playSound1();
//娓呯┖鏁伴噺
$("#HQty").val("");
@@ -1344,8 +1531,9 @@
$('#HQty').val("");
}
$.ajax({
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": WhID, "HSPID": SPID, "HSCWHID": HSCWhID, "HSCSPID": HSCSPID, "HQty": sQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle },
success: function (result) {
if (result.count == 1) {
@@ -1488,34 +1676,38 @@
}
layer.load(3)
- $.ajax({
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- type: "GET",
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.Materlist;
- table.render(listOption);
- FIFOlistOption.data = result.data.FIFOlist;
- table.render(FIFOlistOption);
- //console.log(result.data.list2);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.Materlist.length; i++) {
- count += result.data.Materlist[i].HQty;
- count1 += result.data.Materlist[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //$.ajax({
+ // url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ // type: "GET",
+ // data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.Materlist;
+ // table.render(listOption);
+ // FIFOlistOption.data = result.data.FIFOlist;
+ // table.render(FIFOlistOption);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.Materlist.length; i++) {
+ // count += result.data.Materlist[i].HQty;
+ // count1 += result.data.Materlist[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
playSound1();
//娓呯┖鏁伴噺
$("#HQty").val("");
@@ -1528,6 +1720,49 @@
}
});
}
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HBillType = '1207'
+ var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+
+ //鍒锋柊鍒楄〃淇℃伅
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.Materlist;
+ table.render(listOption);
+ FIFOlistOption.data = result.data.FIFOlist;
+ table.render(FIFOlistOption);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.Materlist.length; i++) {
+ count += result.data.Materlist[i].HQty;
+ count1 += result.data.Materlist[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarcodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
+ });
}
//#endregion
@@ -1666,6 +1901,33 @@
}
});
+ //鎵弿鍏堣繘鍏堝嚭浠撳簱
+ $('#HFIFOWHNAME').on('keydown', function (event) {
+ var HBarCode = $('#HFIFOWHNAME').val()
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LookingFor/getWHName_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HFIFOWHID").val(result.data[0].HItemID);
+ $("#HFIFOWHNAME").val(result.data[0].HName);
+ element.tabChange('tab-MateOutBill', '1');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").focus();
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
//#region 鍒犻櫎鍔熻兘鎺т欢
form.on('submit(cmdDelete)', function () {//鍒犻櫎
var checkStatus = table.checkStatus('wl-table')
@@ -1685,40 +1947,43 @@
{
type: "Get",
url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//鏄剧ず琛ㄤ綋鏄庣粏
- $.ajax({
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- type: "GET",
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.Materlist;
- table.render(listOption);
- FIFOlistOption.data = result.data.FIFOlist;
- table.render(FIFOlistOption);
+ DisBillEntryList();
- //console.log(result.data.list2);
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.Materlist.length; i++) {
- count += result.data.Materlist[i].HQty;
- count1 += result.data.Materlist[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ ////鏄剧ず琛ㄤ綋鏄庣粏
+ //$.ajax({
+ // url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ // type: "GET",
+ // data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.Materlist;
+ // table.render(listOption);
+ // FIFOlistOption.data = result.data.FIFOlist;
+ // table.render(FIFOlistOption);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.Materlist.length; i++) {
+ // count += result.data.Materlist[i].HQty;
+ // count1 += result.data.Materlist[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
}
else {
layer.msg(data.Message, { icon: 2 });
@@ -1745,7 +2010,7 @@
elem: '#mx-table'
// , url: GetWEBURL() + '/MoveStockBill/GetHBarCodeShowBillSub'
//, toolbar: '#toolbarDemo'
- // , where: { sMsg: linterid, sMsg2: lentryid }
+ // , where: { sMsg: HInterID_Temp, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
@@ -1799,77 +2064,6 @@
});
- var listOption = {
- elem: '#wl-table'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , limit: 3000
- , totalRow: true
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, totalRow: true }
- , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
- , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
- , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
- , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }
- var FIFOlistOption = {
- elem: '#FIFOlist-table'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , limit: 3000
- , totalRow: true
- , cols: [[
- { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
- , { field: 'HWhName', title: '浠撳簱', width: 150 }
- , { field: 'HSPName', title: '浠撲綅', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }
- var listOption1 = {
- elem: '#mx-table'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }
//浠ヤ笂涓簂ayui妯″潡
@@ -1986,27 +2180,27 @@
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (bnt == 'Saver') {
- if (!typeof (sSubStr) == "undefined") {
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
- layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- }
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- // if (parseFloat(sSubStr[i].HQty) == 0) {
- // layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
- // return false;
- // }
- //}
- }
- }
- else {
- return true;
- }
+ //if (bnt == 'Saver') {
+ // if (!typeof (sSubStr) == "undefined") {
+ // for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+ // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // }
+ // }
+ // //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ // // if (parseFloat(sSubStr[i].HQty) == 0) {
+ // // layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+ // // return false;
+ // // }
+ // //}
+ // }
+ //}
+ //else {
+ // return true;
+ //}
}
</script>
--
Gitblit v1.9.1