From 85cfdae6b189e2cbadc9460b67e2de57bf936349 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 18 九月 2024 18:54:54 +0800
Subject: [PATCH] 仓位列表添加打印功能；生产订单列表取消隐藏工艺路线字段；批量拆分流转卡/工艺路线编辑页面子表字段超出单元格长度则收缩起来；关键件绑定；网页/PDA出站汇报单自动带出合格数量；
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 1
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 916 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx.designer.cs | 26 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx | 26 +
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 8
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 34 +
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 2
WebTM/WebTM.csproj | 9
WebTM/views/grf/仓位标签.grf | 225 ++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx.cs | 17
15 files changed, 1,273 insertions(+), 7 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0e89543..25fe81a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -357,6 +357,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_UnitConvertRateList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx" />
@@ -416,6 +417,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
@@ -2201,6 +2203,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx.cs">
<DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 5cb44fa..dc384b1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,11 +5,11 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
// var WEBURL = "http://localhost/API/"; // //棰滄檽鍐涙湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
diff --git "a/WebTM/views/grf/\344\273\223\344\275\215\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\344\273\223\344\275\215\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..f9bdf71
--- /dev/null
+++ "b/WebTM/views/grf/\344\273\223\344\275\215\346\240\207\347\255\276.grf"
@@ -0,0 +1,225 @@
+锘縊bject Report
+ Version='6.8.2.5'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=6
+ Height=8
+ Oriention=Landscape
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='浠撲綅浠ｇ爜'
+ End
+ Item
+ Name='浠撲綅鍚嶇О'
+ End
+ Item
+ Name='缁勭粐鍚嶇О'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column1'
+ Width=7.9375
+ End
+ End
+Object ColumnContent
+ Height=5.79438
+ Items ColumnContentCell
+ Item
+ Column='Column1'
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode4'
+ Left=2.32833
+ Top=2.2225
+ Width=3.20146
+ Height=3.20146
+ BarcodeType=QRCode
+ CheckSum=T
+ Text='[#鏉＄爜缂栧彿#]'
+ Object Font
+ Name='榛戜綋'
+ Size=67500,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Type=Line
+ Name='Line32'
+ Left=0.185208
+ Top=1.13771
+ Width=7.48771
+ End
+ Item
+ Type=Line
+ Name='Line33'
+ Left=0.185208
+ Top=0.185208
+ Height=5.5
+ U2D=F
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=1.74625
+ Top=1.16417
+ Width=5.84729
+ Height=0.846667
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ Text='[#浠撲綅鍚嶇О#]'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox20'
+ Left=0.343958
+ Top=0.47625
+ Width=1.00542
+ Height=0.396875
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='浠ｇ爜'
+ End
+ Item
+ Type=Line
+ Name='Line34'
+ Left=0.19
+ Top=5.65
+ Width=7.48771
+ End
+ Item
+ Type=Line
+ Name='Line35'
+ Left=0.185208
+ Top=0.185208
+ Width=7.5
+ End
+ Item
+ Type=Line
+ Name='Line36'
+ Left=0.185208
+ Top=2.01083
+ Width=7.48771
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox21'
+ Left=0.343958
+ Top=1.40229
+ Width=1.00542
+ Height=0.396875
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鍚嶇О'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox20'
+ Left=1.74625
+ Top=0.238125
+ Width=5.84729
+ Height=0.846667
+ Object Font
+ Name='榛戜綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ Text='[#浠撲綅浠ｇ爜#]'
+ End
+ Item
+ Type=Line
+ Name='Line41'
+ Left=1.53458
+ Top=0.185208
+ Height=1.82
+ U2D=F
+ End
+ Item
+ Type=Line
+ Name='Line42'
+ Left=7.69
+ Top=0.19
+ Height=5.5
+ U2D=F
+ End
+ End
+ End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column1'
+ TextAlign=MiddleCenter
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index 3dfdc81..664131c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -89,6 +89,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
</div>
@@ -148,7 +149,10 @@
break;
case 'btn-Delete':
set_DeleteBill();
- break;
+ break;
+ //鎵撳嵃
+ case 'set_Print': set_Print();
+ break;
//閫�鍑烘寜閽�
case 'btn-Close':
parent.layui.admin.events.closeThisTabs();
@@ -484,9 +488,35 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
-
//#endregion
+ //#region 鎵撳嵃
+ function set_Print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].HMainID.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HStockPlace', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 46cb1e4..90e2830 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -842,7 +842,7 @@
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['80%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index db4d4b9..da78474 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -223,6 +223,9 @@
case "HWarehouse"://浠撳簱鍒楄〃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_WarehouseList.aspx?linterid=" + value, true, "");
break;
+ case "HStockPlace"://浠撲綅鍒楄〃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_StockPlaceList.aspx?linterid=" + value, true, "");
+ break;
case "Kf_OtherOutBillList"://鍏朵粬鍑哄簱鍗曠淮鎶� 鍑哄簱鐮佸崟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_OtherOutBillList.aspx?linterid=" + value, true, "");
break;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx"
new file mode 100644
index 0000000..d12ecb6
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx"
@@ -0,0 +1,26 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.cs"
new file mode 100644
index 0000000..41df4a4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Gy_StockPlaceList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.designer.cs"
new file mode 100644
index 0000000..d79fd16
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Gy_StockPlaceList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
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 3fb8737..e24577c 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"
@@ -340,7 +340,7 @@
var HDeptID = params[params[0]];
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
- var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//titleData = [];
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
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 eb45a02..cc08d0b 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"
@@ -44,6 +44,12 @@
.layui-form-label {
width: 25%;
}
+
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
+ }
</style>
</head>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
new file mode 100644
index 0000000..a3d8c17
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
@@ -0,0 +1,916 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍏抽敭浠剁粦瀹�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <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>-->
+ <script src="../../CreateControl.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px;">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRefresh" id="btnRefresh">鍒锋柊</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
+ </div>
+ <h1 style="text-align:center;margin-bottom:25px;"><b>鍏抽敭浠剁粦瀹�</b></h1>
+ <div class="layui-form-item" style="padding-top: 3px;">
+ <div class="layui-row" style="text-align: center;">
+ <div class="layui-col-xs3 layui-inline" style="margin-left:205px;">
+ <label class="layui-form-label">娴佽浆鍗�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcessExchangeBillNo" id="HProcessExchangeBillNo" onfocus="this.select();">
+ <input type="hidden" name="HProcessExchangeInterID" id="HProcessExchangeInterID" value="0">
+ <input type="hidden" name="HProcessExchangeEntryID" id="HProcessExchangeEntryID" value="0">
+ </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="HBarCode_P" id="HBarCode_P" onfocus="this.select();">
+ </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="HBarCode" id="HBarCode" onfocus="this.select();">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 45%; float: left; height:calc(60vh);background-color:white;">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HDate" name="HDate" id="HDate" style="padding-left: 80px;width:184px;">
+ </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" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HICMOBillNo" id="HICMOBillNo" style=" background-color: #EDEDED;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
+ </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" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo" style=" background-color: #EDEDED;" readonly>
+ <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID">
+ <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber" style=" background-color: #EDEDED;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID">
+ </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="HMaterName" lay-verify="HMaterName" id="HMaterName" style=" background-color: #EDEDED;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" style=" background-color: #EDEDED;" readonly>
+ </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="text" class="layui-input" name="HSourceName" lay-verify="HSourceName" id="HSourceName" style="background-color: #EDEDED; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #EDEDED; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" 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="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#EDEDED;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#EDEDED;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" 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="text" class="layui-input" lay-verify="HCheckEmpName" name="HCheckEmpName" id="HCheckEmpName" value="" style="background-color:#EDEDED;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HCheckEmpID" name="HCheckEmpID" id="HCheckEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCheckEmp" id="btnHCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="text" class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #EDEDED; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" 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="HProcNo" lay-verify="HProcNo" id="HProcNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="width: 0.2%; float: left; height: calc(60vh);background-color:#2baaca"></div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 54.8%; float: left; height:calc(60vh);background-color:white;">
+ <div style="width:100px;height:23px; background: linear-gradient(-135deg, transparent 30px, #2baaca 0);"><span style="color:aliceblue;">缁戝畾淇℃伅</span></div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 99.8%; float: left; height:calc(100vh);background-color:white;margin-left:0.2%">
+ <div style="width:100%;height:23px; background-color: #2baaca;text-align:center;font-weight:bold"><span style="color:aliceblue;">鍘嗗彶璁板綍</span></div>
+ <table class="layui-hide" id="detailTable" lay-filter="detailTable"></table>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HModName = "Sc_KeyElementBinding";
+ var option = [];
+ var option_detail = [];
+ var setIntervalIndex = null;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcessExchangeBillNo').on('keydown', function (event) {
+ var HBarCode = $('#HProcessExchangeBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("娴佽浆鍗′笉鑳戒负绌猴紒")
+ return;
+ }
+ //鏌ヨ娴佽浆鍗＄浉鍏充俊鎭�
+ get_ProcessExchangeList(HBarCode);
+ }
+ });
+ //#endregion
+
+ //#region 浜у搧鐮佸洖杞︽柟娉�
+ $('#HBarCode_P').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode_P').val();
+ var HProcessExchangeBillNo = $('#HProcessExchangeBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcessExchangeBillNo) {
+ layer.msg("璇峰厛鎵祦杞崱锛�")
+ return;
+ } else {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ } else {
+ //if (HBarCode.match(/[^\x00-\xff]/g) != null) {
+ // layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ // return;
+ //}
+ }
+ }
+ txtHProductBarCode_KeyDown(HBarCode);
+ }
+ });
+ //#endregion
+
+ //#region 閰嶄欢鍥炶溅鏂规硶
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ var HProcessExchangeBillNo = $('#HProcessExchangeBillNo').val();
+ var HBarCode_P = $('#HBarCode_P').val();
+ if (event.keyCode == 13) {
+ if (!HProcessExchangeBillNo || !HBarCode_P) {
+ layer.msg("璇峰厛鎵祦杞崱鎴栦骇鍝佺爜锛�")
+ return;
+ } else {
+ if (!HBarCode) {
+ layer.msg("閰嶄欢涓嶈兘涓虹┖锛�")
+ return;
+ }
+ }
+ txtHPartsBarCode_KeyDown(HBarCode);
+ }
+ });
+ //#endregion
+
+ //缁戝畾淇℃伅琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //#region 鍩虹璧勬枡鎸夐挳
+ //閫夋嫨璐ㄦ鍛�
+ form.on('submit(btnHCheckEmp)', function () {
+ btnHCheckEmp();
+ });
+
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(btnHEmp)', function () {
+ btnHEmp();
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
+ });
+
+ //閫夋嫨鐢熶骇鐝粍鎸夐挳
+ form.on('submit(btnHGroup)', function () {
+ btnHGroup();
+ });
+
+ //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ btnHDept();
+ });
+
+ //閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnHProc)', function () {
+ btnHProc();
+ });
+ //#endregion
+
+ //淇濆瓨
+ form.on('submit(btnSave)', function (data) {
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
+ $("#HProcessExchangeBillNo").focus();
+
+ //鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ }
+ });
+
+ //#region 鍩虹璧勬枡淇℃伅鏍规嵁鐢ㄦ埛缁戝畾甯﹀嚭
+ $("#HSourceID").val(sessionStorage["HSourceID"]);//鐢熶骇璧勬簮ID
+ $("#HSourceName").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+ //$("#HDeptID").val(sessionStorage["HDeptID"]);//鐢熶骇杞﹂棿ID
+ //$("#HDeptName").val(sessionStorage["HDept"]);//鐢熶骇杞﹂棿
+ $("#HGroupID").val(sessionStorage["HGroupID"]);//鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]);//鐝粍
+ $("#HCheckEmpID").val(sessionStorage["HCheckEmpID"]);//璐ㄦ鍛業D
+ $("#HCheckEmpName").val(sessionStorage["HCheckEmpName"]);//璐ㄦ鍛業D
+ $("#HEmpID").val(sessionStorage["HEmpID"]);//鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]);//鎿嶄綔鍛�
+ //#endregion
+
+ //鍒濆鍖栫粦瀹氫俊鎭〃鏍�
+ set_InitGrid();
+ //鍘嗗彶缁戝畾璁板綍鏌ヨ
+ //get_Display();
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //鏈缁戝畾淇℃伅
+ option = {
+ elem: '#mainTable'
+ , page: false
+ , height: 'full-358'
+ , loading: false
+ , limit: 200
+ , cols: [[ //缁戝畾淇℃伅琛�
+ { type: 'numbers', title: '搴忓彿', width: 50 }
+ , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+ , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+ , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+ , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+ , { field: 'HBatchNo', title: '鎵规', width: 160 }
+ , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+ , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+ , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+ , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+ , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
+ ]]
+ }
+ //鍒濆琛ㄦ牸鏁版嵁
+ var rowdata = [{
+ "HBarCode_P": "", "HBarCode": "", "HPartsQty": 0, "HBindingQty": 0, "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+ , "HBatchNo": "", "HSourceID": 0, "HEquipID": 0, "HGroupID": 0, "HWorkerID": 0, "HScanDate": new Date(), "HSourceInterID": 0
+ , "HSourceEntryID": 0, "HSourceBillNo": ""
+ }];
+ option.data = [];
+ table.render(option);
+
+ //鍘嗗彶缁戝畾淇℃伅
+ option_detail = {
+ elem: '#detailTable'
+ , page: false
+ , height: 'full-30'
+ , loading: false
+ , limit: 2000
+ , cols: [[ //鍘嗗彶璁板綍琛�
+ { type: 'numbers', title: '搴忓彿', width: 50 }
+ , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 400 }
+ , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 400 }
+ , { field: 'HPartsQty', title: '閰嶄欢鏁伴噺', width: 90 }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 260 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 260 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+ , { field: 'HBatchNo', title: '鎵规', width: 200 }
+ , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+ , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+ , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+ , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+ , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+ ]]
+ }
+
+ option_detail.data = [];
+ table.render(option_detail);
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ //搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(option.data);
+ //鎷兼帴鍙傛暟
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_KeyElementBinding/Save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+
+ $("#btnSave").addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ layer.close(index);
+ }
+ });
+ }
+ //#endregion
+
+ //鏌ヨ
+ function get_Display() {
+ var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"] + "'";
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ $("#HDeptID").val(data1.data[0]["HDeptID"]);
+ $("#HDeptName").val(data1.data[0]["杞﹂棿"]);
+ $("#HProcName").val(data1.data[0]["宸ュ簭"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]);
+ $("#HSourceID").val(data1.data[0]["HSourceID"]);
+ $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
+ $("#HCheckEmpID").val(data1.data[0]["HCheckEmpID"]);
+ $("#HCheckEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
+ $("#HEmpID").val(data1.data[0]["HCheckEmpID"]);
+ $("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
+ $("#HGroupID").val(data1.data[0]["HGroupID"]);
+ $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //娴佽浆鍗″洖杞︽煡璇紙鏌ヨ娴佽浆鍗＄浉鍏充俊鎭級
+ function get_ProcessExchangeList(HBarCode) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_KeyElementBinding/GetProcessExchangeList',
+ async: false,
+ type: "GET",
+ data: { "HBillNo": HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+
+ $("#HICMOInterID").val(data[0].HICMOInterID);
+ $("#HICMOEntryID").val(data[0].HICMOEntryID);
+ $("#HICMOBillNo").val(data[0].鐢熶骇璁㈠崟鍙�);
+ $("#HSeOrderBillNo").val(data[0].閿�鍞鍗曞彿);
+ $("#HMaterID").val(data[0].HMaterID);
+ $("#HMaterNumber").val(data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(data[0].瑙勬牸鍨嬪彿);
+ $("#HDeptID").val(data[0].HDeptID);
+ $("#HDeptName").val(data[0].鐢熶骇杞﹂棿鍚嶇О);
+
+
+ //绂佺敤杈撳叆妗�,鑳屾櫙鑹插彉鐏�
+ $("#HDate").prop('disabled', true);//绂佺敤
+ $("#HDate").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ $("#HProcessExchangeBillNo").attr('disabled', 'disabled')//绂佺敤
+ $("#HProcessExchangeBillNo").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ $("#HProcNo").attr('disabled', 'disabled')//绂佺敤
+ $("#HProcNo").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ //鎸夐挳绂佺敤
+ $("#btnHSource").addClass("layui-btn-disabled").attr("disabled", true);//鐢熶骇璧勬簮鎸夐挳绂佺敤
+ $("#btnHDept").addClass("layui-btn-disabled").attr("disabled", true);//鐢熶骇杞﹂棿鎸夐挳绂佺敤
+ $("#btnHGroup").addClass("layui-btn-disabled").attr("disabled", true);//鐢熶骇鐝粍鎸夐挳绂佺敤
+ $("#btnHEmp").addClass("layui-btn-disabled").attr("disabled", true);//鎿嶄綔鍛樻寜閽鐢�
+ $("#btnHCheckEmp").addClass("layui-btn-disabled").attr("disabled", true);//璐ㄦ鍛樻寜閽鐢�
+ $("#btnHProc").addClass("layui-btn-disabled").attr("disabled", true);//宸ュ簭鎸夐挳绂佺敤
+
+ //鍏夋爣璺宠浆鑷充骇鍝佺爜杈撳叆妗嗕綅缃�
+ $("#HBarCode_P").focus();
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!" + data1.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //浜у搧鐮佸洖杞︽煡璇�
+ function txtHProductBarCode_KeyDown(HBarCode) {
+ var HProcExchBillNo = $("#HProcessExchangeBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var indexs = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_KeyElementBinding/ProductBardCode_JX",
+ async: false,
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "HBillNo": HBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+ var rowarr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ rowarr.push({
+ "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+ , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HBatchNo": ""
+ , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+ , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+ , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+ });
+ }
+
+ option.data = rowarr;
+
+ table.render(option);
+
+ layer.close(indexs);
+
+ //绂佺敤杈撳叆妗�,鑳屾櫙鑹插彉鐏�
+ $("#HBarCode_P").attr('disabled', 'disabled')//绂佺敤
+ $("#HBarCode_P").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode").focus();
+ }
+ else {
+ layer.close(indexs);
+ layer.msg(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //閰嶄欢鐮佸洖杞︽煡璇�
+ function txtHPartsBarCode_KeyDown(HBarCode) {
+ var indexs = layer.load();
+ var HProcExchBillNo = $("#HProcessExchangeBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_KeyElementBinding/PartsBardCode_JX",
+ async: false,
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "HBillNo": HBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+ option.data[i].HMaterID = data[0].HMaterID
+ option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+ option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+ option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+ option.data[i].HBarCode = data[0].閰嶄欢鐮�
+ option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+
+ break;
+ } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+ } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+ }
+ }
+
+ //option.data = rowarr;
+
+ table.render(option);
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode").focus();
+ $("#HBarCode").val("");
+
+ layer.close(indexs);
+ }
+ else {
+ layer.close(indexs);
+ layer.msg(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+ var wait = layer.load();
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ $.ajax({
+ url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+ type: "GET",
+ data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode , "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message,{ icon: 1 ,time: 500}, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ option.data[rowIndex].HBarCode = "";
+ option.data[rowIndex].HBindingQty = option.data[rowIndex].HBindingQty - 1;
+ //option.data[rowIndex].HMaterID = 0;
+ option.data[rowIndex].HMaterNumber = "";
+ option.data[rowIndex].HMaterName = "";
+ option.data[rowIndex].HMaterModel = "";
+ option.data[rowIndex].HBarCode = "";
+
+ table.render(option);
+ layer.close(index);
+ });
+ }
+ }
+
+ //#region 鍩虹璧勬枡閫夋嫨寮规
+ //璐ㄦ鍛橀�夋嫨椤甸潰
+ function btnHCheckEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐ㄦ鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HCheckEmpID").val(checkStatus.data[0].HItemID);
+ $("#HCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //鎿嶄綔鍛橀�夋嫨椤甸潰
+ function btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鎿嶄綔鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //鐢熶骇璧勬簮閫夋嫨椤甸潰
+ function btnHSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇鐝粍閫夋嫨椤甸潰
+ function btnHGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇杞﹂棿閫夋嫨椤甸潰
+ function btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);//
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ュ簭閫夋嫨椤甸潰
+ function btnHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+ var HBarCode = $("#HBarCode_P").val();
+ if (HBarCode == "") {
+ layer.msg("浜у搧鐮佷笉鑳戒负绌�!")
+ return false;
+ }
+
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+
+ return true;
+ }
+ //#endregion
+ });
+</script>
\ No newline at end of file
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 5e4bbd6..3410e3f 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"
@@ -1296,6 +1296,7 @@
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
, "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ , "HQty": data.鍚堟牸鏁伴噺
});
if (data.棣栭亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 1;
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index 8bdc6a7..7aebc41 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -1171,6 +1171,7 @@
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
, "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ , "HQty": data.鍚堟牸鏁伴噺
});
if (data.棣栭亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 1;
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_BatchSplit.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_BatchSplit.html"
index c139ab5..e5c3d2d 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_BatchSplit.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_BatchSplit.html"
@@ -35,6 +35,12 @@
margin-left: -15px;
margin-right: -15px;
}
+
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
+ }
</style>
</head>
<body>
@@ -395,7 +401,7 @@
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.close(ajaxLoad);
--
Gitblit v1.9.1