From 5e5bef3f5b55a7e052f0d271328b1d670b5f9384 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 五月 2022 09:13:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.designer.cs | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx | 12
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_PackingBillList.aspx | 45 +
WebTM/views/grf/包装方式条码.grf | 432 +++++++++---------
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx.cs | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_SPackingBillList.aspx | 46 ++
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 28
WebTM/views/grf/花型条码.grf | 448 ++++++++++---------
/dev/null | 17
WebTM/views/grf/生产单.grf | 107 +++-
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 1
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 23
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 79 +++
WebTM/WebTM.csproj | 28 -
15 files changed, 705 insertions(+), 566 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d625846..28cdb6f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,8 +206,8 @@
<Content Include="views\grf\澧欏挃鏉＄爜.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐢熶骇鍗�.grf" />
<Content Include="views\grf\鐢熶骇鍗�.grf" />
- <Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.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>
@@ -646,10 +646,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList.html" />
@@ -1311,20 +1309,6 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_BZPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_BZPackingBillList.aspx</DependentUpon>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_HXPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_HXPackingBillList.aspx</DependentUpon>
- </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1332,12 +1316,12 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx.cs">
- <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
- <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_WLPackingBillList.aspx.designer.cs">
- <DependentUpon>xmlLBM_QK_WLPackingBillList.aspx</DependentUpon>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
diff --git "a/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf" "b/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf"
index f46da0e..a9a6a86 100644
--- "a/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf"
+++ "b/WebTM/views/grf/\345\214\205\350\243\205\346\226\271\345\274\217\346\235\241\347\240\201.grf"
@@ -1,5 +1,5 @@
锘縊bject Report
- Version='6.0.0.6'
+ Version='6.8.2.5'
Title='鐢熶骇浠诲姟鍗�'
PrintAsDesignPaper=F
Object Font
@@ -33,7 +33,7 @@
Name='鍖呰鏂瑰紡'
End
Item
- Name='澧欏挃缂�'
+ Name='澧欏挃A/U缂�'
End
Item
Name='鏁伴噺'
@@ -50,227 +50,227 @@
Item
Name='鏀惰揣鏂瑰湴鍧�'
End
- End
- End
- Items Column
- Item
- Name='Column3'
- Width=9.49854
- End
- End
- Object ColumnContent
- Height=10.0013
- RowsPerPage=1
- Items ColumnContentCell
- Item
- Column='Column3'
- FreeCell=T
- CanGrow=T
- Items Control
- Item
- Type=FieldBox
- Name='FieldBox1'
- Left=3
- Top=2.5
- Width=2.40771
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鑱旂郴浜�'
- End
- Item
- Type=FieldBox
- Name='FieldBox2'
- Left=3
- Top=3.5
- Width=6.00604
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鍖呰鏂瑰紡'
- End
- Item
- Type=FieldBox
- Name='FieldBox3'
- Left=3
- Top=4.5
- Width=3.20146
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='澧欏挃缂�'
- End
- Item
- Type=FieldBox
- Name='FieldBox4'
- Left=3
- Top=5.5
- Width=2.61938
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鏁伴噺'
- End
- Item
- Type=FieldBox
- Name='FieldBox5'
- Left=3
- Top=6.5
- Width=3.01625
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='绠卞彿'
- End
- Item
- Type=FieldBox
- Name='FieldBox6'
- Left=3
- Top=7.5
- Width=6.00604
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='澶栧寘澶囨敞'
- End
- Item
- Type=Barcode
- Name='Barcode1'
- Left=6.19125
- Top=5.00063
- Width=2.25
- Height=1.79917
- BarcodeType=QRCode
- CaptionPosition=None
- Text='[#璁㈠崟鍙�#]'
- End
- Item
- Type=FieldBox
- Name='FieldBox7'
- Left=5.4
- Top=2.5
- Width=3.59833
- Height=0.608542
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鏀惰揣鏂瑰湴鍧�'
- End
- Item
- Type=FieldBox
- Name='FieldBox8'
- Left=3.01625
- Top=8.14917
- Width=6.00604
- Height=1.03188
- Object Font
- Name='瀹嬩綋'
- Size=105000,0
- Bold=T
- Charset=134
- End
- WordWrap=T
- TextAlign=TopLeft
- DataField='鏀惰揣鏂瑰湴鍧�'
- End
- Item
- Type=FieldBox
- Name='FieldBox9'
- Left=3
- Top=1.5
- Width=6.00604
- Height=0.608542
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='閿�鍞鍗曞彿'
- End
- Item
- Type=MemoBox
- Name='MemoBox1'
- Left=0.79375
- Top=1.5
- Width=2.19604
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- Text='鍗曟嵁缂栧彿锛�'
- End
- Item
- Type=MemoBox
- Name='MemoBox2'
- Left=0.926042
- Top=8.06979
- Width=2.19604
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=105000,0
- Bold=T
- Charset=134
- End
- Text='鏀惰揣鍦板潃锛�'
- End
End
- End
- End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.49854
End
- Object ColumnTitle
- Height=0
- Items ColumnTitleCell
+ End
+Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
Item
- GroupTitle=F
- Column='Column3'
- Text='Column1'
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=3
+ Top=2.5
+ Width=2.40771
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑱旂郴浜�'
End
- End
- End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=3
+ Top=3.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鍖呰鏂瑰紡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=3
+ Top=4.5
+ Width=3.20146
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澧欏挃A/U缂�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=3
+ Top=5.5
+ Width=2.61938
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=3
+ Top=6.5
+ Width=3.01625
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='绠卞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=3
+ Top=7.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澶栧寘澶囨敞'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.19125
+ Top=5.00063
+ Width=2.25
+ Height=1.79917
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Left=5.4
+ Top=2.5
+ Width=3.59833
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=3.01625
+ Top=8.14917
+ Width=6.00604
+ Height=1.03188
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=6.00604
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞鍗曞彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.79375
+ Top=1.5
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曟嵁缂栧彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.926042
+ Top=8.06979
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀惰揣鍦板潃锛�'
+ End
+ End
End
- Items ReportHeader
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
Item
- Name='ReportHeader1'
- Height=0
- RepeatOnPage=T
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
End
End
- Items ReportFooter
- Item
- Name='ReportFooter1'
- Height=0
- 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/grf/\347\224\237\344\272\247\345\215\225.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
index 1492e11..0e24dea 100644
--- "a/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\345\215\225.grf"
@@ -10,14 +10,14 @@
Oriention=Landscape
LeftMargin=1.5
TopMargin=0.5
- RightMargin=1.5
+ RightMargin=1.03188
BottomMargin=0.5
End
Object DetailGrid
Object Recordset
Items Field
Item
- Name='鏃ユ湡'
+ Name='閿�鍞鍗曟棩鏈�'
End
Item
Name='鍗曟嵁缂栧彿'
@@ -30,12 +30,17 @@
End
Item
Name='閿�鍞暟閲�'
+ Type=Float
+ Format='0.#####'
End
Item
Name='璐揣鍗曚綅'
End
Item
- Name='鏀惰揣鏂硅仈绯讳汉'
+ Name='閿�鍞鍗曡仈绯讳汉'
+ End
+ Item
+ Name='閿�鍞鍗曠紪鍙�'
End
End
End
@@ -50,39 +55,43 @@
End
Item
Name='鐗╂枡浠ｇ爜'
- Width=3.99521
+ Width=3.59833
End
Item
Name='鐗╂枡'
- Width=3.41313
+ Width=3.01625
End
Item
Name='瑙勬牸鍨嬪彿'
- Width=3.41313
+ Width=3.175
End
Item
Name='Column2'
- Width=2.61938
+ Width=2.40771
End
Item
Name='Column6'
- Width=2.93688
+ Width=1.61396
End
Item
Name='Column7'
- Width=2.59292
+ Width=2.01083
End
Item
Name='Column8'
- Width=2.19604
+ Width=2.38125
End
Item
Name='Column9'
- Width=2.77813
+ Width=2.40771
+ End
+ Item
+ Name='Column10'
+ Width=2.59292
End
End
Object ColumnContent
- Height=2.59292
+ Height=2.19604
Items ColumnContentCell
Item
Column='搴忓彿'
@@ -111,7 +120,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏃ユ湡'
+ DataField='閿�鍞鍗曟棩鏈�'
End
Item
Column='鐗╂枡浠ｇ爜'
@@ -133,7 +142,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='閿�鍞墿鏂欏悕绉�'
+ DataField='閿�鍞鍗曠紪鍙�'
End
Item
Column='瑙勬牸鍨嬪彿'
@@ -144,7 +153,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鍖呰鏂瑰紡'
+ DataField='閿�鍞墿鏂欏悕绉�'
End
Item
Column='Column2'
@@ -152,15 +161,15 @@
Items Control
Item
Type=FieldBox
- Name='FieldBox1'
+ Name='FieldBox3'
Dock=Fill
Object Font
Name='瀹嬩綋'
Weight=400
Charset=134
End
- TextAlign=MiddleCenter
- DataField='閿�鍞暟閲�'
+ WordWrap=T
+ DataField='鍖呰鏂瑰紡'
End
End
End
@@ -175,9 +184,11 @@
Items Control
Item
Type=FieldBox
- Name='FieldBox2'
+ Name='FieldBox1'
Dock=Fill
- DataField='鏀惰揣鏂硅仈绯讳汉'
+ WordWrap=T
+ TextAlign=MiddleCenter
+ DataField='閿�鍞暟閲�'
End
End
End
@@ -202,15 +213,11 @@
Text='[#鍗曟嵁缂栧彿#]'
End
Item
- Type=Barcode
- Name='Barcode4'
- Left=0.185208
- Top=0.343958
- Width=2.19604
- Height=1.98438
- BarcodeType=QRCode
- CaptionPosition=None
- Text='[#鍗曟嵁缂栧彿#]'
+ Type=FieldBox
+ Name='FieldBox2'
+ Dock=Fill
+ WordWrap=T
+ DataField='閿�鍞鍗曡仈绯讳汉'
End
End
End
@@ -222,9 +229,26 @@
Charset=134
End
FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode5'
+ Left=0.185208
+ Top=0.238125
+ Width=1.95792
+ Height=1.77271
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鍗曟嵁缂栧彿#]'
+ End
+ End
End
Item
Column='Column9'
+ TextAlign=MiddleCenter
+End
+Item
+ Column='Column10'
TextAlign=MiddleCenter
End
End
@@ -253,7 +277,7 @@
Charset=134
End
TextAlign=MiddleCenter
- Text='鏃ユ湡'
+ Text='閿�鍞鍗曟棩鏈�'
End
Item
GroupTitle=F
@@ -277,7 +301,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='閿�鍞墿鏂欏悕绉�'
+ Text='閿�鍞鍗曠紪鍙�'
End
Item
GroupTitle=F
@@ -289,7 +313,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='鍖呰鏂瑰紡'
+ Text='閿�鍞墿鏂欏悕绉�'
End
Item
GroupTitle=F
@@ -301,7 +325,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='閿�鍞暟閲�'
+ Text='鍖呰鏂瑰紡'
End
Item
GroupTitle=F
@@ -313,7 +337,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='鏀惰揣鏂硅仈绯讳汉'
+ Text='閿�鍞暟閲�'
End
Item
GroupTitle=F
@@ -325,7 +349,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='锛堜簩缁寸爜锛�'
+ Text='鑱旂郴浜�'
End
Item
GroupTitle=F
@@ -337,7 +361,7 @@
End
WordWrap=T
TextAlign=MiddleCenter
- Text='宸茬敓浜�'
+ Text='锛堜簩缁寸爜锛�'
End
Item
GroupTitle=F
@@ -348,6 +372,17 @@
Charset=134
End
TextAlign=MiddleCenter
+ Text='宸茬敓浜�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
Text='澶囨敞'
End
End
diff --git "a/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf" "b/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf"
index b5f88f6..5c5c818 100644
--- "a/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf"
+++ "b/WebTM/views/grf/\350\212\261\345\236\213\346\235\241\347\240\201.grf"
@@ -1,5 +1,5 @@
锘縊bject Report
- Version='6.0.0.6'
+ Version='6.8.2.5'
Title='鐢熶骇浠诲姟鍗�'
PrintAsDesignPaper=F
Object Font
@@ -33,7 +33,7 @@
Name='鑺卞瀷'
End
Item
- Name='澧欏挃缂�'
+ Name='澧欏挃A/U缂�'
End
Item
Name='鏁伴噺'
@@ -50,227 +50,245 @@
Item
Name='鏀惰揣鏂瑰湴鍧�'
End
- End
- End
- Items Column
- Item
- Name='Column3'
- Width=9.49854
- End
- End
- Object ColumnContent
- Height=10.0013
- RowsPerPage=1
- Items ColumnContentCell
Item
- Column='Column3'
- FreeCell=T
- CanGrow=T
- Items Control
- Item
- Type=FieldBox
- Name='FieldBox1'
- Left=3
- Top=2.5
- Width=2.40771
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鑱旂郴浜�'
- End
- Item
- Type=FieldBox
- Name='FieldBox2'
- Left=3
- Top=3.5
- Width=5.82083
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鑺卞瀷'
- End
- Item
- Type=FieldBox
- Name='FieldBox3'
- Left=3
- Top=4.5
- Width=3.20146
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='澧欏挃缂�'
- End
- Item
- Type=FieldBox
- Name='FieldBox4'
- Left=3
- Top=5.5
- Width=2.40771
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鏁伴噺'
- End
- Item
- Type=FieldBox
- Name='FieldBox5'
- Left=3
- Top=6.5
- Width=3.01625
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='绠卞彿'
- End
- Item
- Type=FieldBox
- Name='FieldBox6'
- Left=3
- Top=7.5
- Width=6.00604
- Height=0.502708
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='澶栧寘澶囨敞'
- End
- Item
- Type=Barcode
- Name='Barcode1'
- Left=6.19125
- Top=5.00063
- Width=2.25
- Height=1.79917
- BarcodeType=QRCode
- CaptionPosition=None
- Text='[#璁㈠崟鍙�#]'
- End
- Item
- Type=FieldBox
- Name='FieldBox7'
- Left=5.4
- Top=2.5
- Width=3.59833
- Height=0.608542
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='鏀惰揣鏂瑰湴鍧�'
- End
- Item
- Type=FieldBox
- Name='FieldBox8'
- Left=3.01625
- Top=8.12271
- Width=6.00604
- Height=1.03188
- Object Font
- Name='瀹嬩綋'
- Size=105000,0
- Bold=T
- Charset=134
- End
- WordWrap=T
- TextAlign=TopLeft
- DataField='鏀惰揣鏂瑰湴鍧�'
- End
- Item
- Type=FieldBox
- Name='FieldBox9'
- Left=3
- Top=1.5
- Width=5.82083
- Height=0.608542
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- DataField='閿�鍞鍗曞彿'
- End
- Item
- Type=MemoBox
- Name='MemoBox1'
- Left=0.79375
- Top=1.5
- Width=2.19604
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=120000,0
- Bold=T
- Charset=134
- End
- Text='鍗曟嵁缂栧彿锛�'
- End
- Item
- Type=MemoBox
- Name='MemoBox2'
- Left=0.9525
- Top=8.04333
- Width=2.19604
- Height=0.582083
- Object Font
- Name='瀹嬩綋'
- Size=105000,0
- Bold=T
- Charset=134
- End
- Text='鏀惰揣鍦板潃锛�'
- End
+ Name='閿�鍞墿鏂欏悕绉�'
+ End
End
- End
- End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=9.39271
End
- Object ColumnTitle
- Height=0
- Items ColumnTitleCell
+ End
+Object ColumnContent
+ Height=10.0013
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
Item
- GroupTitle=F
- Column='Column3'
- Text='Column1'
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=3
+ Top=2.5
+ Width=2.40771
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑱旂郴浜�'
End
- End
- End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=3
+ Top=4
+ Width=5.82083
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鑺卞瀷'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=3
+ Top=4.5
+ Width=3.20146
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澧欏挃A/U缂�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=3
+ Top=5.5
+ Width=2.40771
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox5'
+ Left=3
+ Top=6.5
+ Width=3.01625
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='绠卞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=3
+ Top=7.5
+ Width=6.00604
+ Height=0.502708
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='澶栧寘澶囨敞'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.19125
+ Top=5.00063
+ Width=2.25
+ Height=1.79917
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#璁㈠崟鍙�#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Left=5.4
+ Top=2.5
+ Width=3.59833
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Left=3.01625
+ Top=8.12271
+ Width=6.00604
+ Height=1.03188
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=TopLeft
+ DataField='鏀惰揣鏂瑰湴鍧�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=3
+ Top=1.5
+ Width=5.82083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞鍗曞彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=0.79375
+ Top=1.5
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曟嵁缂栧彿锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox2'
+ Left=0.9525
+ Top=8.04333
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀惰揣鍦板潃锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=3
+ Top=3.41
+ Width=5.60917
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='閿�鍞墿鏂欏悕绉�'
+ End
+ End
End
- Items ReportHeader
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
Item
- Name='ReportHeader1'
- Height=0
- RepeatOnPage=T
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
End
End
- Items ReportFooter
- Item
- Name='ReportFooter1'
- Height=0
- 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/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 ea60b20..715eca4 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"
@@ -60,6 +60,10 @@
var Type = params[params[1]];
var OpenTmp = params[params[2]];
+ if (OpenTmp =="澧欏挃鏉＄爜") {
+ Type += "1";
+ }
+
switch (Type) {
//case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
@@ -172,23 +176,8 @@
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HSeOrderBillList.aspx?linterid=" + value, true, "");
break;
case "HQKPackBill"://澧欏挃瑁呯鎵撳嵃
- if (OpenTmp =="澧欏挃鏉＄爜") {
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?linterid=" + value, true, "");
- break;
- }
- if (OpenTmp == "鑺卞瀷鏉＄爜") {
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_HXPackingBillList.aspx?linterid=" + value, true, "");
- break;
- }
- if (OpenTmp == "鍖呰鏂瑰紡鏉＄爜") {
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_BZPackingBillList.aspx?linterid=" + value, true, "");
- break;
- }
- if (OpenTmp == "鐗╂枡鍚嶇О鏉＄爜") {
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_WLPackingBillList.aspx?linterid=" + value, true, "");
- break;
- }
-
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
+ break;
}
</script>
</body>
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_QK_BZPackingBillList.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_QK_BZPackingBillList.aspx"
deleted file mode 100644
index 7b1128d..0000000
--- "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_QK_BZPackingBillList.aspx"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_BZPackingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_QK_BZPackingBillList" %>
-
-<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
-
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- var ids = Request.Params["linterid"];
- var idsArray = ids.Split(',');
- var PrintIds = "";
- for (int i = 0; i < idsArray.Length; i++)
- {
- PrintIds += "'" + idsArray[i] + "',";
- }
- PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- SqlXMLReportData.GenOneRecordset(this, "select f.FBILLNO 閿�鍞鍗曞彿,f.F_ZZZZ_TEXT7 鑱旂郴浜�,f.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,m.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,f.F_ZZZZ_TEXT 鍖呰鏂瑰紡,h.FNUMBER 鑺卞瀷," +
- "U1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,f.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
- "from Gy_BarCodeBill a " +
- "left join AIS20200908101915zs..T_SAL_ORDER f on a.HSourceBillNo=f.FBillNo --鐢ㄩ攢鍞〃鐨勭敓浜ц鍗曞彿=鏉＄爜鐨勭敓浜ц鍗曞彿 " +
- "left join AIS20200908101915zs..T_SAL_ORDERENTRY f1 on f.FID=f1.FID " +
- "left join AIS20200908101915zs..T_BD_MATERIAL m on f1.FSUBMATERIALNUMBER=m.FMATERIALID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u1 on f1.F_ZZZZ_ASSISTANT1=u1.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h1 on u1.FENTRYID=h1.FENTRYID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u on f1.F_ZZZZ_TEXT=u.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h on u1.FENTRYID=h.FENTRYID"+
- "where a.HItemID in (" + PrintIds + ")");
- }
- </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_QK_BZPackingBillList.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_QK_BZPackingBillList.aspx.cs"
deleted file mode 100644
index 39c0e19..0000000
--- "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_QK_BZPackingBillList.aspx.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰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_QK_BZPackingBillList : 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_QK_BZPackingBillList.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_QK_BZPackingBillList.aspx.designer.cs"
deleted file mode 100644
index 22378e1..0000000
--- "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_QK_BZPackingBillList.aspx.designer.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘�//------------------------------------------------------------------------------
-// <鑷姩鐢熸垚>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
-// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
-// </鑷姩鐢熸垚>
-//------------------------------------------------------------------------------
-
-namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
-{
-
-
- public partial class xmlLBM_QK_BZPackingBillList
- {
-
- /// <summary>
- /// form1 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
- }
-}
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_QK_HXPackingBillList.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_QK_HXPackingBillList.aspx"
deleted file mode 100644
index 4506886..0000000
--- "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_QK_HXPackingBillList.aspx"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_HXPackingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_QK_HXPackingBillList" %>
-
-<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
-
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- var ids = Request.Params["linterid"];
- var idsArray = ids.Split(',');
- var PrintIds = "";
- for (int i = 0; i < idsArray.Length; i++)
- {
- PrintIds += "'" + idsArray[i] + "',";
- }
- PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- SqlXMLReportData.GenOneRecordset(this, "select f.FBILLNO 閿�鍞鍗曞彿,f.F_ZZZZ_TEXT7 鑱旂郴浜�,f.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,m.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,f.F_ZZZZ_TEXT 鍖呰鏂瑰紡,h.FNUMBER 鑺卞瀷," +
- "U1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,f.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
- "from Gy_BarCodeBill a " +
- "left join AIS20200908101915zs..T_SAL_ORDER f on a.HSourceBillNo=f.FBillNo --鐢ㄩ攢鍞〃鐨勭敓浜ц鍗曞彿=鏉＄爜鐨勭敓浜ц鍗曞彿 " +
- "left join AIS20200908101915zs..T_SAL_ORDERENTRY f1 on f.FID=f1.FID " +
- "left join AIS20200908101915zs..T_BD_MATERIAL m on f1.FSUBMATERIALNUMBER=m.FMATERIALID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u1 on f1.F_ZZZZ_ASSISTANT1=u1.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h1 on u1.FENTRYID=h1.FENTRYID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u on f1.F_ZZZZ_TEXT=u.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h on u1.FENTRYID=h.FENTRYID"+
- "where a.HItemID in (" + PrintIds + ")");
- }
- </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_QK_HXPackingBillList.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_QK_HXPackingBillList.aspx.designer.cs"
deleted file mode 100644
index 3ff48b2..0000000
--- "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_QK_HXPackingBillList.aspx.designer.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘�//------------------------------------------------------------------------------
-// <鑷姩鐢熸垚>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
-// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
-// </鑷姩鐢熸垚>
-//------------------------------------------------------------------------------
-
-namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
-{
-
-
- public partial class xmlLBM_QK_HXPackingBillList
- {
-
- /// <summary>
- /// form1 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
- }
-}
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_QK_PackingBillList.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_QK_PackingBillList.aspx"
index 89d7553..b73c6f5 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_QK_PackingBillList.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_QK_PackingBillList.aspx"
@@ -4,18 +4,19 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- var ids = Request.Params["linterid"];
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ var ids = Request.Params["linterid"];
+ var type=Request.Params["typename"].ToString();
var idsArray = ids.Split(',');
var PrintIds = "";
for (int i = 0; i < idsArray.Length; i++)
@@ -23,9 +24,27 @@
PrintIds += "'" + idsArray[i] + "',";
}
PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in ("+ PrintIds+")");
- }
-</script>
+
+ if (type.Trim()=="澧欏挃鏉＄爜")
+ {
+ SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
+ }
+ else
+ {
+ SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�," +
+ "fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
+ "from Gy_BarCodeBill a " +
+ "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
+ "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
+ "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
+ "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
+ "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
+ "where a.HItemID in (" + PrintIds + ")");
+ }
+ }
+ </script>
</head>
<body>
<form id="form1" runat="server">
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_QK_SPackingBillList.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_QK_SPackingBillList.aspx"
new file mode 100644
index 0000000..ada0806
--- /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_QK_SPackingBillList.aspx"
@@ -0,0 +1,46 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_SPackingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_QK_SPackingBillList" %>
+
+<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ var ids = Request.Params["linterid"];
+ var idsArray = ids.Split(',');
+ var PrintIds = "";
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ PrintIds += "'" + idsArray[i] + "',";
+ }
+ PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
+ SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�," +
+ "fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
+ "from Gy_BarCodeBill a " +
+ "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
+ "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
+ "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
+ "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
+ "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
+ "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
+ "where a.HItemID in (" + PrintIds + ")");
+ }
+ </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_QK_HXPackingBillList.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_QK_SPackingBillList.aspx.cs"
similarity index 79%
rename from "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_QK_HXPackingBillList.aspx.cs"
rename to "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_QK_SPackingBillList.aspx.cs"
index 21a78bc..7a73b19 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_QK_HXPackingBillList.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_QK_SPackingBillList.aspx.cs"
@@ -7,7 +7,7 @@
namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
{
- public partial class xmlLBM_QK_HXPackingBillList : System.Web.UI.Page
+ public partial class xmlLBM_QK_SPackingBillList : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
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_QK_WLPackingBillList.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_QK_SPackingBillList.aspx.designer.cs"
similarity index 93%
rename from "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_QK_WLPackingBillList.aspx.designer.cs"
rename to "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_QK_SPackingBillList.aspx.designer.cs"
index 255b9e0..60a5d35 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_QK_WLPackingBillList.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_QK_SPackingBillList.aspx.designer.cs"
@@ -11,7 +11,7 @@
{
- public partial class xmlLBM_QK_WLPackingBillList
+ public partial class xmlLBM_QK_SPackingBillList
{
/// <summary>
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_QK_WLPackingBillList.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_QK_WLPackingBillList.aspx"
deleted file mode 100644
index 3dde260..0000000
--- "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_QK_WLPackingBillList.aspx"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_QK_WLPackingBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_QK_WLPackingBillList" %>
-
-<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
-
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- var ids = Request.Params["linterid"];
- var idsArray = ids.Split(',');
- var PrintIds = "";
- for (int i = 0; i < idsArray.Length; i++)
- {
- PrintIds += "'" + idsArray[i] + "',";
- }
- PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
- SqlXMLReportData.GenOneRecordset(this, "select f.FBILLNO 閿�鍞鍗曞彿,f.F_ZZZZ_TEXT7 鑱旂郴浜�,f.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,m.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,f.F_ZZZZ_TEXT 鍖呰鏂瑰紡,h.FNUMBER 鑺卞瀷," +
- "U1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,f.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
- "from Gy_BarCodeBill a " +
- "left join AIS20200908101915zs..T_SAL_ORDER f on a.HSourceBillNo=f.FBillNo --鐢ㄩ攢鍞〃鐨勭敓浜ц鍗曞彿=鏉＄爜鐨勭敓浜ц鍗曞彿 " +
- "left join AIS20200908101915zs..T_SAL_ORDERENTRY f1 on f.FID=f1.FID " +
- "left join AIS20200908101915zs..T_BD_MATERIAL m on f1.FSUBMATERIALNUMBER=m.FMATERIALID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u1 on f1.F_ZZZZ_ASSISTANT1=u1.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h1 on u1.FENTRYID=h1.FENTRYID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L u on f1.F_ZZZZ_TEXT=u.FPKID " +
- "left join AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY h on u1.FENTRYID=h.FENTRYID"+
- "where a.HItemID in (" + PrintIds + ")");
- }
- </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_QK_WLPackingBillList.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_QK_WLPackingBillList.aspx.cs"
deleted file mode 100644
index 89406cb..0000000
--- "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_QK_WLPackingBillList.aspx.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰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_QK_WLPackingBillList : 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_Sc_ICMOBillList.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_Sc_ICMOBillList.aspx"
index e5ec06c..88148db 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_Sc_ICMOBillList.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_Sc_ICMOBillList.aspx"
@@ -23,15 +23,15 @@
PrintIds += "'" + idsArray[i] + "',";
}
PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
-
- string sql = string.Format(@"select convert(varchar,f.FSalOrderDate ,23) 閿�鍞鍗曟棩鏈�,a.HBillNo 鍗曟嵁缂栧彿,f.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f.F_zzzz_Text4 閿�鍞墿鏂欏悕绉�,f.F_zzzz_Text1 閿�鍞鍗曡仈绯讳汉,
- f.F_BZFS 鍖呰鏂瑰紡,b.HQty 閿�鍞暟閲�,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) 涓诲瓙鍗曞彿
+ LogService.Write(PrintIds);
+ string sql = string.Format(@"select convert(varchar,f1.FSalOrderDate ,23) 閿�鍞鍗曟棩鏈�,a.HBillNo 鍗曟嵁缂栧彿,f1.F_YQN_XSDD 閿�鍞鍗曠紪鍙�, f1.F_zzzz_Text4 閿�鍞墿鏂欏悕绉�,f1.F_ZZZZ_XSDDLXR 閿�鍞鍗曡仈绯讳汉,f1.F_BZFS 鍖呰鏂瑰紡,b.HQty 閿�鍞暟閲�,convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) 涓诲瓙鍗曞彿
from Sc_ICMOBillMain a
left join Sc_ICMOBillSub b on a.HInterID=b.HInterID
- left join AIS20200908101915zs..T_PRD_MOENTRY f on b.HERPInterID=f.FID
+ left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
+ left join AIS20200908101915zs..T_PRD_MO f on f1.FID=f.FID
left join Xs_SeOrderBillMain x on a.HSeOrderInterID=x.HInterID
- where convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by a.HInterID desc");
-
+ where convert(varchar(50),a.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ("+ PrintIds+") order by b.HEntryID");
+ LogService.Write(sql);
SqlXMLReportData.GenOneRecordset(this, sql);
}
</script>
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 1299684..893e3eb 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"
@@ -69,7 +69,32 @@
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+ <option value="0" selected>鍏ㄩ儴</option>
+ <option value="璁″垝">璁″垝</option>
+ <option value="璁″垝纭">璁″垝纭</option>
+ <option value="涓嬭揪">涓嬭揪</option>
+ <option value="寮�宸�">寮�宸�</option>
+ <option value="瀹屽伐">瀹屽伐</option>
+ <option value="缁撴">缁撴</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillType" id="HBillType">
</div>
</div>
<div class="layui-inline">
@@ -123,7 +148,27 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;">鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" selected>' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
//#endregion
@@ -200,13 +245,13 @@
, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, hide: true }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 120 }
- , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 120 }
- , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 120 }
- , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 120 }
- , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 120 }
- , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 120 }
+ , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
+ , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
+ , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
+ , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
+ , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
+ , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
, { field: 'HDeptID', title: 'HDeptID', hide: true}
@@ -298,8 +343,10 @@
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
+ var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
+ var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
+ var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
@@ -312,11 +359,17 @@
if (WorkCenter) {
sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
- if (HDeptName) {
- sWhere += " and 鐢熶骇杞﹂棿 like '%" + HDeptName + "%'";
- }
if (HMaterName) {
sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
+ }
+ if (HDeptName && HDeptName!=0) {
+ sWhere += " and HDeptID = " + HDeptName ;
+ }
+ if (HStatus && HStatus != 0) {
+ sWhere += " and 涓氬姟鐘舵�� like '%" + HStatus + "%'";
+ }
+ if (HBillType) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillType + "%'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -331,6 +384,8 @@
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#HDeptName").val("");//鍗曟嵁鍙�
$("#HMaterName").val("");//鍗曟嵁鍙�
+ $("#HDeptName").val("");//鍗曟嵁鍙�
+ $("#HStatus").val("");//鍗曟嵁鍙�
$("#btnSearch").click();
sWhere = "";
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 5a8abc4..8eba67b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -111,6 +111,13 @@
form.on('submit(btnPack)', function (data) {
var flag = "ZZ";
var sSubStr = table.checkStatus('mainTable');
+ if (sSubStr.data.length > 0) {
+ SavePack(flag, sSubStr);
+ }
+ else {
+ layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
+ return;
+ }
SavePack(flag, sSubStr);
});
//鎷肩鐢熸垚
@@ -158,6 +165,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
, { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -221,16 +229,16 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var PrintIds = data.code;
PrintIds = PrintIds.substring(0, PrintIds.length - 1);
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + PrintIds + '&Type=HQKPackBill', 'yes']
- , resize: false
- })
+ var Type = "HQKPackBill";
+ var OpenTmp = "";
+ if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" || sSubStr.data[0].FMaterName != "")) {
+ OpenTmp = "鑺卞瀷鏉＄爜";
+ }
+ else {
+ OpenTmp = "鍖呰鏂瑰紡鏉＄爜";
+ }
+ window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
}
else {
f_alert(data.Message);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 30bd422..5f832d2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -141,6 +141,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 52e621d..144a74b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -148,6 +148,7 @@
<label class="layui-form-label">瀹屾垚鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="" selected>鍏ㄩ儴</option>
<option value="鏈畬鎴�" selected>鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
--
Gitblit v1.9.1