From a4b33d7b8dadde16b41213c1c062979cbda4c6dd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 25 九月 2024 10:05:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/App_Data/MssqlReportData.cs | 1
WebTM/WebTM.csproj.user | 28 -
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 8
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 36 +
WebTM/views/grf/流转卡JSON.grf | 662 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 12
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 12
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx | 17
WebTM/layuiadmin/PageTitle.js | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 108 ++++++
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 4
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 24 +
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 12
WebTM/WebTM.csproj | 10
15 files changed, 869 insertions(+), 69 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index f7325a6..1900127 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -31,6 +31,7 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
+ //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娣诲悍绉戞妧
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7028172..6e940fe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -368,6 +368,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" />
@@ -537,6 +538,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
@@ -1111,6 +1113,7 @@
<Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�.grf" />
<Content Include="views\grf\鍙栨牱鍗�.grf" />
+ <Content Include="views\grf\浠撲綅鏍囩.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -2233,6 +2236,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/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..502622a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -12,29 +12,5 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
- <WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
- <AspNetDebugging>True</AspNetDebugging>
- <SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
- <SQLDebugging>False</SQLDebugging>
- <ExternalProgram>
- </ExternalProgram>
- <StartExternalURL>
- </StartExternalURL>
- <StartCmdLineArguments>
- </StartCmdLineArguments>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <EnableENC>True</EnableENC>
- <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
- </WebProjectProperties>
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
+ <ProjectExtensions />
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/PageTitle.js b/WebTM/layuiadmin/PageTitle.js
index fec07c5..1f54492 100644
--- a/WebTM/layuiadmin/PageTitle.js
+++ b/WebTM/layuiadmin/PageTitle.js
@@ -5,7 +5,7 @@
$.ajax({
type: "GET",
async: false,
- url: GetWEBURL() + "Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HModuleType": HModuleType },
success: function (result) {
if (result.count == 1) {
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 94e7b45..f5895a2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/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:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
new file mode 100644
index 0000000..6139831
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
@@ -0,0 +1,662 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":11,
+ "Width":14.8,
+ "Height":21,
+ "Oriention":"Landscape",
+ "LeftMargin":1.5,
+ "TopMargin":1.5,
+ "RightMargin":1.5,
+ "BottomMargin":1.5
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd"
+ },
+ {
+ "Name":"鐢熶骇璁㈠崟鍙�"
+ },
+ {
+ "Name":"娲惧伐鍗曞彿"
+ },
+ {
+ "Name":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Name":"浜у搧浠ｇ爜"
+ },
+ {
+ "Name":"浜у搧鍚嶇О"
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "Name":"娴佽浆鍗℃暟閲�"
+ },
+ {
+ "Name":"鍗℃暟閲�"
+ },
+ {
+ "Name":"鎵瑰彿"
+ },
+ {
+ "Name":"娴佹按鍙�"
+ },
+ {
+ "Name":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Name":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Name":"鐝粍"
+ },
+ {
+ "Name":"鏈哄彴"
+ },
+ {
+ "Name":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Name":"宸ュ簭璇存槑"
+ },
+ {
+ "Name":"鐝彿"
+ },
+ {
+ "Name":"宸ユ鍚嶇О"
+ },
+ {
+ "Name":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Name":"宸ヨ壓宸ヨ壓鍙傛暟"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column14",
+ "Width":1.16417
+ },
+ {
+ "Name":"Column1",
+ "Width":2.01083
+ },
+ {
+ "Name":"Column2",
+ "Width":2.40771
+ },
+ {
+ "Name":"Column16",
+ "Width":2.19604
+ },
+ {
+ "Name":"Column3",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column8",
+ "Width":2.59292
+ },
+ {
+ "Name":"Column9",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column12",
+ "Width":3.22792
+ },
+ {
+ "Name":"Column15",
+ "Width":1.98438
+ }
+ ],
+ "ColumnContent":{
+ "Height":1.19063,
+ "AdjustRowHeight":false,
+ "RowsPerPage":6,
+ "ColumnContentCell":[
+ {
+ "Column":"Column14",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox3",
+ "Left":0.5,
+ "Top":-0.8,
+ "Width":1.5875,
+ "Height":0.608542,
+ "SystemVar":"RowNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox14",
+ "Dock":"Fill",
+ "DataField":"娴佹按鍙�"
+ }
+ ]
+ },
+ {
+ "Column":"Column1",
+ "DataField":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Column":"Column2",
+ "CanGrow":true,
+ "CanShrink":true,
+ "ShrinkFontToFit":true,
+ "DataField":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Column":"Column16",
+ "DataField":"宸ユ鍚嶇О"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"鐝粍"
+ },
+ {
+ "Column":"Column8",
+ "WordWrap":true,
+ "DataField":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Column":"Column9",
+ "WordWrap":true,
+ "ShrinkFontToFit":true,
+ "DataField":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Column":"Column12",
+ "DataField":"宸ヨ壓宸ヨ壓鍙傛暟"
+ },
+ {
+ "Column":"Column15",
+ "DataField":"鐝彿"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":1.19063,
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column14",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍙�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column16",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ユ鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝粍"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鏈哄彴"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"瀹炰綔鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column12",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭璇存槑"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column15",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝彿"
+ }
+ ]
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"椤电爜"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "CanGrow":true,
+ "CanShrink":true,
+ "Height":4.60375,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Center":"Horizontal",
+ "Left":7.96396,
+ "Width":2.06375,
+ "Height":0.687917,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":180000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"娴佽浆鍗�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":10.6098,
+ "Top":2.19604,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":4.39208,
+ "Top":1.00542,
+ "Width":2.98979,
+ "Height":0.608542,
+ "TextAlign":"MiddleCenter",
+ "Text":"QC妫�鏌ユ柟寮忥細"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":5.3975,
+ "Top":2.19604,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Text":"鏃ユ湡锛�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":12.1973,
+ "Top":2.19604,
+ "Width":3.99521,
+ "Height":0.608542,
+ "DataField":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":6.40292,
+ "Top":2.19604,
+ "Width":3.78354,
+ "Height":0.608542,
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox1",
+ "Left":15.6104,
+ "Top":1.40229,
+ "Width":1.79917,
+ "Height":0.423333,
+ "Format":"鍏�0椤�",
+ "SystemVar":"PageCount"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox2",
+ "Left":14.3933,
+ "Top":1.40229,
+ "Width":1.21708,
+ "Height":0.423333,
+ "Format":"绗�0椤�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox18",
+ "Left":0.211667,
+ "Top":2.98979,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"浜у搧浠ｇ爜锛�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox19",
+ "Left":0.211667,
+ "Top":2.19604,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"娲惧伐鍗�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox9",
+ "Left":1.5875,
+ "Top":2.19604,
+ "Width":3.20146,
+ "Height":0.582083,
+ "DataField":"娲惧伐鍗曞彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox10",
+ "Left":1.79917,
+ "Top":2.98979,
+ "Width":2.80458,
+ "Height":0.608542,
+ "DataField":"浜у搧浠ｇ爜"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox21",
+ "Left":10.6098,
+ "Top":3.81,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"鎵规锛�"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":12.2502,
+ "Top":0.899583,
+ "Width":1.98438,
+ "Height":1.21708,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "CaptionAlignment":"Far",
+ "CheckSum":true,
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox11",
+ "Left":11.8004,
+ "Top":3.81,
+ "Width":4.60375,
+ "Height":0.582083,
+ "DataField":"鎵瑰彿"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode2",
+ "Left":0.211667,
+ "Top":0.608542,
+ "Width":2.59292,
+ "Height":1.40229,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":12.0121,
+ "Top":0.211667,
+ "Width":1.79917,
+ "Height":0.582083,
+ "Text":"娴佽浆鍗″彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox13",
+ "Left":13.8113,
+ "Top":0.211667,
+ "Width":4.20688,
+ "Height":0.582083,
+ "DataField":"鍗曟嵁鍙�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox24",
+ "Left":0.211667,
+ "Width":5.79438,
+ "Height":0.582083,
+ "Text":"浠诲姟鍗曞彿锛歔#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox25",
+ "Left":7.19667,
+ "Top":1.00542,
+ "Width":1.19063,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox1",
+ "Left":8.38729,
+ "Top":1.00542,
+ "Width":0.608542,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox26",
+ "Left":9.2075,
+ "Top":1.00542,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox2",
+ "Left":10.2129,
+ "Top":1.00542,
+ "Width":0.79375,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox27",
+ "Left":5.3975,
+ "Top":2.98979,
+ "Width":4.60375,
+ "Height":0.608542,
+ "Text":"浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox28",
+ "Left":10.6098,
+ "Top":2.98979,
+ "Width":6.21771,
+ "Height":0.608542,
+ "Text":"瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox29",
+ "Left":0.211667,
+ "Top":3.81,
+ "Width":5.18583,
+ "Height":0.608542,
+ "Text":"鐢熶骇鏁伴噺锛歔#娴佽浆鍗℃暟閲�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox30",
+ "Left":5.3975,
+ "Top":3.81,
+ "Width":3.99521,
+ "Height":0.608542,
+ "Text":"鍗℃暟閲忥細[#娴佽浆鍗℃暟閲�#]"
+ }
+ ],
+ "RepeatOnPage":true
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Dock":"Left",
+ "Border":{
+ "Styles":"[DrawLeft|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":7,
+ "RowCount":2,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":3.175
+ },
+ {
+ "index":2,
+ "Width":2.38125
+ },
+ {
+ "index":3,
+ "Width":2.2225
+ },
+ {
+ "index":4,
+ "Width":1.16417
+ },
+ {
+ "index":5,
+ "Width":2.61938
+ },
+ {
+ "index":6,
+ "Width":1.19063
+ },
+ {
+ "index":7,
+ "Width":5.2123
+ }
+ ],
+ "FreeGridRow":[
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"鍏ュ簱璁板綍"
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"棰嗙敤璁板綍"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ 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" "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"
index d12ecb6..3d2b490 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/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"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList4" %>
<!DOCTYPE html>
@@ -7,14 +7,15 @@
<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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ 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"] + ")");
- }
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")","select 1");
+ }
</script>
</head>
<body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index f5507d6..7813033 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -415,10 +415,10 @@
com = "like '%" + ColContent + "%'";
break;
case "8":
- com = "like '%" + ColContent + "'";
+ com = "like '" + ColContent + "%'";
break;
case "9":
- com = "like '" + ColContent + "%'";
+ com = "like '%" + ColContent + "'";
break;
case "10":
com = "not like '%" + ColContent + "%'";
@@ -437,10 +437,10 @@
com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like '%" + ColContent1 + "'";
+ com = "like '" + ColContent1 + "%'";
break;
case "9":
- com1 = "like '" + ColContent1 + "%'";
+ com = "like '%" + ColContent1 + "'";
break;
case "10":
com1 = "not like '%" + ColContent1 + "%'";
@@ -459,10 +459,10 @@
com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like '%" + ColContent2 + "'";
+ com = "like '" + ColContent2 + "%'";
break;
case "9":
- com2 = "like '" + ColContent2 + "%'";
+ com = "like '%" + ColContent2 + "'";
break;
case "10":
com2 = "not like '%" + ColContent2 + "%'";
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 0941ea2..5d58e4d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -92,7 +92,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍐插埡鏁�</label>
+ <label class="layui-form-label">淇濆吇鍐插埡鏁�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HUseQtys" id="HUseQtys" class="layui-input" value="0">
</div>
@@ -100,19 +100,19 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
</div>
@@ -878,6 +878,22 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HUseQtys").val() == '' || $("#HUseQtys").val() == null) {
+ layer.msg("淇濆吇鍐插埡鏁颁笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarQtys").val() == '' || $("#HErrWarQtys").val() == null) {
+ layer.msg("淇濆吇棰勮娆℃暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index a6177a4..f77c1dc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -634,15 +634,15 @@
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
, { field: 'HSNO', title: '宸ヨ壓娆″簭', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
- , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
+ , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', hide: true, width: 130, edit: 'text', event: "HTechParamIDStdName" }
+ , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', hide: true, width: 130, edit: 'text' }
, { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
, { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -1774,7 +1774,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HTechParamID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟淇℃伅涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟浠ｇ爜/鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index 3ae6539..d89e0a8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -53,13 +53,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="1">
</div>
@@ -922,6 +922,14 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 344642a..2d998dd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -657,9 +657,10 @@
series: [
{
name: '宸ユ枡鐜�',
- type: 'line',
+ type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
@@ -675,7 +676,8 @@
name: '鏂欏簾鐜�',
type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
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"
index dc35223..541bec2 100644
--- "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"
@@ -344,7 +344,12 @@
layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
return;
}
- }
+ }
+
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
//鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
$("#HBarCode_P").removeAttr("disabled"); //浜у搧鐮佹枃鏈鍚敤
@@ -361,6 +366,20 @@
//娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
option.data = [];
table.render(option);
+
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.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")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
//鍘嗗彶缁戝畾璁板綍鏌ヨ
//get_Display();
@@ -493,13 +512,13 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
//鎶婃渶鍚庝竴涓骇鍝佺殑缁戝畾淇℃伅鍐欏叆鍒板巻鍙茶褰曟槑缁嗙綉鏍�
- for (var i = 0; i < option.data.length; i++) {
- option_detail.data.push(option.data[i])
- }
+ //for (var i = 0; i < option.data.length; i++) {
+ // option_detail.data.push(option.data[i])
+ //}
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(option_detail.data);
+ var sSubStr = JSON.stringify(option.data);
//鎷兼帴鍙傛暟
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
@@ -512,7 +531,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ layer.msg(data.Message, { icon: 1, time: 1000 });
$("#btnSave").addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
@@ -743,7 +762,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
option.data[rowIndex].HBarCode = "";
- option.data[rowIndex].HBindingQty = option.data[rowIndex].HBindingQty - 1;
+ option.data[rowIndex].HBindingQty = 0;
//option.data[rowIndex].HMaterID = 0;
option.data[rowIndex].HMaterNumber = "";
option.data[rowIndex].HMaterName = "";
@@ -930,6 +949,9 @@
return Result = false;
}
}
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
return true;
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 76b7386..c09b00b 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"
@@ -16,6 +16,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
.layui-form-item .layui-inline {
margin-right: 0;
@@ -51,7 +52,8 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_Print" disabled>鎵撳嵃</button>
+ <button type="button" id="batchPrint-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵归噺鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -239,10 +241,15 @@
});
//鎵撳嵃
+ form.on('submit(get_Print)', function () {
+ get_Print();
+ })
+
+ //鎵归噺鎵撳嵃
form.on('submit(get_BatchPrint)', function () {
get_BatchPrint();
})
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
@@ -267,7 +274,8 @@
, { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍐呯爜', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -291,7 +299,7 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
+ "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
, "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
@@ -332,7 +340,8 @@
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
- , "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
+ , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
, "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
@@ -352,6 +361,7 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿鍐呯爜', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -439,6 +449,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
+ $('#batchPrint-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵归噺鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
@@ -499,7 +510,7 @@
}
//鎵撳嵃
- function get_BatchPrint() {
+ function get_Print() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
@@ -525,6 +536,91 @@
}
}
+
+ //鎵归噺鎵撳嵃
+ var time;
+ var num = 0;
+ function get_BatchPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length > 0) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL(data);
+ }, 1000);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function dy_PL(rest) {
+ var HInterID = rest[num].HInterID.toString();
+ var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鍗曟嵁鍙�);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 74083ab..5afe216 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -1314,7 +1314,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1