From a34f918035b2386ef98b84a8e85b8e007cdce86b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 07 六月 2022 10:09:40 +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_BarCodeEditDlg.html | 333 ++++++----
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanEdit.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Check_New.html | 193 +++++-
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 43
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 15
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 80 +-
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 2
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html | 46 +
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_CheckList_New.html | 6
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 33
WebTM/views/home/console_Mobile.html | 12
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 94 ++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 8
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 7
WebTM/views/index.html | 11
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Check_New.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 19
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 61 +
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 67 +
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 14
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 8
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 60 +
WebTM/views/Baseset/基础资料/Gy_SupplierList.html | 21
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 371 +++++++++++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 23
WebTM/views/领料发货/领料出库/Kf_MateOutBill_CheckList_New.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 9
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 142 +++-
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html | 48 +
34 files changed, 1,497 insertions(+), 347 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2b62edd..ceac276 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -839,6 +839,7 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportPODemandPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
index 203a906..a678a17 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
@@ -35,6 +35,20 @@
<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();
+ var HOtherOrgID = params[params[0]];
+
+
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
@@ -67,17 +81,20 @@
, page: true
});
///鍔犺浇鏄剧ず鏁版嵁
- function RoadQuery(Where) {
+ function RoadQuery(Where, HOrgID) {
var Value = Where;
if (Value == null) {
Value = '';
+ }
+ if (HOrgID == null) {
+ HOrgID = 0;
}
$.ajax({
type: "get",
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetSupplierList_Json",
url: GetWEBURL() + "/Web/GetSupplierList_Json",
async: true,
- data: { "Supplier": Value },
+ data: { "Supplier": Value, "HOrgID": HOtherOrgID },
//data: { "Value": Value },
success: function (result) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
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 620ecd2..146784e 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>
@@ -371,7 +372,7 @@
<a>鏃ヨ鍒掑伐鍗�</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
</dl>
</dd>
<dd>
@@ -402,6 +403,14 @@
<dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>-->
+ </dl>
+ </dd>
</dl>
</dd>
</dl>
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/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
index f5171ce..9e990cc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
@@ -475,7 +475,7 @@
layer.open({
type: 2 //寮圭獥绫诲瀷
, skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "宸ュ簭琛�" //鏍囬
+ , title: "宸ュ簭鍒楄〃" //鏍囬
, closeBtn: 1 //绐椾綋鍙充笂瑙� 鍏抽棴鐨勬牱寮�
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
new file mode 100644
index 0000000..2eb724f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -0,0 +1,371 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HORGID" id="HORGID" lay-verify="HORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎻愭枡鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBEGINDATE" name="HBEGINDATE" id="HBEGINDATE" style="padding-left: 78px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鑷�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HENDDATE" name="HENDDATE" id="HENDDATE" style="padding-left: 78px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HSUPPLIERID" name="HSUPPLIERID" id="HSUPPLIERID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HSUPPLIERNAME" name="HSUPPLIERNAME" id="HSUPPLIERNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSUPPLIERID" id="btnHSUPPLIERID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">闇�姹傚崟鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HXQD" id="HXQD">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閲囪喘璁㈠崟鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPURORDERNO" id="HPURORDERNO">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 浜у搧缂栫爜
+ form.on('submit(btnHMATERIALID)', function (data) {
+ btnHMATERIALID();
+ });
+ //#endregion
+
+ //#region 渚涘簲鍟�
+ form.on('submit(btnHSUPPLIERID)', function (data) {
+ btnHSUPPLIERID();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
+ //鐢熶骇缁勭粐鍔犺浇
+ Organ();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //蹇�熻繃婊�
+ //get_FastQuery(1);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ var columns = [];
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: '鍗曟嵁鍙�', title: '閲囪喘缁勭粐' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鐗╂枡鍚嶇О' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鐗╂枡瑙勬牸' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '渚涘簲鍟�' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鍚堣' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閲囪喘璁㈠崟鍙�' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '闇�姹傚崟鍙�' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鎽樿' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '澶囨敞' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閲囪喘鍛�' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鐗╂枡缂栫爜' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '璁￠噺鍗曚綅' });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '鎻愭枡鎷栨湡鏁伴噺' });
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), edit: 'text', width: 70 })//0
+ }
+ for (var i = 1; i < dd; i++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), edit: 'text', width: 70 })//0
+ }
+ columns.push({ field: 'hmainid', title: '鎻愭枡璁″垝鍚堣' });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [columns]
+ };
+ table.render(option);
+ }
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HORGID").append(Organization);
+ $("#HORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillSortBill/Sc_WorkBillSortBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+ var HORGID = "";
+ if (number == 1) {
+ HORGID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HORGID = $("#HORGID").val();//缁勭粐
+ }
+ var HBEGINDATE = $("#HBEGINDATE").val();//鎻愭枡鏃ユ湡
+ var HENDDATE = $("#HENDDATE").val();//鑷�
+ var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ var HSUPPLIERID = $("#HSUPPLIERID").val();//渚涘簲鍟�
+ var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
+ var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
+
+ sWhere = {
+ HORGID: HORGID
+ , HBEGINDATE: HBEGINDATE
+ , HENDDATE: HENDDATE
+ , HMATERIALID: HMATERIALID
+ , HSUPPLIERID: HSUPPLIERID
+ , HXQD: HXQD
+ , HPURORDERNO: HPURORDERNO
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
+ $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#HMATERIALID").val("");//鐗╂枡/浜у搧
+ $("#HMATERIALNAME").val("");
+ $("#HSUPPLIERID").val("");//渚涘簲鍟�
+ $("#HSUPPLIERNAME").val("");
+ $("#HXQD").val("");//闇�姹傚崟鍙�
+ $("#HPURORDERNO").val("");//閲囪喘璁㈠崟鍙�
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鐗╂枡鍒楄〃
+ function btnHMATERIALID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMATERIALID").val(checkStatus.data[0].HItemID);
+ $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //渚涘簲鍟�
+ function btnHSUPPLIERID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
+ $("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 893e3eb..cbe28d0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -225,6 +225,87 @@
//#endregion
+ option_YQN = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
+
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, hide: true }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, hide: true }
+
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
+ , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
+ , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
+ , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
+ , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
+ , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
+
+ , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
+ , { field: 'HDeptID', title: 'HDeptID', hide: true }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115, hide: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115, hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160, hide: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160, hide: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215, hide: true }
+ , { field: 'hunitid', title: 'hunitid', hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', hide: true }
+
+ , { field: 'hempid', title: 'hempid', hide: true }
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true }
+ , { field: 'hcusid', title: 'hcusid', hide: true }
+ , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', hide: true }
+ , { field: 'HCenterID', title: 'HCenterID', hide: true }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true }
+ , { field: 'hbomid', title: 'hbomid', hide: true }
+ , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
+ , { field: 'HRoutingInterID', title: 'HRoutingInterID', hide: true }
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', hide: true }
+ , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', hide: true }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', hide: true }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', hide: true }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', hide: true }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', hide: true }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', hide: true }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', hide: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', hide: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', hide: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', hide: true }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', hide: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', hide: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', hide: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', hide: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', hide: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', hide: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', hide: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', hide: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', hide: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', hide: true }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true }
+ ]]
+ };
+
function set_InitGrid() {
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
@@ -240,11 +321,36 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
-
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, hide: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, hide: true }
-
+
, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
, { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
, { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
@@ -252,19 +358,10 @@
, { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
, { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
-
, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
, { field: 'HDeptID', title: 'HDeptID', hide: true}
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115, hide: true }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115, hide: true}
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160, hide: true}
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160, hide: true}
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215, hide: true}
, { field: 'hunitid', title: 'hunitid', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115, hide: true}
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', hide: true}
-
, { field: 'hempid', title: 'hempid' , hide: true}
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true}
@@ -279,29 +376,10 @@
, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
, { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', hide: true }
, { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', hide: true}
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', hide: true}
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', hide: true}
- , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', hide: true}
- , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', hide: true}
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', hide: true}
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', hide: true }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', hide: true}
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', hide: true}
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', hide: true}
, { field: 'hsubid', title: 'hsubid' , hide: true}
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', hide: true}
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', hide: true}
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', hide: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', hide: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', hide: true}
- , { field: '淇敼浜�', title: '淇敼浜�', hide: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', hide: true}
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', hide: true}
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', hide: true }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true}
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', hide: true}
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true}
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 3f766d1..19c0454 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -272,8 +272,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
- <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
- <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
+ <input type="text" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden />
+ <input type="text" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden />
</div>
</div>
<div class="layui-inline">
@@ -574,11 +574,11 @@
set_ClearBill();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index cee9a13..67d94bc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -62,6 +62,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
</div>
</script>
</form>
@@ -119,6 +120,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //涓嬫帹
+ case 'set_TuiBill': set_TuiBill();
break;
};
});
@@ -435,6 +439,25 @@
}
//#endregion
+ //缂栬緫鍗曟嵁 涓嬫帹
+ function set_TuiBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var linterid = data[0].婧愬崟涓诲唴鐮�.toString();
+ var HEntryID = data[0].婧愬崟瀛愬唴鐮�.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 450ff51..22fd485 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -44,9 +44,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
@@ -114,13 +118,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
</div>
</div>
</div>
@@ -190,16 +190,15 @@
if (obj.field == "鐢熶骇璧勬簮") {
return;
}
- if (obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')] != null) {
+ if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
}
}
for (var i = 1; i < dd; i++) {
- if (obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')] != null) {
+ if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]))) {
dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
}
}
- console.log(dateHQty)
//淇敼鏁版嵁
obj.update({
"鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
@@ -212,9 +211,6 @@
, data = checkStatus.data;
switch (obj.event) {
case 'btn-CopyLine':
- console.log(JSON.stringify(data))
- console.log()
-
if (data.length <= 0) {
layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
@@ -259,7 +255,7 @@
//蹇�熻繃婊�
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//閲嶇疆
@@ -284,7 +280,7 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery();
+ get_FastQuery(1);
}
//#endregion
@@ -321,8 +317,8 @@
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
- columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width:150 });
- columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width:150 });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150});
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width:150 });
@@ -471,15 +467,26 @@
}
//蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
+ var HWorkShopID = 0;
+ var HProdORGID = 0;
+ if (number == 2) {
+ HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+ if (HWorkShopID == 0) {
+ return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ }
+
+ HProdORGID = $("#HProdORGID").val();//鐢熶骇璁㈠崟缁勭粐
+ }
+ if (number == 1) {
+ HProdORGID = sessionStorage["OrganizationID"];//鐢熶骇璁㈠崟缁勭粐
+ }
var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
- var HProdORGID = $("#HProdORGID").val();//鐢熶骇璁㈠崟缁勭粐
- var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
- var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
-
+
sWhere = {
HPlanBeginDate: HPlanBeginDate
, HProdORGID: HProdORGID
@@ -496,7 +503,6 @@
//閲嶇疆
function set_ClearQuery() {
$("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
- $("#HProdORGID").val("0");//鐢熶骇璁㈠崟缁勭粐
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
$("#HMaterID").val("0");//鐗╂枡缂栫爜id
@@ -506,6 +512,8 @@
$("#HICMOBillNo").val("");//鐢熶骇璁㈠崟鍙�
$("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
$("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
+ $("#HProdORGID").val(sessionStorage["OrganizationID"])//鐢熶骇璁㈠崟缁勭粐
+ form.render('select');
sWhere = "";
}
@@ -534,7 +542,12 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- get_FastQuery();
+ if ($("#HWorkShopID").val() == 0) {
+ get_FastQuery(1);
+ }
+ else {
+ get_FastQuery(2);
+ }
layer.close(index);
layer.msg("淇濆瓨鎴愬姛");
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 2ccb217..2752d5c 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1005,7 +1005,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '宸ュ簭琛�'//鏍囬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 53cb11a..48f5a46 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -447,7 +447,7 @@
$("#HMainSourceBillNo").val("");
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
- $("#HICMOEntryID").val(data.HICMOEntryID);
+ $("#HICMOEntryID").val(HICMOEntryID);
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -475,15 +475,15 @@
$("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
$("#HICMOBillNo").val(data.浠诲姟鍗�);
$("#HICMOInterID").val(data.HICMOInterID);
- $("#HICMOQty").val(data.HICMOQty);
+ $("#HICMOQty").val(data.浠诲姟鍗曟暟閲�);
$("#HSourceName").val(data.鐢熶骇璧勬簮);
$("#HSourceID").val(data.HSourceID);
$("#HMaterID").val(data.HMaterID);
$("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
$("#HMainSourceBillType").val(data.HBillType);
- $("#HMainSourceInterID").val(data.HInterID);
+ $("#HMainSourceInterID").val(data.hmainid);
$("#HProcID").val(data.HProcID);
- $("#HICMOEntryID").val(data.HICMOEntryID);
+ $("#HICMOEntryID").val(HICMOEntryID);
} else {
layer.alert(result.Message, { icon: 5 });
}
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_FirstPieceCheckBillList.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_FirstPieceCheckBillList.html"
index 657ec0f..836d47c 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_FirstPieceCheckBillList.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_FirstPieceCheckBillList.html"
@@ -216,7 +216,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?hID=' + hID
+ , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&hID=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index d48e1eb..c4b9204 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -670,7 +670,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",
@@ -727,6 +728,7 @@
//閫夋嫨渚涘簲鍟�
form.on('submit(HSupID-BT)', function () {
+ var HStockInOrgID = sessionStorage["OrganizationID"];
layer.open({
type: 2
, area: ['80%', '80%']
@@ -734,7 +736,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html?HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -742,6 +744,8 @@
})
});
+
+
//閫夋嫨浜у搧
form.on('submit(HMateriaID-BT)', function () {//閫夋嫨浜у搧
layer.open({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
index 8c7f47a..3f6e462 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
@@ -62,9 +62,21 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
</div>
@@ -114,6 +126,29 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
+ });
+
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HICMOBillNo').on('keydown', function (event) {
+ var HICMOBillNo = $('#HICMOBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HICMOBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
});
//鍒濆鍖栬〃鏍�
@@ -171,6 +206,8 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
+ $("#HICMOBillNo").val("");
+ $("#HProcExchBillNo").val("");
$("#HBillNo").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -181,6 +218,8 @@
function get_FastQuery() {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
var HBillNo = $("#HBillNo").val();
+ var HICMOBillNo = $("#HICMOBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -200,6 +239,13 @@
default:
}
}
+ if (HICMOBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index d699cf2..78facb5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -166,6 +166,12 @@
<input type="hidden" value="0" name="HSupID" id="HSupID">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -241,12 +247,6 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嶈壇鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
- </div>
- </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鎺ユ敹鏃堕棿</label>
<div class="layui-input-inline">
@@ -851,6 +851,7 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
var oMain = data.field;
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
@@ -888,8 +889,26 @@
}
//#endregion
+ ////閫夋嫨渚涘簲鍟�
+ //form.on('submit(HSupID-BT)', function () {
+ // layer.open({
+ // type: 2
+ // , area: ['80%', '80%']
+ // , title: '渚涘簲鍟嗗垪琛�'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+
//閫夋嫨渚涘簲鍟�
form.on('submit(HSupID-BT)', function () {
+ var HStockInOrgID = sessionStorage["OrganizationID"];
layer.open({
type: 2
, area: ['80%', '80%']
@@ -897,7 +916,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html?HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
index 04005a5..b21847c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
@@ -62,9 +62,21 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
</div>
@@ -117,6 +129,29 @@
get_FastQuery();
});
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HICMOBillNo').on('keydown', function (event) {
+ var HICMOBillNo = $('#HICMOBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HICMOBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -144,6 +179,8 @@
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺' }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
, { field: '娴佹按鍙�', title: '娴佹按鍙�' }
, { field: 'HProcID', title: 'HProcID', hide: true }
@@ -176,15 +213,19 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
+ $("#HICMOBillNo").val("");
$("#HBillNo").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HProcExchBillNo").val("");
}
//蹇�熻繃婊�
function get_FastQuery() {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
var HBillNo = $("#HBillNo").val();
+ var HICMOBillNo = $("#HICMOBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -204,6 +245,13 @@
default:
}
}
+
+ if (HICMOBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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..4460179 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"
@@ -132,7 +132,7 @@
<label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID" >
+ <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -255,6 +255,14 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
@@ -268,12 +276,6 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嶈壇鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="" id="">
- </div>
- </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鑱屽憳2</label>
<div class="layui-input-inline">
@@ -784,7 +786,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 581dd68..dd2487b 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"
@@ -195,6 +195,8 @@
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺' }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺' }
, {
field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, templet: function (d) {
if (d.鍑虹珯鏃堕棿 == null) {
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 e30b47d..3651e83 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"
@@ -317,6 +317,15 @@
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="WorkBillSortNo" id="WorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
<div class="layui-input-inline">
@@ -645,6 +654,20 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+
+ $.ajax({
+ url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
+ type: "GET",
+ data: { "sWhere": " and 婧愬崟涓诲唴鐮�='" + linterid + "' and 婧愬崟瀛愬唴鐮�='" + HEntryID + "' ", "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ if (d.data[0] != null) {
+ $("#WorkBillSortNo").val(d.data[0].鍗曟嵁鍙�);
+ }
+ }
+ })
+
+
+
GetICMOBillValue(linterid, HEntryID);
option.data = [{
"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
@@ -1171,7 +1194,32 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
GetICMOBillValue(checkStatus.data[0].hmainid, checkStatus.data[0].HEntryID)
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨鏃ヨ鍒掑伐鍗�
+ form.on('submit(btnSearchWorkBillSort)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../../views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#WorkBillSortNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ GetICMOBillValue(checkStatus.data[0].婧愬崟涓诲唴鐮�, checkStatus.data[0].婧愬崟瀛愬唴鐮�)
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1198,7 +1246,14 @@
layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var sSubTable = table.cache['mainTable'];
+ //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var sSubTable = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ sSubTable.push(table.cache["mainTable"][i])
+ }
+ }
for (var i = 0; i < sSubTable.length; i++) {
if (!sSubTable[i].HProcNo) {
var indexRow = i + 1;
@@ -1232,7 +1287,7 @@
var HBLFlag = document.getElementById("HBLFlag").checked;
HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(sSubTable);
var flag = "xz";
if (OperationType == 3) {
flag = "xg";
@@ -1336,6 +1391,7 @@
, "HWorkShopName": data.鐢熶骇杞﹂棿
, "HWorkShopID": data.HWorkShopID
, "textBox2": data.浠诲姟鍗曞彿
+ , "WorkBillSortNo": data.鏃ヨ鍒掑伐鍗曞彿
, "HSupName": data.濮斿鍔犲伐鍗曚綅
, "HSupID": data.HSupID
, "HMaterName": data.瀛愪欢鍚嶇О
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