From 13b220e61faca26d6723c39bea1bf72982d3e5fc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 30 五月 2022 16:02:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 107 ++++++
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 1
WebTM/views/公共页面/Kf_BarCodeEditDlg.html | 333 ++++++++++++-------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 3
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Check_New.html | 193 +++++++++--
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 61 +++
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 43 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 7
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 15
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 80 ++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_CheckList_New.html | 6
WebTM/views/领料发货/领料出库/Kf_MateOutBill_CheckList_New.html | 2
WebTM/views/home/console_Mobile.html | 12
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 94 ++++-
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 7
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 4
WebTM/views/index.html | 1
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 9
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Check_New.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
20 files changed, 724 insertions(+), 257 deletions(-)
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index fbe63d6..82f1454 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -136,6 +136,18 @@
<cite>棰嗘枡鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Check_New.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐩存帴璋冩嫧鍗曟牎楠�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_CheckList_New.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐩存帴璋冩嫧鍗曟牎楠岀紦瀛樺垪琛�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 67261aa..655b643 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -334,6 +334,7 @@
<a>鎶ュ伐绠＄悊</a>
<dl class="layui-nav-child">
<dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
+ <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
<dd><a lay-href="">鎶ユ鐢宠n</a></dd>
</dl>
</dd>
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_CheckList_New.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_CheckList_New.html"
index b512c21..f051d8b 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_CheckList_New.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_CheckList_New.html"
@@ -73,7 +73,7 @@
//璇诲彇鍗曟嵁鍒楄〃
//
- form.on('submit(Cancel)', function () {
+ form.on('submit(cmdCancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
@@ -91,7 +91,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+ , content: ['../../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
, resize: false
, cancel: function () {
$(".layui-btn").removeClass("layui-btn-disabled");
@@ -185,7 +185,7 @@
- var sBillType = '1204'
+ var sBillType = '1207'
table.render({
elem: '#dj-table'
, url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
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_Check_New.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_Check_New.html"
index 21a063a..1ef4db3 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_Check_New.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_Check_New.html"
@@ -89,7 +89,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>
@@ -117,7 +117,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>
@@ -149,9 +149,10 @@
</div>
</div>
</div>
- <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+
</div>
<div class="layui-tab-item">
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
</div>
<div class="layui-tab-item">
@@ -229,14 +230,30 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//console.log(JSON.stringify(result.data.hItemIDField))
//return;
+ //$("#HStockPlaceName").val(result.data.hSPNameField);
+ //$("#HWHID").val(result.data.hWhIDField);
+ //$("#HWHNAME").val(result.data.hWhNameField);
+ // $("#HStockPlaceName").val(result.data.hSPNameField);
+ //$("#HWHID").val(result.data.hWhIDField);
+ //$("#HWHNAME").val(result.data.hWhNameField);
+ //$('#HInterID').val(result.data.hInterIDField)
+ //$('#HBillNo').val(result.data.hBillNoField)
+
+
$("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceName").val(result.data.hSCSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HOutStockPlaceID").val(result.data.hSCSPIDField);
$("#HWHID").val(result.data.hWhIDField);
$("#HWHNAME").val(result.data.hWhNameField);
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HWHID").val(result.data.hWhIDField);
- $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHNAME").val(result.data.hSCWhNameField);
$('#HInterID').val(result.data.hInterIDField)
$('#HBillNo').val(result.data.hBillNoField)
+ $('#HStockOutOrgName').val(result.data.hStockOutOrgNameField)
+ $('#HStockOutOrgID').val(result.data.hStockOutOrgIDField)
+ $('#HStockInOrgName').val(result.data.hStockInOrgNameField)
+ $('#HStockInOrgID').val(result.data.hStockInOrgIDField)
var HBillID = $('#HInterID').val()
element.tabChange('tab-Kf_OtherInBill', '2');
table.render({
@@ -342,6 +359,7 @@
pFocus.select();
}
+
//
function Sub_ClearBill() {
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -394,7 +412,9 @@
}
//
- form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ //閫夋嫨璋冨叆浠撳簱
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨璋冨叆浠撳簱
+ var HStockInOrgID = $("#HStockInOrgID").val();
layer.open({
type: 2
, area: ['100%', '100%']
@@ -402,14 +422,50 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
}
})
});
- form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+
+
+ //閫夋嫨璋冨叆缁勭粐
+ form.on('submit(HStockInOrgID-BT)', function () {//閫夋嫨璋冨叆缁勭粐
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁勭粐鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_OrganizationtList.html?Type=HStockInOrgID', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //閫夋嫨璋冨嚭缁勭粐
+ form.on('submit(HStockOutOrgID-BT)', function () {//閫夋嫨璋冨嚭缁勭粐
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁勭粐鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_OrganizationtList.html?Type=HStockOutOrgID', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //閫夋嫨璋冨叆浠撲綅
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+
layer.open({
type: 2
, area: ['100%', '100%']
@@ -417,13 +473,48 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=HStockInOrgID', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //閫夋嫨璋冨嚭浠撳簱
+ form.on('submit(HSCWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+ var HStockOutOrgID = $("#HStockOutOrgID").val();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HSCWHID&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%']
+ , 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(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
// layer.open({
// type: 2
@@ -634,7 +725,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
+ url: GetWEBURL() + "/MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json",
async: true,
data: { "oMain": sMain },
dataType: "json",
@@ -697,12 +788,19 @@
//console.log(JSON.stringify(result.data.hItemIDField))
//return;
$("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceName").val(result.data.hSCSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HOutStockPlaceID").val(result.data.hSCSPIDField);
$("#HWHID").val(result.data.hWhIDField);
$("#HWHNAME").val(result.data.hWhNameField);
$("#HSCWHID").val(result.data.hSCWhIDField);
$("#HSCWHNAME").val(result.data.hSCWhNameField);
$('#HInterID').val(result.data.hInterIDField)
$('#HBillNo').val(result.data.hBillNoField)
+ $('#HStockOutOrgName').val(result.data.hStockOutOrgNameField)
+ $('#HStockOutOrgID').val(result.data.hStockOutOrgIDField)
+ $('#HStockInOrgName').val(result.data.hStockInOrgNameField)
+ $('#HStockInOrgID').val(result.data.hStockInOrgIDField)
var HBillID = $('#HInterID').val()
element.tabChange('tab-Kf_OtherInBill', '2');
table.render({
@@ -793,7 +891,7 @@
var sHWHID = $("#HWHID").val()
var sHSPID = $("#HStockPlaceID").val()
var sHSCWHID = $("#HSCWHID").val()
- var sHSCSPID = $("#HSCStockPlaceID").val()
+ var sHSCSPID = $("#HOutStockPlaceID").val()
var HOrgID = $("#HOrgID").val();//缁勭粐
//鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
if (sBarCode == '') {
@@ -809,7 +907,7 @@
}
$.ajax({
//url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+ url: GetWEBURL() + "/MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1",
type: "GET",
data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "SCWhID": sHSCWHID, "SCSPID": sHSCSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
@@ -934,15 +1032,36 @@
}
});
//浠ヤ笂涓� Layui妯″潡
- function GetHWHValue(obj) //杩斿洖浠撳簱
+ function GetHWHValue(obj) //杩斿洖璋冨叆浠撳簱
{
$("#HWHNAME").val(obj[0].HName);
//sessionStorage["HWHID"] = obj[0].HItemID;
$("#HWHID").val(obj[0].HItemID);
}
+ function GetHOrgNameValue(obj) //杩斿洖璋冨叆缁勭粐
+ {
+ $("#HStockInOrgName").val(obj[0].HName);
+ $("#HStockInOrgID").val(obj[0].HItemID);
+
+ }
+ function GetHOutOrgNameValue(obj) //杩斿洖璋冨嚭缁勭粐
+ {
+ $("#HStockOutOrgName").val(obj[0].HName);
+ $("#HStockOutOrgID").val(obj[0].HItemID);
+
+ }
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
$("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ function GetHSCWHNAMEValue(obj) //杩斿洖璋冨嚭浠撳簱
+ {
+ $("#HSCWHNAME").val(obj[0].HName);
+ $("#HSCWHID").val(obj[0].HItemID);
+ }
+ function GetHOutStockPlaceIDValue(obj) { //杩斿洖璋冨嚭浠撲綅
+ $("#HOutStockPlaceName").val(obj[0].HName);
+ $("#HOutStockPlaceID").val(obj[0].HItemID);
}
//function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
// $("#HSupName").val(obj[0].HName);
@@ -998,28 +1117,28 @@
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
return false;
}
- if (sSubStr != '') {
- 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 });
- return false;
- }
- }
- }
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
- return false;
- }
- }
- else {
- return true;
- }
+ //if (sSubStr != '') {
+ // 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 });
+ // return false;
+ // }
+ // }
+ // }
+ // for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ // if (parseFloat(sSubStr[i].HQty) > 0) {
+ // s = 1;
+ // }
+ // }
+ // if (s == 0) {
+ // layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+ // return false;
+ // }
+ //}
+ //else {
+ // return true;
+ //}
}
</script>
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
index 96c0366..d2987aa 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
@@ -54,7 +54,7 @@
<input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input">
</div>
-
+
</div>
<div class="layui-form-item">
<label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
@@ -87,70 +87,128 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script>
- function getUrlVars() {
- 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 = getUrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var HInterID = params[params[0]];//鍗曟嵁ID
- var HMaterID = params[params[1]];//鐗╂枡ID
- var HAuxPropID = params[params[2]];//杈呭姪灞炴��
- var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
- var HWhID = params[params[4]];//浠撳簱ID
- var HSPID = params[params[5]];//浠撲綅ID
- var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
- var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
- var HBatchNo = params[params[8]];//鎵规
- var HSourceInterID = params[params[9]];//婧愬崟涓籌D
- var HSourceEntryID = params[params[10]];//婧愬崟瀛怚D
- var HBillType = params[params[11]];//鍗曟嵁绫诲瀷
- var HBarCode = params[params[12]];//鏉＄爜
- }
+
+
+ //layui.config({
+ // base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ //}).extend({
+ // index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ //}).use(['index', 'form', 'table'], function () {
+ // var $ = layui.$
+ // , admin = layui.admin
+ // , layer = layui.layer
+ // , table = layui.table
+ // , form = layui.form;
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form;
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
- table.render({
- elem: '#mx-table'
- //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
- ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
- , where: {
- "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
- , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType,sWhere: ''
- },
- cols: [[
- { type: 'radio' }
- , { field: 'HSonNo', title: '搴忓彿', width: 100 }
- , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
- ]]
- // , data: [linterid]
- });
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var HMTONo = ''
+ var HSourceInterID = 0
+ var HSourceEntryID = 0
+ var HQty = 0
+ var HAuxPropID = 0
+ var HBatchNo = ''
+
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var HInterID = params[params[0]];//鍗曟嵁ID
+ var HMaterID = params[params[1]];//鐗╂枡ID
+ //var HAuxPropID = params[params[2]];//杈呭姪灞炴��
+ //var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
+ //var HWhID = params[params[4]];//浠撳簱ID
+ //var HSPID = params[params[5]];//浠撲綅ID
+ //var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
+ //var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
+ //var HBatchNo = params[params[8]];//鎵规
+ //var HSourceInterID = params[params[2]];//婧愬崟涓籌D
+ //var HSourceEntryID = params[params[3]];//婧愬崟瀛怚D
+ //var HBillType = params[params[6]];//鍗曟嵁绫诲瀷
+ //var HQty = params[params[6]];//鏉＄爜
+ var sBillType = params[params[2]];//鍗曟嵁绫诲瀷
+
+
+ //var HBillType = ''
+
+ //var sBillType = '';//鍗曟嵁绫诲瀷
+
+ var sWhere = " and HInterID=" + HInterID + " and HMaterID=" + HMaterID + "";
+ $.ajax({
+ url: GetWEBURL() + "/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json",
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (d) {
+ HMTONo = d.data[0].HMTONo
+ HSourceInterID = d.data[0].HSourceInterID
+ HSourceEntryID = d.data[0].HSourceEntryID
+ HBatchNo = d.data[0].HBatchNo
+ //HSourceInterID = 11
+ //HSourceEntryID = 11
+ HQty = d.data[0].HQty
+ HAuxPropID = d.data[0].HAuxPropID
+ //sBillType = d.data[0].HBillType
+ tableRender();
+ }
+ })
+
+
+ }
+ function tableRender() {
+ table.render({
+ elem: '#mx-table'
+ //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
+ , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
+ , where: {
+ "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": 0, "HSPID": 0, "HSCWhID": 0
+ , "HSCSPID": 0, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "sBillType": sBillType, sWhere: ''
+ },
+ cols: [[
+ { type: 'radio' }
+ , { field: 'HSonNo', title: '搴忓彿', width: 100 }
+ , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
+ ]]
+ // , data: [linterid]
+ });
+ }
+
+
+
+ form.on('submit(cmdCancel)', function () {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ })
+ //function Pub_Close(closeType) {
+ // if (closeType == 1) {
+ // //鍏抽棴寮圭獥
+ // var index = parent.layer.getFrameIndex(window.name);
+ // parent.layer.close(index);
+ // } else if (closeType == 2) {
+ // //鍏抽棴椤电
+ // parent.layui.admin.events.closeThisTabs();
+ // }
+ //}
//#region 鍒犻櫎
@@ -164,7 +222,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
+ data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": sBillType },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -191,74 +249,101 @@
})
- //缂栬緫
- //form.on('submit(cmdChange)', function () {//缂栬緫
- // var checkStatus = table.checkStatus('mx-table')
- // , data = checkStatus.data;
- // var sQty = data[0].HQty.toString();
- // var iQty = $('#HQty').val()
- // $.ajax(
- // {
- // type: "Get",
- // //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
- // async: true,
- // data: {
- // "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
- // , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
- // , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
- // , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
- // },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- // table.render({
- // elem: '#mx-table'
- // //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
- // , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
- // , where: {
- // "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
- // , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
- // },
- // cols: [[
- // { type: 'radio' }
- // , { field: 'HSonNo', title: '搴忓彿', width: 100 }
- // , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
- // , { field: 'HQty', title: '鏁伴噺', width: 100 }
- // , { field: 'HBatchNo', title: '鎵规', width: 150 }
- // , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
- // ]]
- // // , data: [linterid]
- // });
- // alert("缂栬緫鎴愬姛锛�");
- // }
- // else {
- // layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // });
+ //璋冩暣
+ form.on('submit(cmdChange)', function () {//缂栬緫
+ var checkStatus = table.checkStatus('mx-table')
+ , data = checkStatus.data;
+ var sQty = data[0].HQty.toString();
+ var iQty = $('#HQty').val();
+ var HBarCode = data[0].HBarCode.toString();
+ var sWhID = data[0].HWHID;
+ var sSPID = data[0].HStockPlaceID;
+ var sBatchNo = data[0].HBatchNo;
+ var HMTONo = data[0].HMTONo;
+ //if (iQty > sQty)
+ //{
+ var EndQty = iQty - sQty;
+ //}
- // layer.open({
- // type: 2
- // , area: ['100%', '100%']
- // , title: '鏄庣粏鍒楄〃'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
- // , 'yes']
- // , resize: false
- // , cancel: function () {
- // //$(".layui-btn").removeClass("layui-btn-disabled");
- // }
- // })
- // } else {
- // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- // }
+ $.ajax(
+ {
+ type: "Get",
+ //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
+ async: true,
+ data: {
+ "HInterID": HInterID, "HBillType": sBillType, "sBatchNo": sBatchNo, "sBarCode": HBarCode, "sSCWhID": 0
+ , "sSCSPID": 0, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
+ , "HMaterID": HMaterID, "sWhID": sWhID, "sSPID": sSPID, "HSourceInterID": HSourceInterID
+ , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
+ },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ table.render({
+ elem: '#mx-table'
+ //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
+ , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
+ , where: {
+ "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": sWhID, "HSPID": sSPID, "HSCWHID": 0
+ , "HSCSPID": 0, "HBatchNo": sBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "sBillType": sBillType, sWhere: ''
+
+ },
+ cols: [[
+ { type: 'radio' }
+ , { field: 'HSonNo', title: '搴忓彿', width: 100 }
+ , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
+ ]]
+ // , data: [linterid]
+ });
+ alert("缂栬緫鎴愬姛锛�");
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '鏄庣粏鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
+ // , 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //} else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ //}
})
+ function getUrlVars() {
+ var vars = [], hash;
+ //var hashes = decodeURIComponent(window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'));
+ //var hashes1 = decodeURIComponent(window.location.href);
+ //var hashes = hashes1.indexOf('?') + 1.split('&');
+
+ var hashes = window.location.href.slice(decodeURIComponent(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;
+ }
+ })
</script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 60a2555..f60cf07 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -412,11 +412,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": "and HInterID = " + linterid },
+ data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"]},
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
- $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
$("#HProcExchInterID").val(data.HProcExchInterID);
$("#HProcExchEntryID").val(data.HProcExchEntryID);
$("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index cb436f4..17b6fd7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -784,7 +784,8 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
var tableData = data.field;
- var oMain = data.field + ";" + sessionStorage["HUserName"];
+ //var oMain = data.field + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index d60df77..581dd68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -91,7 +91,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 25de2c4..e30b47d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1233,8 +1233,13 @@
HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ var flag = "xz";
+ if (OperationType == 3) {
+ flag = "xg";
+ }
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag;
var index = layer.load();
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 935b1b3..3d9d3fd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -481,13 +481,16 @@
layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var oMain = data.field + ";" + sessionStorage["HUserName"];
+ //console.log(data.field);
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ //var oMain = data.field;
+ var HUserName = sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
url: GetWEBURL() + "/Cj_StationInBill/AddBill",
async: true,
- data: { "oMain": oMain },
+ data: { "oMain": oMain},
dataType: "json",
success: function (result) {
if (result.count == 1) {
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 330bda4..062d4f8 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"
@@ -693,7 +693,8 @@
var sHWHID = $("#HWHID").val()
var sHSPID = $("#HStockPlaceID").val()
var sSourceBillNo = $("#HSourceBillNo").val()
-
+ var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
+ var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
@@ -781,9 +782,11 @@
layer.load(3)
table.render({
elem: '#wl-table'
- , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+ //, url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+ ,url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
, toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+ //, where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
, cellMinWidth: 90
, cols: [[
{ type: 'radio' }
@@ -827,6 +830,8 @@
var HSourceBillNo = $('#HSourceBillNo').val()
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").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;
@@ -843,9 +848,9 @@
table.render({
elem: '#wl-table'
// , url: 'http://61.130.49.162:9090/WMSAPI///OtherOutBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1'
, toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+ , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
, cols: [[
{ type: 'radio' }
, { field: 'HQty', title: '鏁伴噺', width: 150 }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index e5ccf7b..06a626e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -741,10 +741,7 @@
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
- var sQty = $("#HQty").val();
- if (sQty == "") {
- sQty = 0;
- }
+
if (event.keyCode == 13) {
GetMeesageByBarCode();
}
@@ -834,6 +831,10 @@
var Flag = sessionStorage["SourceFlag"];
var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
+ var sQty = $("#HQty").val();
+ if (sQty == "") {
+ sQty = 0;
+ }
if (sBarCode == '') {
playSound();
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 04ba901..6b3bba9 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"
@@ -686,23 +686,47 @@
})
//缂栬緫
+ //form.on('submit(cmdModify)', function () {//缂栬緫
+ // var checkStatus = table.checkStatus('wl-table')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var HInterID = data[0].HInterID.toString();
+ // var HMaterID = data[0].HMaterID.toString();
+ // var HAuxPropID = data[0].HAuxPropID.toString();
+ // var HMTONo = data[0].HMTONo.toString();
+ // var HWhID = data[0].HWhID.toString();
+ // var HSPID = data[0].HSPID.toString();
+ // var HSCWHID = data[0].HSCWHID.toString();
+ // var HSCSPID = data[0].HSCSPID.toString();
+ // var HBatchNo = data[0].HBatchNo.toString();
+ // var HSourceInterID = data[0].HSourceInterID.toString();
+ // var HSourceEntryID = data[0].HSourceEntryID.toString();
+ // var HBillType = '1205';
+ // var HBarCode = data[0].HBarCode.toString();
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '鏄庣粏鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
+ // , 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ // } else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ // }
+ //})
+
form.on('submit(cmdModify)', function () {//缂栬緫
+ //var sSubStr = table.cache['wl-table'];
var checkStatus = table.checkStatus('wl-table')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].HInterID.toString();
- var HMaterID = data[0].HMaterID.toString();
- var HAuxPropID = data[0].HAuxPropID.toString();
- var HMTONo = data[0].HMTONo.toString();
- var HWhID = data[0].HWhID.toString();
- var HSPID = data[0].HSPID.toString();
- var HSCWHID = data[0].HSCWHID.toString();
- var HSCSPID = data[0].HSCSPID.toString();
- var HBatchNo = data[0].HBatchNo.toString();
- var HSourceInterID = data[0].HSourceInterID.toString();
- var HSourceEntryID = data[0].HSourceEntryID.toString();
- var HBillType = '1205';
- var HBarCode = data[0].HBarCode.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
@@ -710,17 +734,46 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
- , 'yes']
+ , 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 () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ }
})
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- })
+ // }
+ });
//鍒犻櫎
form.on('submit(cmdDelete)', function () {//鍒犻櫎
@@ -1218,6 +1271,7 @@
}
$("#HSumQtys").val(count);
$("#HBarCodeQtys").val(count1);
+ playSound1();
}
else {
// $("#verifycode").click();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html"
index b512c21..68fd39a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_CheckList_New.html"
@@ -73,7 +73,7 @@
//璇诲彇鍗曟嵁鍒楄〃
//
- form.on('submit(Cancel)', function () {
+ form.on('submit(cmdCancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html"
index a48154d..c9bd693 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Check_New.html"
@@ -180,6 +180,7 @@
$("#HWHNAME").val(result.data.hWhNameField);
$('#HInterID').val(result.data.hInterIDField)
$('#HBillNo').val(result.data.hBillNoField)
+
var HBillID = $('#HInterID').val()
element.tabChange('tab-Kf_OtherInBill', '2');
table.render({
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index d3ae225..adc8619 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -1137,23 +1137,26 @@
elem: '#wl-table'
, toolbar: '#toolbarDemo'
, cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { 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 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , page: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { 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 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
}
function playSound() {
var audio = document.getElementById("cs");
@@ -1175,6 +1178,8 @@
if (HPPQty == "") {
HPPQty = 0;
}
+ var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
+ var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
$.ajax({
url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
type: "GET",
@@ -1187,26 +1192,27 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();
layer.load(3)
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
- ]]
- , height: 500
- , done: function () {
+ $.ajax({
+ url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1204', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ $("#HBarCode_B").val(result.data.list2[0].HBarCode);
+ $("#HMaterName_B").val(result.data.list2[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.list2[0].HUnitName);
+ $("#HQty_B").val(result.data.list2[0].HQty);
+ $("#HTMQty_B").val(result.data.list2[0].HTMQty);
+ $("#HWHName_B").val(result.data.list2[0].HWHName);
+ $("#HSPName_B").val(result.data.list2[0].HSPName);
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
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 4bfdfd3..63071e1 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"
@@ -127,7 +127,7 @@
<input type="hidden" name="HStockPlaceID" id="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>
@@ -686,8 +686,29 @@
});
//缂栬緫
+ //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");
+ // }
+ // })
+ // // }
+ //});
+
form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
+ //var sSubStr = table.cache['wl-table'];
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -696,10 +717,42 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , 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 () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: []
+ , where: { HBillID: sInterID, HBillType: '1202', 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 }
+ , { field: 'HBarcodeQtys', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
}
})
// }
@@ -1204,7 +1257,7 @@
}
if (result.data.hSourceBillTypeField == "3710") {
$("#HBillType").empty();
- $("#HBillType").val("3711");
+ $("#HBillType").val("3710");
var optionHtml = '';
optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇璁㈠崟' + "</option>";
$("#HBillType").append(optionHtml);
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 eee824c..124bd76 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"
@@ -44,15 +44,27 @@
<div class="layui-tab-item layui-show">
<div class="layui-row">
<div class="layui-col-xs12">
- <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
- </div>
- </div>
+ <div class="layui-form layui-border-box layui-table-view" lay-filter=" dj-table" lay-id="dj-table" style=" height:500px;margin-bottom:20px;">
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
</div>
<div class="layui-tab-item">
<div class="layui-row">
<div class="layui-col-xs12">
- <table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
- </div>
+ <div class="layui-form layui-border-box layui-table-view" lay-filter=" yd-table" lay-id="yd-table" style=" height:500px;margin-bottom:20px;">
+ <table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+
+ </div>
</div>
</div>
<div class="layui-tab-item">
@@ -68,19 +80,24 @@
<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
</div>
</div>
- <div class="layui-col-xs2">
+ <!--<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
- </div>
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs12">
- <table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
+ <div class="layui-form layui-border-box layui-table-view" lay-filter=" sy-table" lay-id="sy-table" style=" height:500px;margin-bottom:20px;">
+ <table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
</div>
</div>
</div>
</div>
<div class="layui-form-item" style="margin-bottom: 20px;">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <!--<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
</div>
<div class="layui-col-xs2">
@@ -94,10 +111,10 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
- </div>
- <div class="layui-col-xs2">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>-->
- </div>
+ </div>-->
+ <!--<div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>
+ </div>-->
</div>
</div>
</div>
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 ac4557a..0ca01fc 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"
@@ -210,6 +210,9 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
</div>
<div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
</div>
<div class="layui-col-xs3">
@@ -424,6 +427,33 @@
}
//
+
+ form.on('submit(cmdRefresh)', function () {
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ , 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 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+ });
+
form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
type: 2
@@ -571,8 +601,52 @@
//window.close();//鍏抽棴褰撳墠椤�
})
+ //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");
+ // }
+ // })
+ // // }
+ //});
+
+
+ //form.on('submit(cmdModify)', function () {//缂栬緫
+ // //var sSubStr = table.cache['wl-table'];
+ // var checkStatus = table.checkStatus('wl-table')
+ // , data = checkStatus.data;
+ // //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?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '& HAuxPropID = ' + data[0].HAuxPropID + '& HMTONo = ' + data[0].HMTONo + '& HSourceInterID = ' + data[0].HSourceInterID + '& HSourceEntryID = ' + data[0].HSourceEntryID + '& HQty = ' + data[0].HQtyMust + '& HBillType = ' + data[0].HBillType + '', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ // // }
+ //});
+
+
form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
+ //var sSubStr = table.cache['wl-table'];
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -581,10 +655,37 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , 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 () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ var sInterID = $("#HInterID").val()
+ table.render({
+ elem: '#wl-table'
+ , 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 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
}
})
// }
@@ -895,6 +996,8 @@
, { 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 () {
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 d77bc81..5ccbaa9 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"
@@ -967,6 +967,7 @@
$.ajax({
url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
type: "GET",
+ async: false,
data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
--
Gitblit v1.9.1