From 736d67ac534c795fc9730f74e7989fc7715618d3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 30 六月 2022 10:09:53 +0800
Subject: [PATCH] 修改了调拨单、销售出库、生产入库缓存列表已上传查询功能
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 252 ++++++++++++++++------
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 2
WebTM/views/Baseset/基础资料/Gy_StockPlaceList.html | 5
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 2
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 101 +++++++-
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 88 ++++++--
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 35 ++
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 137 +++++++++--
8 files changed, 479 insertions(+), 143 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceList.html"
index ff278fe..bc824bf 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceList.html"
@@ -84,7 +84,10 @@
{ type: 'radio' }
, { field: 'HItemID', width: 150, title: '浠撲綅ID', hide: true }
, { field: 'HNumber', width: 150, title: '浠撲綅浠ｇ爜' }
- , { field: 'HName', width: 150, title: '浠撲綅鍚嶇О', sort: true }
+ , { field: 'HName', width: 150, title: '浠撲綅鍚嶇О', sort: true }
+ , { field: 'HWHID', width: 150, title: '浠撳簱ID' }
+ , { field: 'HWhNumber', width: 150, title: '浠撳簱浠ｇ爜', sort: true }
+ , { field: 'HWhName', width: 150, title: '浠撳簱鍚嶇О', sort: true }
]]
, page: true
});
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 83db064..42aab35 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"
@@ -160,7 +160,7 @@
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+ <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
</div>
</div>
</div>
@@ -188,7 +188,7 @@
<input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" style="display:none">...</button>
+ <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT">...</button>
</div>
</div>
</div>
@@ -382,10 +382,13 @@
$("#HBarCode").focus();
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HSCWHID").val(sessionStorage["HWHID"]);
- $("#HSCWHNAME").val(sessionStorage["HWHName"]);
- $("#HOutStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HOutStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HSCWHID").val(sessionStorage["HWHID"]);
+
+
+
+ // $("#HSCWHNAME").val(sessionStorage["HWHName"]);
+ //$("#HOutStockPlaceID").val(sessionStorage["HSPID"]);
+ //$("#HOutStockPlaceName").val(sessionStorage["HSPName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
$("#HDeptName").val(sessionStorage["HDept"]);
$("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
@@ -404,6 +407,8 @@
$("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
$("#HStockInOrgName").val(sessionStorage["Organization"]);
var HSourceFlag = sessionStorage["SourceFlag"];
+
+
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -558,8 +563,23 @@
});
//閫夋嫨璋冨叆浠撲綅
- form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+ //form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撲綅鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=HStockInOrgID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // }
+ // })
+ //});
+
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
layer.open({
type: 2
, area: ['100%', '100%']
@@ -567,9 +587,10 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=HStockInOrgID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
}
})
});
@@ -593,7 +614,23 @@
});
//閫夋嫨璋冨嚭浠撲綅
- form.on('submit(HOSpID-BT)', function () {//閫夋嫨璋冨嚭浠撲綅
+ //form.on('submit(HOSpID-BT)', function () {//閫夋嫨璋冨嚭浠撲綅
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撲綅鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=HStockOutOrgID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
+ form.on('submit(HOSpID-BT)', function () {//閫夋嫨浠撲綅
layer.open({
type: 2
, area: ['100%', '100%']
@@ -601,7 +638,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=HStockOutOrgID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -984,26 +1021,29 @@
var sBillNo = $("#HBillNo").val()
var sQty = $("#HQty").val()
var sHBillType = $("#HBillType").val()
- var SCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
- var HSPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
- var HWHID = $("#HWHID").val()//璋冨叆浠撳簱
- var SCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
- var HMaker = $("#HMaker").val();//鍒跺崟浜�
+ var HSCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
+ var HSCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
+ var SPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
+ var WhID = $("#HWHID").val()//璋冨叆浠撳簱
+ var sMaker = $("#HMaker").val();//鍒跺崟浜�
var HOrgID = $("#HOrgID").val();//缁勭粐
- var sBillType = '1207';
+ var HBillType = '1207';
var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
if (sSourceBillNo == null) {
sSourceBillNo = "";
}
+ var HScanStyle = "";
+ var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+ var HStockInOrgID = $("#HStockInOrgID").val()//璋冨叆缁勭粐
if (sQty == "") {
sQty = 0;
}
- if (HWHID == SCWhID)
- {
- layer.msg("璋冨叆浠撳簱璺熻皟鍑轰粨搴撲竴鑷达紝璇烽噸鏂伴�夋嫨璋冨叆浠撳簱鎴栬�呰皟鍑轰粨搴�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if (WhID == HSCWhID)
+ //{
+ // layer.msg("璋冨叆浠撳簱璺熻皟鍑轰粨搴撲竴鑷达紝璇烽噸鏂伴�夋嫨璋冨叆浠撳簱鎴栬�呰皟鍑轰粨搴�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
if (HDeleteFlag == "*") {
if (sBarCode != "") {
@@ -1091,7 +1131,7 @@
$.ajax({
url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "HWHID": HWHID, "HSPID": HSPID, "SCWhID": SCWhID, "SCSPID": SCSPID, "HMaker": HMaker, "HOrgID": HOrgID, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
success: function (result) {
if (result.count == 1) {
element.tabChange('tab-MoveStockBill', '3');
@@ -1273,6 +1313,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
function GetHSCWHNAMEValue(obj) //杩斿洖璋冨嚭浠撳簱
{
@@ -1282,6 +1324,8 @@
function GetHOutStockPlaceIDValue(obj) { //杩斿洖璋冨嚭浠撲綅
$("#HOutStockPlaceName").val(obj[0].HName);
$("#HOutStockPlaceID").val(obj[0].HItemID);
+ $("#HSCWHNAME").val(obj[0].HWhName);
+ $("#HSCWHID").val(obj[0].HWHID);
}
function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
$("#HSupName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 062d4f8..a433576 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -227,10 +227,10 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HWHID").val(sessionStorage["HWHID"]);
- $("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HWHID").val(sessionStorage["HWHID"]);
+ //$("#HWHNAME").val(sessionStorage["HWHName"]);
+ //$("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ //$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
@@ -357,6 +357,7 @@
$("#HStockPlaceName").val(result.data[0].HName);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
element.tabChange('tab-POStockInBill', '2');
}
else {
@@ -700,6 +701,10 @@
layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
return false;
}
+ if (sQty == "") {
+ sQty = 0;
+ }
+ var sBillType = '1206'
if (sBarCode != "") {
$('#HBarCode').val("");
}
@@ -710,7 +715,7 @@
$.ajax({
url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"]},
success: function (result) {
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
@@ -780,30 +785,58 @@
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
layer.load(3)
- table.render({
- elem: '#wl-table'
- //, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
- ,url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
- , toolbar: '#toolbarDemo'
- //, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+ // ,url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
+ // , toolbar: '#toolbarDemo'
+ // //, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+ // ,data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
+ // , cellMinWidth: 90
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { 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 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- , { 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 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
@@ -818,6 +851,52 @@
}
});
}
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { 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 }
+ , { field: 'HPieceQty', 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 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
function playSound() {
var audio = document.getElementById("cs");
if (audio == null)
@@ -893,6 +972,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
$("#HSupName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 6b3bba9..ec698ca 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -66,8 +66,22 @@
</div>
<div class="layui-col-xs8">
<select name=" HBillType" id="HBillType">
- <option value="1401">閿�鍞鍗�</option>
<option value="1402">鍙戣揣閫氱煡鍗�</option>
+ <option value="1401">閿�鍞鍗�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵弿绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs8">
+ <select name=" HScanStyle" id="HScanStyle">
+ <option value="鏁存墭鎵爜">鏁存墭鎵爜</option>
+ <option value="鍗曚釜鎷嗙爜">鍗曚釜鎷嗙爜</option>
+ <option value="鍙嶅悜鎷嗙爜">鍙嶅悜鎷嗙爜</option>
</select>
</div>
</div>
@@ -112,7 +126,7 @@
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
</div>
</div>
</div>
@@ -333,10 +347,10 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HWHID").val(sessionStorage["HWHID"]);
- $("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HWHID").val(sessionStorage["HWHID"]);
+ //$("#HWHNAME").val(sessionStorage["HWHName"]);
+ //$("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ //$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
@@ -903,6 +917,7 @@
// if (value != '') {
if (!/^\d+$/.test(value)) {
return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+
}
//}
}
@@ -1117,6 +1132,8 @@
var sHBillType = $("#HBillType").val() //婧愬崟绫诲瀷-鍙戣揣閫氱煡鍗曪細1402锛岄攢鍞鍗�1401
var sBillType = '1205'
+ var HScanStyle = $("#HScanStyle").val();
+
if (HDeleteFlag == "*") {
if (sBarCode != "") {
$('#HBarCode').val("");
@@ -1163,7 +1180,7 @@
$.ajax({
url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle},
success: function (result) {
playSound1();
if (result.count == 1) {
@@ -1327,7 +1344,7 @@
data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- GetSellOutFindSP();
+ //GetSellOutFindSP();
$("#HSupID").val(result.data[0].HSupID);
$("#HSupName").val(result.data[0].HSupName);
//$("#HDeptID").val(result.data[0].HDeptID);
@@ -1383,6 +1400,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
function GetHSupValue(obj) { //杩斿洖瀹㈡埛
$("#HSupName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 63071e1..d703082 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -1477,6 +1477,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
function GetHKeeperValue(obj) { //杩斿洖淇濈
$("#HKeeper").val(obj[0].HName);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
index 124bd76..e6699b8 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
@@ -233,6 +233,27 @@
layer.closeAll("loading");
}
}
+
+ table.render({
+ elem: '#sy-table'
+ , toolbar: '#toolbarDemo'
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ })
+
+
// url: GetWEBURL() + '/Web/chanpinruk',
form.on('submit(cmdRefresh)', function () {//鍒锋柊
table.render({
@@ -375,26 +396,70 @@
//鏌ヨ
form.on('submit(cmdQuery)', function () {
var HBillNo = $("#HBillNo").val();
- var HSourceBillNo = $("#HSourceBillNo").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();;
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_Mould/list1',
- type: "GET",
- data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //$.ajax({
+ // url: GetWEBURL() + '/ProductInBillList/list1',
+ // type: "GET",
+ // data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // //option.data = data1.data;
+ // //table.render(option);
+ // table.render({
+ // elem: '#sy-table'
+ // , toolbar: '#toolbarDemo'
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ // , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ // , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ // , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ // , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ // ]]
+ // , height: 500
+ // })
+ // //layer.close(index);
+ // } else {
+ // layer.close(index);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(index);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+
+
+ table.render({
+ elem: '#sy-table'
+ , url: GetWEBURL() + '/ProductInBillList/list1'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 100 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
}
- });
+ })
});
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 0ca01fc..ba335e3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -36,6 +36,7 @@
</div>
<div class="layui-col-xs8">
<select name=" HBillType" id="HBillType">
+ <option value="1241">鍏ュ簱鐢宠鍗�</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -243,10 +244,10 @@
, element = layui.element;
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HWHID").val(sessionStorage["HWHID"]);
- $("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HWHID").val(sessionStorage["HWHID"]);
+ //$("#HWHNAME").val(sessionStorage["HWHName"]);
+ //$("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ //$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
@@ -362,10 +363,10 @@
//
function Sub_ClearBill() {
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HWHID").val(sessionStorage["HWHID"]);
- $("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ //$("#HWHID").val(sessionStorage["HWHID"]);
+ //$("#HWHNAME").val(sessionStorage["HWHName"]);
+ //$("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ //$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
@@ -894,6 +895,9 @@
var sHSPID = $("#HStockPlaceID").val()
var sSourceBillNo = $("#HSourceBillNo").val()
var HOrgID = $("#HOrgID").val();//缁勭粐
+ var sMouldManagerCtl = 'N'
+ var sFIFOCtl = 'N'
+ var HBillType = '1203'
//鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
if (sBarCode == '') {
playSound();
@@ -902,7 +906,7 @@
}
if (sBarCode != "") {
$('#HBarCode').val("");
- sessionStorage["SourceFlag"] = false;
+ //sessionStorage["SourceFlag"] = false;
}
//if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
$.ajax({
@@ -941,8 +945,8 @@
$("#HSourceBillNo").val(result.data.HSourceBillNo);
sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1203") {
- $("#HBillType").val("1203");
+ if (result.data.HSourceBillType == "1241") {
+ $("#HBillType").val("1241");
}
else {
@@ -963,8 +967,8 @@
//$("#HSourceBillNo").val(result.data.HSourceBillNo);
sessionStorage["SourceFlag"] = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1203") {
- $("#HBillType").val("1203");
+ if (result.data.HSourceBillType == "1241") {
+ $("#HBillType").val("1241");
}
else if (result.data.HSourceBillType == "1601") {
@@ -979,28 +983,56 @@
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
layer.load(3)
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- , { 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 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
- , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
- ]]
- , height: 500
- , done: function () {
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+ // , cellMinWidth: 90
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { 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 }
+ // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 150 }
+ // , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
@@ -1015,21 +1047,71 @@
});
}
function playSound() {
- var audio = document.getElementById("cs");
- if (audio == null)
- $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
- var audio = document.getElementById("cs");
- audio.play();
+ //var audio = document.getElementById("cs");
+ //if (audio == null)
+ // $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+ //var audio = document.getElementById("cs");
+ //audio.play();
}
function playSound1() {
- var audio = document.getElementById("cs2");
- audio.play();
+ //var audio = document.getElementById("cs2");
+ //audio.play();
}
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { 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 }
+ , { field: 'HPieceQty', 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 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
//鎵簮鍗�
function GetMeesageBySourceBillNo(obj) {
- var HSourceBillNo = $('#HSourceBillNo').val()
+ var sSourceBillNo = $('#HSourceBillNo').val()
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
+ var HBillType = '1203'
+ var sSourceType = $("#HBillType").val()
+ var sMouldManagerCtl = 'N'
+ var sFIFOCtl = 'N'
if (HSourceBillNo == "" || sInterID <= 0) {
layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1039,32 +1121,68 @@
//url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
url: GetWEBURL() + "/OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
type: "GET",
- data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": HBillType, "sSourceBillNo": sSourceBillNo, "sSourceType": sSourceType, "sMaker": sessionStorage["HUserName"],"sHOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //$("#HDeptID").val(result.data[0].hDeptIDField);
+ //$("#HDeptName").val(result.data[0].hDeptNameField);
+ //$("#HWHID").val(result.data[0].HWHID);
+ //$("#HWHName").val(result.data[0].HWHName);
+ element.tabChange('tab-Kf_OtherInBill', '2');
+ playSound1();
+ HSourceFlag = true;
+ sessionStorage["SourceFlag"] = true;
layer.load(3)
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
- , { 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 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+ // , { 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 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
@@ -1089,6 +1207,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
//function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
// $("#HSupName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 5ccbaa9..dcb86b8 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -1203,6 +1203,8 @@
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHNAME").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
}
function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
$("#HSupName").val(obj[0].HName);
--
Gitblit v1.9.1