From d4a02d4acfd1380141f9191d5057419218ef92de Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 27 十月 2024 14:15:53 +0800
Subject: [PATCH] 15包装打白标
---
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 27 +
WebTM/views/车间管理/产线/MES_WhiteLabelGeneration.html | 278 ++++++++++++++
WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html | 6
WebTM/views/grf/15白标打印.grf | 766 ++++++++++++++++++++++++++++++++++++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 5
WebTM/views/IpadIndex.html | 7
WebTM/WebTM.csproj | 2
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 29 +
9 files changed, 1,111 insertions(+), 13 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3e5d64f..58c5ede 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -540,6 +540,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_WhiteLabelGeneration.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\ProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\RetrospectionCustomerReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBill.html" />
@@ -1123,6 +1124,7 @@
<Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�.grf" />
<Content Include="views\grf\鍙栨牱鍗�.grf" />
+ <Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index bf9b04c..32e538e 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -13,12 +13,12 @@
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body" style="padding: 15px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
+ <form class="layui-form" action="" lay-filter="component-form-group" onsubmit="return false;">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">杩囨护鍒�</label>
<div class="layui-input-inline">
- <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
@@ -35,7 +35,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
//寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
- layui.use(['table', 'form', 'layer'], function () {
+ layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
, layer = layui.layer;
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 85e3499..753ae37 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -30,6 +30,7 @@
var HSourceID1 = ""; //鐢熶骇璧勬簮ID1
var HSourceName1 = ""; //鐢熶骇璧勬簮1
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HProcExchInterID = ""; //娴佽浆鍗d
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -206,6 +207,7 @@
html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
//HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp HInterID锛堝崟鎹富ID锛�
html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>娴佽浆鍗′富ID锛�</span><span id="lzk' + (i + 1) + '">' + LoadData1[i].HProcExchInterID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
@@ -439,6 +441,7 @@
workcode = $("#wk" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
HBillType = $("#ty" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(鍗曟嵁绫诲瀷)
HSourceInterID = $("#sm" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟涓诲唴鐮�)
+ HProcExchInterID = $("#lzk" + i + "").html(); //娴佽浆鍗D
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
@@ -955,7 +958,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
}
@@ -978,7 +981,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
diff --git "a/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf" "b/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf"
new file mode 100644
index 0000000..d4c50cf
--- /dev/null
+++ "b/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf"
@@ -0,0 +1,766 @@
+锘縶
+ "Version":"6.8.9.1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":10,
+ "Height":15,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0,
+ "PrintOffsetY":1
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"PartNo"
+ },
+ {
+ "Name":"Index"
+ },
+ {
+ "Name":"Quatity"
+ },
+ {
+ "Name":"MS-Level"
+ },
+ {
+ "Name":"Addinfo"
+ },
+ {
+ "Name":"ManPartNo"
+ },
+ {
+ "Name":"PartDescription"
+ },
+ {
+ "Name":"ManDate"
+ },
+ {
+ "Name":"ExpiryDate"
+ },
+ {
+ "Name":"ManLoc"
+ },
+ {
+ "Name":"1Batch"
+ },
+ {
+ "Name":"2Batch"
+ },
+ {
+ "Name":"SupplierName"
+ },
+ {
+ "Name":"SupplierID"
+ },
+ {
+ "Name":"Purchase"
+ },
+ {
+ "Name":"SupplierData"
+ },
+ {
+ "Name":"PackageID"
+ },
+ {
+ "Name":"ShippingNote"
+ },
+ {
+ "Name":"HBarCode_White"
+ }
+ ]
+ },
+ "ColumnContent":{
+ },
+ "ColumnTitle":{
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"MFGPartNumber",
+ "Format":"MFGPartNumber"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":14.7902,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid2",
+ "Left":-0.449792,
+ "Top":-0.3175,
+ "Border":{
+ "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":7,
+ "RowCount":2,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":0.873125
+ },
+ {
+ "index":2,
+ "Width":0.608542
+ },
+ {
+ "index":3,
+ "Width":1.00542
+ },
+ {
+ "index":4,
+ "Width":1.19063
+ },
+ {
+ "index":5,
+ "Width":1.48167
+ },
+ {
+ "index":6,
+ "Width":1.50813
+ },
+ {
+ "index":7,
+ "Width":3.75708
+ }
+ ],
+ "FreeGridRow":[
+ {
+ "index":1,
+ "Height":1.85208
+ },
+ {
+ "index":2,
+ "Height":13.4144
+ }
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"Barcode",
+ "Name":"Barcode3",
+ "Left":5.21229,
+ "Top":0.555625,
+ "Width":5.00063,
+ "Height":4.84188,
+ "BarcodeType":"DataMatrix",
+ "Direction":"TopToBottom",
+ "CaptionPosition":"None",
+ "Text":"[#HBarCode_White#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":3.99521,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.83104,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier-name:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":3.04271,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.38125,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier ID:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":2.11667,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Purchase:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":1.21708,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.83104,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier Data:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox5",
+ "Left":9.55146,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"PartNo.:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox6",
+ "Left":7.77875,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":2.64583,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man.part No.:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox7",
+ "Left":8.96938,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Quatity:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":8.36083,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":2.03729,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Add.info:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox9",
+ "Left":7.19667,
+ "Top":5.74146,
+ "Width":0.582083,
+ "Height":2.06375,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man. Date:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox10",
+ "Left":6.61458,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man.Loc:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox11",
+ "Left":5.97958,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"1.Batch:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox12",
+ "Left":5.3975,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"2.Batch:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox13",
+ "Left":3.04271,
+ "Top":5.63563,
+ "Width":0.608542,
+ "Height":2.32833,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Package-ID:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox14",
+ "Left":2.11667,
+ "Top":5.63563,
+ "Width":0.608542,
+ "Height":2.8575,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Shipping Note:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox15",
+ "Left":9.02229,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":1.77271,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"MS-Level:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox16",
+ "Left":9.57792,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":1.37583,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Index:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox17",
+ "Left":7.80521,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":3.51896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Part description:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox18",
+ "Left":7.19667,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":2.54,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Expiry Date:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox19",
+ "Left":1.16417,
+ "Top":12.5413,
+ "Width":0.608542,
+ "Height":1.27,
+ "Font":{
+ "Name":"Arial",
+ "Size":142500,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"RoHS"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":3.99521,
+ "Top":3.20146,
+ "Width":0.608542,
+ "Height":3.46604,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierName"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":3.04271,
+ "Top":2.80458,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierID"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox3",
+ "Left":2.11667,
+ "Top":2.56646,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Purchase"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":1.21708,
+ "Top":3.06917,
+ "Width":0.608542,
+ "Height":2.46063,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierData"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox5",
+ "Left":2.11667,
+ "Top":7.96396,
+ "Width":0.608542,
+ "Height":4.445,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ShippingNote"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":3.06917,
+ "Top":7.62,
+ "Width":0.608542,
+ "Height":3.62479,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PackageID"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Left":5.3975,
+ "Top":7.11729,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"2Batch"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox8",
+ "Left":5.97958,
+ "Top":7.11729,
+ "Width":0.582083,
+ "Height":2.27542,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"1Batch"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox9",
+ "Left":6.61458,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":2.91042,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManLoc"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox10",
+ "Left":7.19667,
+ "Top":7.59354,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManDate"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox11",
+ "Left":7.77875,
+ "Top":7.99042,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManPartNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox12",
+ "Left":8.36083,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Addinfo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox14",
+ "Left":9.55146,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":3.25438,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PartNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox15",
+ "Left":9.57792,
+ "Top":11.4035,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Index"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox16",
+ "Left":9.02229,
+ "Top":12.0121,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"MS-Level"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox17",
+ "Left":7.80521,
+ "Top":12.991,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PartDescription"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox18",
+ "Left":7.19667,
+ "Top":12.3825,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ExpiryDate"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox19",
+ "Left":8.94292,
+ "Top":7.01146,
+ "Width":0.582083,
+ "Height":1.98438,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Quatity"
+ }
+ ],
+ "ColSpan":7,
+ "RowSpan":2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
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 954c58f..d2e2ec7 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"
@@ -2362,10 +2362,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 328d5cc..98f44f5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -53,6 +53,7 @@
<select name="LDM" lay-verify="required" id="LDM">
<option value="DU3" selected>DU3</option>
<option value="QDR">QDR</option>
+ <option value="AAA">15杞﹂棿</option>
<option value="鍏朵粬">鍏朵粬</option>
</select>
</div>
@@ -605,16 +606,30 @@
return;
}
+ if (LDM == "AAA" && SubBarcode.length != 50) {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
playSound();
layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
- if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
- playSound();
- layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- return;
+ if (SubBarcode.length == 50) {
+ if (LDM != "鍏朵粬" && reg.test(SubBarcode)) {
+ playSound();
+ layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ } else {
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
+ playSound();
+ layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
}
if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.indexOf(BBM) == -1) {
@@ -953,7 +968,11 @@
}
});
}
- $("#Print").click();
+ if (LDM == "AAA") {
+ $("#Print2").click();
+ } else {
+ $("#Print").click();
+ }
$("#HBarCode_White").val("");
//瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹� 鏉＄爜鎵畬鍚�
if (pcmQty == pcmQtyFlag) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 0c54204..29e8ee2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -21,7 +21,7 @@
<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">
+ <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">
@@ -221,6 +221,9 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
<i class="layui-icon layui-icon-file"></i>鏅彶鐗规墦鍗�
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="WhiteSave" id="WhiteSave">
+ <i class="layui-icon layui-icon-file"></i>鐧芥爣鐢熸垚
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
<i class="layui-icon layui-icon-file"></i>鍒犻櫎
@@ -576,6 +579,28 @@
//});
+ //鐧芥爣鐢熸垚淇濆瓨
+ form.on('submit(WhiteSave)', function (obj) {//閫�鍑�
+ var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ if (checkStatus.data.length == 1) {
+ var HBarCode_Pack = checkStatus.data[0].鍞竴鏉＄爜;
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '鐧芥爣鎵撳嵃' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/浜х嚎/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛岃繘琛岀櫧鏍囩敓鎴�!");
+ }
+ });
+
form.on('submit(Print)', function (obj) {//閫�鍑�
var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
new file mode 100644
index 0000000..ddb0b3d
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
@@ -0,0 +1,278 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <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="../../../layuiadmin/grwebapp.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <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" name="ProjectNo" id="ProjectNo" lay-verify="ProjectNo" value="" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">Ordering-Code</label>
+ <div class="layui-input-inline">
+ <input type="text" name="OrderingCode" id="OrderingCode" lay-verify="OrderingCode" value="" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍥剧焊鐗堟湰鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="DrawVersionNumber" id="DrawVersionNumber" value="" autocomplete="off">
+ </div>
+ </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" name="CustomerOrderNumber" id="CustomerOrderNumber" value="" lay-verify="CustomerOrderNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="WaybillNumber" id="WaybillNumber" value="" lay-verify="WaybillNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" value="" autocomplete="off" placeholder="" class="layui-input">
+ <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" value="" hidden>
+ <input type="text" name="HBillType" id="HBillType" value="" hidden>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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 sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ $("#HBarCode_Pack").val(linterid);
+ }
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+ var sMainStr = JSON.stringify(data.field);
+ if ($("#ProjectNo").val()=="") {
+ layer.msg("鍐呴儴椤圭洰鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#OrderingCode").val()=="") {
+ layer.msg("Ordering-Code涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#DrawVersionNumber").val() == "") {
+ layer.msg("鍥剧焊鐗堟湰鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#CustomerOrderNumber").val() == "") {
+ layer.msg("瀹㈡埛璁㈠崟鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#WaybillNumber").val() == "") {
+ layer.msg("杩愬崟鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Cj_StationOutBill_Detail/MES_WhiteLabelGeneration", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ Print();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+
+ //鎵撳嵃鎸夐挳
+
+ function Print() {
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HBarCode_Pack").val();
+
+ var sWhere = "exec h_p_Cj_SMRPrintSelect '" + linterid + "'";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ dataPrint.push({ "HBarCode_White": data.data[0]["HBarCode_White"], "PartNo": data.data[0]["PartNo"], "Index": data.data[0]["Index"], "MS-Level": data.data[0]["MS-Level"], "Addinfo": data.data[0]["Addinfo"], "ManPartNo": data.data[0]["ManPartNo"], "PartDescription": data.data[0]["PartDescription"], "ManDate": data.data[0]["ManDate"], "ExpiryDate": data.data[0]["ExpiryDate"], "ManLoc": data.data[0]["ManLoc"], "1Batch": data.data[0]["1Batch"], "2Batch": data.data[0]["2Batch"], "SupplierName": data.data[0]["SupplierName"], "SupplierID": data.data[0]["SupplierID"], "Purchase": data.data[0]["Purchase"], "SupplierData": data.data[0]["SupplierData"], "PackageID": data.data[0]["PackageID"], "ShippingNote": data.data[0]["ShippingNote"]}
+ );
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var report1 = urlAddRandomNo("../../grf/15鐧芥爣鎵撳嵃.grf");
+
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: report1,
+ data: Customer
+ };
+ //var args = {
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ 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_CurrentWork.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_CurrentWork.html"
index 779f2c2..e53a123 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_CurrentWork.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_CurrentWork.html"
@@ -354,6 +354,8 @@
var HEmpName = ""; //鎿嶄綔鍛�
var HManagerName = ""; //璐熻矗浜�
var HGroupName = ""; //鐝粍
+ var HSourceID = 0; //鐢熶骇璧勬簮id
+ var HSourceName = ""; //鐢熶骇璧勬簮
var edit = function (data) {
HBillType = data[0].HBillType;
@@ -367,6 +369,7 @@
HICMOInterID = data[0].HICMOInterID;//鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = data[0].HICMOEntryID;//鐢熶骇璁㈠崟瀛愬唴鐮�
HSourceID = data[0].HSourceID;//鐢熶骇璧勬簮id
+ HSourceName = data[0].HSourceName;//鐢熶骇璧勬簮
HEmpName = data[0].HEmpName;//鎿嶄綔鍛�
HManagerName = data[0].HManagerName;//璐熻矗浜�
HGroupName = data[0].HGroupName;//鐝粍
@@ -406,6 +409,8 @@
$("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
$("#HManagerName").text(HManagerName);//璐熻矗浜�
$("#HGroupName").text(HGroupName);//鐝粍
+ $("#HSourceID").val(HSourceID);//鐢熶骇璧勬簮id
+ $("#HSourceName").val(HSourceName);//鐢熶骇璧勬簮
//#endregion
//#region 銆愪华琛ㄧ洏銆�
--
Gitblit v1.9.1