diff --git a/InjectionPC/bin/Debug/111.jpg b/InjectionPC/bin/Debug/111.jpg
deleted file mode 100644
index 390825c..0000000
Binary files a/InjectionPC/bin/Debug/111.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101110668.jpg b/InjectionPC/bin/Debug/20200409101110668.jpg
deleted file mode 100644
index cc8b4ee..0000000
Binary files a/InjectionPC/bin/Debug/20200409101110668.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101203760.jpg b/InjectionPC/bin/Debug/20200409101203760.jpg
deleted file mode 100644
index 2fc2951..0000000
Binary files a/InjectionPC/bin/Debug/20200409101203760.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101239287.jpg b/InjectionPC/bin/Debug/20200409101239287.jpg
deleted file mode 100644
index b8a0da1..0000000
Binary files a/InjectionPC/bin/Debug/20200409101239287.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101302351.jpg b/InjectionPC/bin/Debug/20200409101302351.jpg
deleted file mode 100644
index 9cec741..0000000
Binary files a/InjectionPC/bin/Debug/20200409101302351.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101336198.jpg b/InjectionPC/bin/Debug/20200409101336198.jpg
deleted file mode 100644
index e384fdb..0000000
Binary files a/InjectionPC/bin/Debug/20200409101336198.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101358689.jpg b/InjectionPC/bin/Debug/20200409101358689.jpg
deleted file mode 100644
index bd98132..0000000
Binary files a/InjectionPC/bin/Debug/20200409101358689.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101415939.jpg b/InjectionPC/bin/Debug/20200409101415939.jpg
deleted file mode 100644
index d89a601..0000000
Binary files a/InjectionPC/bin/Debug/20200409101415939.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101433115.jpg b/InjectionPC/bin/Debug/20200409101433115.jpg
deleted file mode 100644
index c61ebea..0000000
Binary files a/InjectionPC/bin/Debug/20200409101433115.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101453961.jpg b/InjectionPC/bin/Debug/20200409101453961.jpg
deleted file mode 100644
index 9a34d41..0000000
Binary files a/InjectionPC/bin/Debug/20200409101453961.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101528193.jpg b/InjectionPC/bin/Debug/20200409101528193.jpg
deleted file mode 100644
index 10cf391..0000000
Binary files a/InjectionPC/bin/Debug/20200409101528193.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101721499.jpg b/InjectionPC/bin/Debug/20200409101721499.jpg
deleted file mode 100644
index 05cbfed..0000000
Binary files a/InjectionPC/bin/Debug/20200409101721499.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101742479.jpg b/InjectionPC/bin/Debug/20200409101742479.jpg
deleted file mode 100644
index 6cd398f..0000000
Binary files a/InjectionPC/bin/Debug/20200409101742479.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409101816687.jpg b/InjectionPC/bin/Debug/20200409101816687.jpg
deleted file mode 100644
index 0a3b405..0000000
Binary files a/InjectionPC/bin/Debug/20200409101816687.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102046858.jpg b/InjectionPC/bin/Debug/20200409102046858.jpg
deleted file mode 100644
index 6cd398f..0000000
Binary files a/InjectionPC/bin/Debug/20200409102046858.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102106578.jpg b/InjectionPC/bin/Debug/20200409102106578.jpg
deleted file mode 100644
index 0a3b405..0000000
Binary files a/InjectionPC/bin/Debug/20200409102106578.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102128199.jpg b/InjectionPC/bin/Debug/20200409102128199.jpg
deleted file mode 100644
index 12d2fea..0000000
Binary files a/InjectionPC/bin/Debug/20200409102128199.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102256514.jpg b/InjectionPC/bin/Debug/20200409102256514.jpg
deleted file mode 100644
index a4072fb..0000000
Binary files a/InjectionPC/bin/Debug/20200409102256514.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102317285.jpg b/InjectionPC/bin/Debug/20200409102317285.jpg
deleted file mode 100644
index 4d4a3fe..0000000
Binary files a/InjectionPC/bin/Debug/20200409102317285.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102336525.jpg b/InjectionPC/bin/Debug/20200409102336525.jpg
deleted file mode 100644
index c742fc7..0000000
Binary files a/InjectionPC/bin/Debug/20200409102336525.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102359888.jpg b/InjectionPC/bin/Debug/20200409102359888.jpg
deleted file mode 100644
index 7890313..0000000
Binary files a/InjectionPC/bin/Debug/20200409102359888.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102417006.jpg b/InjectionPC/bin/Debug/20200409102417006.jpg
deleted file mode 100644
index 9327b44..0000000
Binary files a/InjectionPC/bin/Debug/20200409102417006.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20200409102432446.jpg b/InjectionPC/bin/Debug/20200409102432446.jpg
deleted file mode 100644
index 390825c..0000000
Binary files a/InjectionPC/bin/Debug/20200409102432446.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/20230531092236102.jpg b/InjectionPC/bin/Debug/20230531092236102.jpg
deleted file mode 100644
index 734c144..0000000
Binary files a/InjectionPC/bin/Debug/20230531092236102.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/86511-BU000.jpg b/InjectionPC/bin/Debug/86511-BU000.jpg
deleted file mode 100644
index 80efbbc..0000000
Binary files a/InjectionPC/bin/Debug/86511-BU000.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/86611-F0000.jpg b/InjectionPC/bin/Debug/86611-F0000.jpg
deleted file mode 100644
index 60b466e..0000000
Binary files a/InjectionPC/bin/Debug/86611-F0000.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/Box.grf b/InjectionPC/bin/Debug/Box.grf
deleted file mode 100644
index 0bf0c01..0000000
--- a/InjectionPC/bin/Debug/Box.grf
+++ /dev/null
@@ -1,352 +0,0 @@
-{
- "Version":"6.6.0.2",
- "SharePrintSetupOptions":"[SelectedPrinter]",
- "Font":{
- "Name":"宋体",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Printer":{
- "Size":256,
- "Width":8.8,
- "Height":10,
- "Oriention":"Landscape",
- "LeftMargin":0,
- "TopMargin":0,
- "RightMargin":0,
- "BottomMargin":0
- },
- "Parameter":[
- {
- "Name":"BarCode"
- },
- {
- "Name":"BatchNo"
- },
- {
- "Name":"Qty"
- }
- ],
- "ReportHeader":[
- {
- "Name":"ReportHeader1",
- "Height":8.99583,
- "Control":[
- {
- "Type":"Line",
- "Name":"Line1",
- "Left":0.211667,
- "Top":0.132292,
- "Height":8.78417
- },
- {
- "Type":"Line",
- "Name":"Line2",
- "Left":9.78958,
- "Top":0.13,
- "Height":8.78
- },
- {
- "Type":"Line",
- "Name":"Line3",
- "Left":2.19604,
- "Top":0.13,
- "Height":8.78
- },
- {
- "Type":"Line",
- "Name":"Line4",
- "Left":0.211667,
- "Top":0.132292,
- "Width":9.57792
- },
- {
- "Type":"Line",
- "Name":"Line5",
- "Left":0.211667,
- "Top":8.89,
- "Width":9.57792
- },
- {
- "Type":"Line",
- "Name":"Line6",
- "Left":0.211667,
- "Top":1.32292,
- "Width":9.57792
- },
- {
- "Type":"Line",
- "Name":"Line7",
- "Left":0.211667,
- "Top":2.96333,
- "Width":9.57792
- },
- {
- "Type":"Line",
- "Name":"Line8",
- "Left":0.211667,
- "Top":4.28625,
- "Width":9.57792
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox1",
- "Left":0.396875,
- "Top":0.291042,
- "Width":1.61396,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"包装单号"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox1",
- "Left":2.32833,
- "Top":0.291042,
- "Width":7.3025,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Text":"[#{BarCode}#]"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox2",
- "Left":0.396875,
- "Top":1.56104,
- "Width":1.61396,
- "Height":1.05833,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"物料描述"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox3",
- "Left":2.40771,
- "Top":1.56104,
- "Width":6.985,
- "Height":1.00542,
- "Font":{
- "Name":"微软雅黑",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Text":"V214行李槽总成"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox4",
- "Left":0.396875,
- "Top":3.14854,
- "Width":1.61396,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"客户物料"
- },
- {
- "Type":"Line",
- "Name":"Line9",
- "Left":0.211667,
- "Top":5.44917,
- "Width":5.58271,
- "Height":0.00125
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox5",
- "Left":0.396875,
- "Top":4.445,
- "Width":1.61396,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"物料号"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox6",
- "Left":2.35479,
- "Top":4.445,
- "Width":3.43958,
- "Height":0.978958,
- "Font":{
- "Name":"微软雅黑",
- "Size":142500,
- "Weight":400,
- "Charset":134
- },
- "Text":"A2146103301"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox7",
- "Left":0.396875,
- "Top":5.66208,
- "Width":1.61396,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"批次"
- },
- {
- "Type":"Line",
- "Name":"Line10",
- "Left":0.211667,
- "Top":6.58813,
- "Width":5.58
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox8",
- "Left":0.396875,
- "Top":6.85271,
- "Width":1.61396,
- "Height":0.820208,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"包装数量"
- },
- {
- "Type":"Line",
- "Name":"Line11",
- "Left":0.211667,
- "Top":7.80521,
- "Width":5.58
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox9",
- "Left":0.396875,
- "Top":7.99042,
- "Width":1.61396,
- "Height":0.79375,
- "Font":{
- "Name":"微软雅黑",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"MiddleCenter",
- "Text":"生产线"
- },
- {
- "Type":"Line",
- "Name":"Line12",
- "Left":5.79438,
- "Top":4.29,
- "Height":4.60001
- },
- {
- "Type":"Barcode",
- "Name":"Barcode1",
- "Left":5.90021,
- "Top":4.78896,
- "Width":3.81,
- "Height":3.7,
- "BarcodeType":"QRCode",
- "CaptionPosition":"None",
- "Text":"[#{BarCode}#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox2",
- "Left":2.32833,
- "Top":5.60917,
- "Width":3.20146,
- "Height":0.978958,
- "Font":{
- "Name":"微软雅黑",
- "Size":142500,
- "Weight":400,
- "Charset":134
- },
- "Text":"[#{BatchNo}#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox3",
- "Left":2.30188,
- "Top":6.77333,
- "Width":1.69333,
- "Height":1.00542,
- "Font":{
- "Name":"微软雅黑",
- "Size":142500,
- "Weight":400,
- "Charset":134
- },
- "Text":"[#{Qty}#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox4",
- "Left":4.20688,
- "Top":6.79979,
- "Width":1.40229,
- "Height":1.00542,
- "Font":{
- "Name":"微软雅黑",
- "Size":142500,
- "Weight":400,
- "Charset":134
- },
- "Text":"EA"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox10",
- "Left":2.32833,
- "Top":7.96396,
- "Width":3.33375,
- "Height":0.767292,
- "Font":{
- "Name":"微软雅黑",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Text":"3200T-2(天兴)"
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/InjectionPC/bin/Debug/InjectionPC - 副本.exe b/InjectionPC/bin/Debug/InjectionPC - 副本.exe
deleted file mode 100644
index cc237e0..0000000
Binary files a/InjectionPC/bin/Debug/InjectionPC - 副本.exe and /dev/null differ
diff --git a/InjectionPC/bin/Debug/InjectionPC.exe.zip b/InjectionPC/bin/Debug/InjectionPC.exe.zip
deleted file mode 100644
index 2ec761d..0000000
Binary files a/InjectionPC/bin/Debug/InjectionPC.exe.zip and /dev/null differ
diff --git a/InjectionPC/bin/Debug/InjectionPC.vshost.exe b/InjectionPC/bin/Debug/InjectionPC.vshost.exe
deleted file mode 100644
index 666c0af..0000000
Binary files a/InjectionPC/bin/Debug/InjectionPC.vshost.exe and /dev/null differ
diff --git a/InjectionPC/bin/Debug/InjectionPC.vshost.exe.config b/InjectionPC/bin/Debug/InjectionPC.vshost.exe.config
deleted file mode 100644
index 750ec24..0000000
--- a/InjectionPC/bin/Debug/InjectionPC.vshost.exe.config
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/InjectionPC/bin/Debug/InjectionPC.vshost.exe.manifest b/InjectionPC/bin/Debug/InjectionPC.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/InjectionPC/bin/Debug/InjectionPC.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/InjectionPC/bin/Debug/Sill.grf b/InjectionPC/bin/Debug/Sill.grf
deleted file mode 100644
index ec590e7..0000000
--- a/InjectionPC/bin/Debug/Sill.grf
+++ /dev/null
@@ -1,135 +0,0 @@
-{
- "Version":"6.6.2.0",
- "SharePrintSetupOptions":"[PaperOrientation]",
- "Font":{
- "Name":"宋体",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Printer":{
- "Size":256,
- "Width":5,
- "Height":4,
- "LeftMargin":0,
- "TopMargin":0,
- "RightMargin":0,
- "BottomMargin":0
- },
- "Parameter":[
- {
- "Name":"PrintTime"
- },
- {
- "Name":"PartNo"
- },
- {
- "Name":"PartName"
- },
- {
- "Name":"OneBarCode"
- },
- {
- "Name":"BarCode"
- },
- {
- "Name":"Station"
- }
- ],
- "ReportHeader":[
- {
- "Name":"ReportHeader1",
- "Height":3.81,
- "Control":[
- {
- "Type":"MemoBox",
- "Name":"MemoBox1",
- "Left":0.58,
- "Top":0.211667,
- "Width":2.78,
- "Height":0.4,
- "Font":{
- "Name":"宋体",
- "Size":52500,
- "Bold":true,
- "Charset":134
- },
- "Text":"[#PrintTime#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox2",
- "Left":0.58,
- "Top":1.00542,
- "Width":1.59,
- "Height":0.4,
- "Font":{
- "Name":"宋体",
- "Size":52500,
- "Bold":true,
- "Charset":134
- },
- "Text":"[#{PartNo}#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox3",
- "Left":0.582083,
- "Top":1.40229,
- "Width":2.2225,
- "Height":0.396875,
- "Font":{
- "Name":"宋体",
- "Size":52500,
- "Bold":true,
- "Charset":134
- },
- "WordWrap":true,
- "Text":"[#{PartName}#]"
- },
- {
- "Type":"Barcode",
- "Name":"Barcode1",
- "Left":0.58,
- "Top":2.67229,
- "Width":4.2,
- "Height":1.00542,
- "BarcodeType":"Code128Auto",
- "Text":"[#{OneBarCode}#]",
- "Font":{
- "Name":"微软雅黑",
- "Size":67500,
- "Bold":true,
- "Charset":134
- }
- },
- {
- "Type":"Barcode",
- "Name":"Barcode2",
- "Left":2.93688,
- "Top":0.687917,
- "Width":1.8,
- "Height":1.8,
- "BarcodeType":"QRCode",
- "CaptionPosition":"None",
- "Text":"[#{OneBarCode}#]"
- },
- {
- "Type":"MemoBox",
- "Name":"MemoBox4",
- "Left":0.608542,
- "Top":0.608542,
- "Width":1.5875,
- "Height":0.396875,
- "Font":{
- "Name":"宋体",
- "Size":52500,
- "Bold":true,
- "Charset":134
- },
- "Text":"[#{Station}#]"
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/InjectionPC/bin/Debug/Updater.exe b/InjectionPC/bin/Debug/Updater.exe
deleted file mode 100644
index 1ceded2..0000000
Binary files a/InjectionPC/bin/Debug/Updater.exe and /dev/null differ
diff --git a/InjectionPC/bin/Debug/Updater.exe.config b/InjectionPC/bin/Debug/Updater.exe.config
deleted file mode 100644
index 60c1c0f..0000000
--- a/InjectionPC/bin/Debug/Updater.exe.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/InjectionPC/bin/Debug/Updater.pdb b/InjectionPC/bin/Debug/Updater.pdb
deleted file mode 100644
index fd045f7..0000000
Binary files a/InjectionPC/bin/Debug/Updater.pdb and /dev/null differ
diff --git a/InjectionPC/bin/Debug/V&W205-AMG-F.jpg b/InjectionPC/bin/Debug/V&W205-AMG-F.jpg
deleted file mode 100644
index 0fab08e..0000000
Binary files a/InjectionPC/bin/Debug/V&W205-AMG-F.jpg and /dev/null differ
diff --git a/InjectionPC/bin/Debug/test - 副本 (2).lbl b/InjectionPC/bin/Debug/test - 副本 (2).lbl
deleted file mode 100644
index c5cbebd..0000000
--- a/InjectionPC/bin/Debug/test - 副本 (2).lbl
+++ /dev/null
@@ -1,18 +0,0 @@
-e IMG;*
-; LABEL -> = C:\Users\SIEMENS\Desktop\test.stc
-; CREATED: 2023/2/27 15:52:40, Driver version: 1.0.7.3, Target model: HERMES Q4R/300-2
-l ZH
-m m
-zO
-J
-j 3172168412706050
-S l1;0,0,36.2,36.2,45
-H 100,0,T,R0,B0
-O R,D,A1=270
-P
-T:Pdate;3.69,4.34,0,3,2.89,k;{0}
-T:MNumber;34.38,4.13,0,3,2.69,k;{1}
-T:BPNumber;3.45,7.46,0,3,2.57,k;{2}
-B:Barcode;4.67,7.84,0,CODE128,8.47,0.25;{4}
-T:PartName;24.41,7.07,0,3,2.61,k;{3}
-A 1
diff --git a/InjectionPC/bin/Debug/test - 副本.lbl b/InjectionPC/bin/Debug/test - 副本.lbl
deleted file mode 100644
index 20e0062..0000000
--- a/InjectionPC/bin/Debug/test - 副本.lbl
+++ /dev/null
@@ -1,18 +0,0 @@
-e IMG;*
-; LABEL -> = C:\Users\SIEMENS\Desktop\test.stc
-; CREATED: 2023/2/27 15:52:40, Driver version: 1.0.7.3, Target model: HERMES Q4R/300-2
-l ZH
-m m
-zO
-J
-j 3172168412706050
-S l1;0,0,36.2,36.2,45
-H 100,0,T,R0,B0
-O R,D,A1=270
-P
-T:Pdate;3.69,4.34,0,3,2.89,k;2021/12/29 19:20:30
-T:MNumber;34.38,4.13,0,3,2.69,k;IM17
-T:BPNumber;3.45,7.46,0,3,2.57,k;A2146106203KZ
-B:Barcode;4.67,7.84,0,CODE128,8.47,0.25;60000001162112290001
-T:PartName;24.41,7.07,0,3,2.61,k;TrunnBox行李箱
-A 1
diff --git a/InjectionPC/bin/Debug/test.lbl b/InjectionPC/bin/Debug/test.lbl
deleted file mode 100644
index 033cb73..0000000
--- a/InjectionPC/bin/Debug/test.lbl
+++ /dev/null
@@ -1,45 +0,0 @@
-m m
-zO
-J
-j 3172421814000606
-S l1;0,0,18,21,50
-H 100,0,T,R0,B0
-O R,D,A1=270
-P
-T:Pdate;0,4.34,0,3,2.89,k;{0}
-B:Barcode;4.67,8,0,CODE128,8.47,0.25;{1}
-T:MNumber;34.38,4.13,0,3,2.69,k;{2}
-T:PartName;24.41,7.07,0,3,2.61,k;{3}
-T:BPNumber;0,7.46,0,3,2.57,k;{4}
-A 1
-
-
-
-
-注塑大码 78,admin 123
- 质检 80 Sk 123
- 打螺钉 74 administrator 123
-
-
-
- 2022-09-21无法下载回单
-
-
-
- 印度件
-
- 打印的判断是否选择的是印度件,印度件是另一个模板
-
- 22000000992311040709
-
-
- 60000001762311090068
-
-
- 用一码到底的程序 4种配置
- 根据零件号判断是否带摄像头 摄像头配置也不一样
- 下计划、有摄像头的需要扫描摄像头条码做核对,打印条码。切计划时亮摄像头 2个灯。
-
-
- https://blog.csdn.net/weixin_44964841/article/details/123784351?spm=1001.2101.3001.6661.1&utm_medium=distribute.pc_relevant_t0.none-task-blog-2%7Edefault%7EBlogCommendFromBaidu%7ERate-1-123784351-blog-132689731.235%5Ev38%5Epc_relevant_anti_t3_base&depth_1-utm_source=distribute.pc_relevant_t0.none-task-blog-2%7Edefault%7EBlogCommendFromBaidu%7ERate-1-123784351-blog-132689731.235%5Ev38%5Epc_relevant_anti_t3_base&utm_relevant_index=1
-
\ No newline at end of file
diff --git a/InjectionPC/bin/Debug/wl.grf b/InjectionPC/bin/Debug/wl.grf
deleted file mode 100644
index 297c32d..0000000
Binary files a/InjectionPC/bin/Debug/wl.grf and /dev/null differ
diff --git a/InjectionPC/bin/Debug/zc.grf b/InjectionPC/bin/Debug/zc.grf
deleted file mode 100644
index 07da716..0000000
--- a/InjectionPC/bin/Debug/zc.grf
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "Version":"6.6.2.0",
- "SharePrintSetupOptions":"[PaperOrientation]",
- "Font":{
- "Name":"宋体",
- "Size":105000,
- "Weight":400,
- "Charset":134
- },
- "Printer":{
- "Size":256,
- "Width":5,
- "Height":4,
- "LeftMargin":0,
- "TopMargin":0,
- "RightMargin":0,
- "BottomMargin":0
- },
- "Parameter":[
- {
- "Name":"barCode"
- }
- ],
- "ReportHeader":[
- {
- "Name":"ReportHeader1",
- "Height":3.99521,
- "Control":[
- {
- "Type":"Barcode",
- "Name":"Barcode1",
- "Left":0.582083,
- "Top":0.105833,
- "Width":1.5,
- "Height":1.5,
- "BarcodeType":"QRCode",
- "CaptionPosition":"None",
- "Text":"[#{barCode}#]"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox1",
- "Left":2.40771,
- "Top":0.079375,
- "Width":1.98438,
- "Height":0.608542,
- "Font":{
- "Name":"宋体",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "Text":"A2146103301"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox2",
- "Left":2.35479,
- "Top":1.03188,
- "Width":0.608542,
- "Height":0.396875,
- "Font":{
- "Name":"宋体",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"TopLeft",
- "Text":"Q01"
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox3",
- "Left":3.14854,
- "Top":1.03188,
- "Width":1.21708,
- "Height":0.608542,
- "Font":{
- "Name":"宋体",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "TextAlign":"TopLeft",
- "Text":"ZGS007"
- },
- {
- "Type":"Barcode",
- "Name":"Barcode2",
- "Left":0.211667,
- "Top":2.01083,
- "Width":4.57729,
- "Height":1.40229,
- "BarcodeType":"Code128Auto",
- "Text":"[#{barCode}#]",
- "Font":{
- "Name":"宋体",
- "Size":67500,
- "Weight":400,
- "Charset":134
- }
- },
- {
- "Type":"StaticBox",
- "Name":"StaticBox4",
- "Left":2.98979,
- "Top":3.46604,
- "Width":1.79917,
- "Height":0.396875,
- "Font":{
- "Name":"宋体",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "Text":"有效期12周"
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/InjectionPC/bin/Debug/单个条码.grf b/InjectionPC/bin/Debug/单个条码.grf
deleted file mode 100644
index 34be796..0000000
Binary files a/InjectionPC/bin/Debug/单个条码.grf and /dev/null differ
diff --git a/InjectionPC/bin/Debug/单个条码1.grf b/InjectionPC/bin/Debug/单个条码1.grf
deleted file mode 100644
index 297c32d..0000000
Binary files a/InjectionPC/bin/Debug/单个条码1.grf and /dev/null differ
diff --git a/InjectionPC/bin/Debug/单个条码2.grf b/InjectionPC/bin/Debug/单个条码2.grf
deleted file mode 100644
index c434fb8..0000000
Binary files a/InjectionPC/bin/Debug/单个条码2.grf and /dev/null differ
diff --git a/InjectionPC/bin/Debug/自动更新设置.ini b/InjectionPC/bin/Debug/自动更新设置.ini
deleted file mode 100644
index 393af3e..0000000
Binary files a/InjectionPC/bin/Debug/自动更新设置.ini and /dev/null differ
diff --git a/InjectionPC/bin/Debug/装箱单.grf b/InjectionPC/bin/Debug/装箱单.grf
deleted file mode 100644
index a74c33c..0000000
Binary files a/InjectionPC/bin/Debug/装箱单.grf and /dev/null differ
diff --git a/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx b/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx
deleted file mode 100644
index c265eda..0000000
--- a/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebHandler Language="C#" CodeBehind="ForeignColorMapHandler.ashx.cs" Class="MESWebSite.HttpHandlers.StationHandler" %>
diff --git a/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx.cs b/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx.cs
deleted file mode 100644
index 2192469..0000000
--- a/MESWebSite/HttpHandlers/ForeignColorMapHandler.ashx.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using MESClassLibrary.BLL.BasicInfo;
-using MESClassLibrary.EFModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace MESWebSite.HttpHandlers
-{
- ///
- /// StationHandler 的摘要说明
- ///
- public class ForeignColorMapHandler : IHttpHandler
- {
-
- HttpRequest Request = null;
- HttpResponse Response = null;
-
- public void ProcessRequest(HttpContext context)
- {
- context.Response.ContentType = "text/plain";
- Request = context.Request;
- Response = context.Response;
-
- string method = Request.Params["method"];
- switch (method)
- {
-
- case "QueryList":
- QueryList();
- break;
- case "SaveInfo":
- SaveInfo();
- break;
- case "DelInfo":
- DelInfo();
- break;
- case "QueryForCombobox":
- QueryForCombobox();
- break;
- case "QueryForComboboxByLineID":
- QueryForComboboxByLineID();
- break;
- default:
- break;
-
- }
-
- }
- public bool IsReusable
- {
- get
- {
- return false;
- }
- }
-
- void QueryList()
- {
- string page = Request.Params["page"];
- string pagesize = Request.Params["rows"];
- string PartCode = Request.Params["PartCode"];
- string TypeCode = Request.Params["TypeCode"];
-
-
- if (string.IsNullOrEmpty(page))
- {
- page = "0";
- }
- if (string.IsNullOrEmpty(pagesize))
- {
- pagesize = "15";
- }
- StationBLL bll = new StationBLL();
- //Response.Write(bll.SearchInfo(page, pagesize, StationNo, LineID));
- //Response.End();
-
-
- }
- void SaveInfo()
- {
- string StationID = Request.Params["StationID"];
- string LineID = Request.Params["LineID"];
- string StationNo = Request.Params["StationNo"];
- string Des = Request.Params["Des"];
- string time = Request.Params["time"];
-
- StationBLL bll = new StationBLL();
- tb_Station md = new tb_Station();
-
- md.LineID = LineID;
- md.StationNo = StationNo;
- md.Des = Des;
- md.ChangeMould = Convert.ToInt32(time);
- var info = Request.Cookies.Get("LoginUserInfo");
- if (info != null)
- {
- md.UserID = info["UserID"].ToUpper();
- }
- if (StationID == "0")
- {
- //新增
- md.StationID = Guid.NewGuid().ToString();
- Response.Write(bll.AddInfo(md) == true ? "true" : "false");
- }
- else
- {
- //修改
- md.StationID = StationID;
- Response.Write(bll.UpdateInfo(md) == true ? "true" : "false");
- }
- Response.End();
- }
- void DelInfo()
- {
- string StationID = Request.Params["StationID"];
-
- StationBLL bll = new StationBLL();
- tb_Station md = new tb_Station();
- md.StationID = StationID;
- var info = Request.Cookies.Get("LoginUserInfo");
- if (info != null)
- {
- md.UserID = info["UserID"].ToUpper();
- }
- Response.Write(bll.DelInfo(md) == true ? "true" : "false");
- Response.End();
-
- }
-
- void QueryForCombobox()
- {
- string StationNo = Request.Params["StationNo"];
-
- StationBLL bll = new StationBLL();
- Response.Write(bll.GetComboboxData(StationNo));
- Response.End();
-
- }
-
- void QueryForComboboxByLineID()
- {
- string LineID = "68dd1857-5e78-43f9-a065-6be76335e7fe";
-
- StationBLL bll = new StationBLL();
- Response.Write(bll.GetComboboxDataByLine(LineID));
- Response.End();
-
- }
- }
-}
\ No newline at end of file
diff --git a/MESWebSite/Manage/ForeignColorMap.aspx b/MESWebSite/Manage/ForeignColorMap.aspx
deleted file mode 100644
index d5be848..0000000
--- a/MESWebSite/Manage/ForeignColorMap.aspx
+++ /dev/null
@@ -1,399 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ForeignColorMap.aspx.cs" Inherits="MESWebSite.Manage.ForeignColorMap" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 工位信息
-
-
-
-
-
diff --git a/MESWebSite/Manage/ForeignColorMap.aspx.cs b/MESWebSite/Manage/ForeignColorMap.aspx.cs
deleted file mode 100644
index f10c66e..0000000
--- a/MESWebSite/Manage/ForeignColorMap.aspx.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace MESWebSite.Manage
-{
- public partial class ForeignColorMap : System.Web.UI.Page
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- if (Request.Cookies["LoginUserInfo"] == null)
- {
- Response.Write("");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/MESWebSite/Manage/ForeignColorMap.aspx.designer.cs b/MESWebSite/Manage/ForeignColorMap.aspx.designer.cs
deleted file mode 100644
index 58a141f..0000000
--- a/MESWebSite/Manage/ForeignColorMap.aspx.designer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
-//
-// 对此文件的更改可能导致不正确的行为,如果
-// 重新生成代码,则所做更改将丢失。
-// 自动生成>
-//------------------------------------------------------------------------------
-
-namespace MESWebSite.Manage
-{
-
-
- public partial class ForeignColorMap
- {
-
- ///
- /// form1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
- ///
- /// lblMessage 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.WebControls.Label lblMessage;
-
- ///
- /// UserID 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.HtmlControls.HtmlInputText UserID;
- }
-}
diff --git a/PaintingPC/bin/Debug/PaintingPC.zip b/PaintingPC/bin/Debug/PaintingPC.zip
deleted file mode 100644
index 4e1ef27..0000000
Binary files a/PaintingPC/bin/Debug/PaintingPC.zip and /dev/null differ
diff --git a/PaintingPC/bin/Debug/Updater.pdb b/PaintingPC/bin/Debug/Updater.pdb
deleted file mode 100644
index fd045f7..0000000
Binary files a/PaintingPC/bin/Debug/Updater.pdb and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5e90b17e-4b3a-480f-84ac-3095e8d97ab3.vsidx b/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5e90b17e-4b3a-480f-84ac-3095e8d97ab3.vsidx
deleted file mode 100644
index 89f9da4..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5e90b17e-4b3a-480f-84ac-3095e8d97ab3.vsidx and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5ed3541d-77c4-4ee3-a592-8e61aab7068a.vsidx b/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5ed3541d-77c4-4ee3-a592-8e61aab7068a.vsidx
deleted file mode 100644
index 3caac6a..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/5ed3541d-77c4-4ee3-a592-8e61aab7068a.vsidx and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/682d018d-e3b6-43c5-8683-5575c31523a2.vsidx b/喷涂上线/Code/.vs/BBMPT/FileContentIndex/682d018d-e3b6-43c5-8683-5575c31523a2.vsidx
deleted file mode 100644
index 96e8f14..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/682d018d-e3b6-43c5-8683-5575c31523a2.vsidx and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/737d993a-5258-42db-ba6d-fe8fd2b749a4.vsidx b/喷涂上线/Code/.vs/BBMPT/FileContentIndex/737d993a-5258-42db-ba6d-fe8fd2b749a4.vsidx
deleted file mode 100644
index 88b3bab..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/737d993a-5258-42db-ba6d-fe8fd2b749a4.vsidx and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/a7b2bb04-a8d2-4daf-8adb-5d672f7f1111.vsidx b/喷涂上线/Code/.vs/BBMPT/FileContentIndex/a7b2bb04-a8d2-4daf-8adb-5d672f7f1111.vsidx
deleted file mode 100644
index ea167c6..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/FileContentIndex/a7b2bb04-a8d2-4daf-8adb-5d672f7f1111.vsidx and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/config/applicationhost.config b/喷涂上线/Code/.vs/BBMPT/config/applicationhost.config
deleted file mode 100644
index 9f61c4e..0000000
--- a/喷涂上线/Code/.vs/BBMPT/config/applicationhost.config
+++ /dev/null
@@ -1,1065 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/喷涂上线/Code/.vs/BBMPT/v16/.suo b/喷涂上线/Code/.vs/BBMPT/v16/.suo
deleted file mode 100644
index 1161d7d..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/v16/.suo and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/v17/.suo b/喷涂上线/Code/.vs/BBMPT/v17/.suo
deleted file mode 100644
index d4363ea..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/v17/.suo and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/v17/HierarchyCache.v1.txt b/喷涂上线/Code/.vs/BBMPT/v17/HierarchyCache.v1.txt
deleted file mode 100644
index 49a8008..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/v17/HierarchyCache.v1.txt and /dev/null differ
diff --git a/喷涂上线/Code/.vs/BBMPT/v17/fileList.bin b/喷涂上线/Code/.vs/BBMPT/v17/fileList.bin
deleted file mode 100644
index a4b43b0..0000000
Binary files a/喷涂上线/Code/.vs/BBMPT/v17/fileList.bin and /dev/null differ
diff --git a/喷涂上线/Code/BBMPT.sln b/喷涂上线/Code/BBMPT.sln
deleted file mode 100644
index 87435d8..0000000
--- a/喷涂上线/Code/BBMPT.sln
+++ /dev/null
@@ -1,85 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MESClassLibrary", "MESClassLibrary\MESClassLibrary.csproj", "{867989D8-6837-41DC-9BF1-4658F5D6CFEF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaintingPC", "PaintingPC\PaintingPC.csproj", "{BA977F8C-A368-48B9-AD23-965246580D4C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebService", "WebService\WebService.csproj", "{61D9D50E-F645-40DE-8C7A-B4039D840C52}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0D128182-FB8C-4E0B-A42F-DF3767E4DE39}"
- ProjectSection(SolutionItems) = preProject
- 数据结构修改记录.txt = 数据结构修改记录.txt
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaintingScreen", "PaintingScreen\PaintingScreen.csproj", "{14A52CF0-E299-459C-9EDA-E86F47B2C8E8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaintingView", "PaintingView\PaintingView.csproj", "{3054D10F-3296-41E1-8ACD-628F33AC97EF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.csproj", "{B2A5892E-A99E-4E26-B298-CE36488213CC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "foda", "foda\foda.csproj", "{C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.Build.0 = Release|Any CPU
- {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|x86.ActiveCfg = Release|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA977F8C-A368-48B9-AD23-965246580D4C}.Release|x86.ActiveCfg = Release|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|x86.ActiveCfg = Debug|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Release|Any CPU.Build.0 = Release|Any CPU
- {61D9D50E-F645-40DE-8C7A-B4039D840C52}.Release|x86.ActiveCfg = Release|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Release|Any CPU.Build.0 = Release|Any CPU
- {14A52CF0-E299-459C-9EDA-E86F47B2C8E8}.Release|x86.ActiveCfg = Release|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Release|Any CPU.Build.0 = Release|Any CPU
- {3054D10F-3296-41E1-8ACD-628F33AC97EF}.Release|x86.ActiveCfg = Release|Any CPU
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Debug|x86.ActiveCfg = Debug|x86
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Debug|x86.Build.0 = Debug|x86
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Release|Any CPU.Build.0 = Release|Any CPU
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Release|x86.ActiveCfg = Release|x86
- {B2A5892E-A99E-4E26-B298-CE36488213CC}.Release|x86.Build.0 = Release|x86
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Release|Any CPU.Build.0 = Release|Any CPU
- {C246AE3F-AE49-45CB-B2CF-C56C6D228C6B}.Release|x86.ActiveCfg = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {52EF8F7E-6AC9-4400-82F1-31F70143C867}
- VisualSVNWorkingCopyRoot = .
- EndGlobalSection
-EndGlobal
diff --git a/喷涂上线/Code/BBMPT.v12.suo b/喷涂上线/Code/BBMPT.v12.suo
deleted file mode 100644
index eb5d07a..0000000
Binary files a/喷涂上线/Code/BBMPT.v12.suo and /dev/null differ
diff --git a/喷涂上线/Code/MESClassLibrary/App.config b/喷涂上线/Code/MESClassLibrary/App.config
deleted file mode 100644
index 72f6a27..0000000
--- a/喷涂上线/Code/MESClassLibrary/App.config
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicBLL.cs
deleted file mode 100644
index b6cdb92..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicBLL.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.DAL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL
-{
- public class BasicBLL where T : class, new()
- {
- BaseDAL db = new BaseDAL();
- /// 新增信息
- public bool AddInfo(T md)
- {
- try
- {
- if (db.Add(md) > 0)
- {
- return true;
- }
- return false;
- }
- catch (Exception ex)
- {
- //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- /// 修改信息
- public bool UpdateInfo(T md, params string[] proNames)
- {
- try
- {
- //T u = new T() { uId = 1, uLoginName = "asdfasdf" };
- if (db.Modify(md, proNames) > 0)
- {
- return true;
- }
- return false;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- public bool UpdateInfo(T md)
- {
- try
- {
- return db.Modify(md) > 0;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- /// 删除信息
- public bool DelInfo(T md)
- {
- try
- {
- if (db.Del(md) > 0)
- {
- return true;
- }
- return false;
- }
- catch (Exception ex)
- {
- //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- public List SearchInfo(int page, int pagesize, out int total)
- {
- try
- {
- var list = db.GetListBy(LambdaHelper.CreateEqual("IsUseing", 1)).ToList();
- total = list.Count;
- int Skipcount = (page - 1) * pagesize;
- return list.Skip(Skipcount).Take(pagesize).ToList();
- }
- catch (Exception ex)
- {
- total = 0;
- //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- public List SearchInfoByKey(string keyname, object keyvalue)
- {
- try
- {
- var list = db.GetListBy(LambdaHelper.CreateEqual(keyname, keyvalue)).ToList();
- return list;
- }
- catch (Exception)
- {
- return new List();
- //return null;
- }
-
- }
-
- public List SearchInfoContains(string keyname, string keyvalue)
- {
- try
- {
- var list = db.GetListBy(LambdaHelper.GetContains(keyname, keyvalue)).ToList();
- return list;
- }
- catch (Exception)
- {
- return new List();
- //return null;
- }
-
- }
-
-
-
- public List SearchInfoAll(int page, int pagesize, out int total)
- {
- try
- {
- var list = db.GetListBy(LambdaHelper.True()).ToList();
- total = list.Count;
- int Skipcount = (page - 1) * pagesize;
- return list.Skip(Skipcount).Take(pagesize).ToList();
- }
- catch (Exception ex)
- {
- total = 0;
- //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- public T SearchInfoByID(string ID)
- {
- try
- {
- var list = db.Find(ID);
- return list;
- }
- catch (Exception ex)
- {
- return null;
- }
-
- }
- public List SearchAllInfo()
- {
- try
- {
- return db.GetListBy(LambdaHelper.True()).ToList();
- }
- catch (Exception ex)
- {
- //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- public List SearchInfoByTime(string cname, DateTime stime, DateTime etime)
- {
- try
- {
- IQueryable list = db.GetListBy(LambdaHelper.CreateCompareToLater(cname, stime)).AsQueryable();
- list = list.Where(LambdaHelper.CreateCompareToEarlier(cname, etime));
- return list.ToList();
- }
- catch (Exception)
- {
- return new List();
- //return null;
- }
-
- }
-
- public List Search(Expression> whereLambda)
- {
- return db.GetListBy(whereLambda);
- }
-
- public List Search(Expression> whereLambda, Expression> orderLambda)
- {
- return db.GetListBy(whereLambda, orderLambda);
- }
-
- public int GetCount(Expression> whereLambda)
- {
- return db.GetCount(whereLambda);
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
deleted file mode 100644
index 7a2f8f6..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.DAL.BasicInfo;
-using MESClassLibrary.Model;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class BadInjectionBLL
- {
- BadInjectionDAL db=new BadInjectionDAL();
-
- public bool Add_Info(BadInjectionModel md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SearchByCode(string code)
- {
- try
- {
- return db.SearchByCode(code);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
deleted file mode 100644
index 211fe78..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.DAL.BasicInfo;
-using MESClassLibrary.Model;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class BarCodeBLL
- {
- BarCodeDAl db = new BarCodeDAl();
-
- public DataTable SearchInfoByStock(string StockNo)
- {
- try
- {
- return db.SearchInfoByStock(StockNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchInfoByPartNo(string partNo)
- {
- try
- {
- return db.SearchInfoByPartNo(partNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable searchBarCode(string barcode, int flag)
- {
- try
- {
- return db.searchBarCode(barcode, flag);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool Add_Info(BarCodeModel md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public bool Add_Info_New(BarCodeModel md,string tableName)
- {
- try
- {
- return db.AddInfoNew(md,tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SearchInfo(string stationNo)
- {
- try
- {
- return db.SearchInfo(stationNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchInfoAll()
- {
- try
- {
- return db.SearchInfoAll();
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchBarCode()
- {
- try
- {
- return db.SearchBarCode();
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchBarCodeByOne(string OneBarCode)
- {
- try
- {
- return db.SearchBarCodeByOne(OneBarCode);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchBarCodeByTwo(string BarCode)
- {
- try
- {
- return db.SearchBarCodeByTwo(BarCode);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchSerialNoByBarCode(string Code)
- {
- try
- {
- return db.SearchSerialNoByBarCode(Code);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchSerialNoByBarCodeNew(string Code,string tableName)
- {
- try
- {
- return db.SearchSerialNoByBarCodeNew(Code, tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchInfoByBarCode(string BarCode)
- {
- try
- {
- return db.SearchInfoByBarCode(BarCode);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchInfoByBarCodeNew(string BarCode,string tableName)
- {
- try
- {
- return db.SearchInfoByBarCodeNew(BarCode, tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool Update_Info(BarCodeModel md)
- {
- try
- {
- return db.UpdateInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public bool DelBarCode(BarCodeModel md)
- {
- try
- {
- return db.DelBarCode(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public bool DelBarCode_New(BarCodeModel md,string tableName)
- {
- try
- {
- return db.DelBarCode_New(md,tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SearchBoxIsNull(string partNo, string StationID, string tableName, string ProductNature)
- {
- try
- {
- return db.SearchBoxIsNull(partNo, StationID, tableName, ProductNature);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable IsHave(string partNo, string StationID, string tableName)
- {
- try
- {
- return db.IsHave(partNo, StationID, tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool UpdateBoxNo(string tableName, string boxNo, string partNo)
- {
- try
- {
- return db.UpdateBoxNo(tableName, boxNo, partNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SearchCountByBox(string boxNo, string tableName)
- {
- try
- {
- return db.SearchCountByBox(boxNo, tableName);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool UpdateIsBad(string tableName, string onebarcode, string barcode)
- {
- try
- {
- return db.UpdateIsBad(tableName, onebarcode, barcode);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SearchBarCode(string boxNo, string tableName, string row)
- {
- try
- {
- return db.SearchBarCode(boxNo, tableName, row);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool updateProductNature(string tableName, string barcode)
- {
- try
- {
- return db.updateProductNature(tableName, barcode);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public DataTable SeachInfoByOne(string barCode, string tableName,int flag)
- {
- try
- {
- return db.SeachInfoByOne(barCode, tableName, flag);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BomBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
deleted file mode 100644
index 3ee0387..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.DAL.BasicInfo;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class BomBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_Bom md)
- {
- try
- {
- var list = db.SearchInfoByKey("PartNo1", md.PartNo1);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.BomID != md.BomID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Bom md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.PartNo1 == md.PartNo1 && p.BomID != md.BomID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[2];
- proNames[0] = "PartNo1";
- proNames[1] = "PartNo2";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
-
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Bom md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string partNo1)
- {
- try
- {
-
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(partNo1))
- {
- list = list.Where(p => p.PartNo1.Contains(partNo1)).ToList();
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- List modelList = new List();
- BasicBLL s_db = new BasicBLL();
- var s_list = s_db.SearchAllInfo();
-
- foreach (var item in list)
- {
- BomModel dm = Tool.Mapper(item);
- var info = s_list.FirstOrDefault(p => p.PartNo == item.PartNo1);
- if (info != null)
- {
- dm.ProductName1 = info.ProductName;
- }
-
- var info2 = s_list.FirstOrDefault(p => p.PartNo == item.PartNo2);
- if (info2 != null)
- {
- dm.ProductName2 = info2.ProductName;
- }
-
- modelList.Add(dm);
- }
-
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = modelList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 查询全部信息
- ///
- ///
- public List SearchAll()
- {
- try
- {
- var s_list = db.SearchAllInfo().ToList();
- return s_list;
- }
- catch (Exception)
- {
- return null;
- }
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Bom SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public DataTable SearchBom(string PartNo)
- {
- BomDAL dal=new BomDAL();
- try
- {
- return dal.SearchBom(PartNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable Search(string partNo1, string partNo2)
- {
- BomDAL dal = new BomDAL();
- try
- {
- return dal.Search(partNo1, partNo2);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool AddInfo(BomModel md)
- {
- BomDAL dal = new BomDAL();
- try
- {
- return dal.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public bool updateInfo(BomModel md)
- {
- BomDAL dal = new BomDAL();
- try
- {
- return dal.updateInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public bool DelInfo(BomModel md)
- {
- BomDAL dal = new BomDAL();
- try
- {
- return dal.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
deleted file mode 100644
index 89d654a..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
-
- public class BucketInfoBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_BucketInfo md)
- {
- try
- {
- var list = db.SearchInfoByKey("BucketCode", md.BucketCode);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_BucketInfo md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.BucketCode == md.BucketCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "BucketCode";
- proNames[1] = "BucketName";
- proNames[2] = "IsUsing";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_BucketInfo md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string BucketCode)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(BucketCode))
- {
- list = list.Where(p => p.BucketCode.Contains(BucketCode)).ToList();
- }
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_BucketInfo SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
-
- List sl = new List();
-
- foreach (var item in list)
- {
- SelectModel md = new SelectModel();
- md.textField = item.BucketCode+"--"+ item.BucketName;
- md.valueField = item.ID;
- sl.Add(md);
- }
-
- jsonStr = JSONTools.ScriptSerialize(sl);
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CarTypeBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CarTypeBLL.cs
deleted file mode 100644
index dbf9b3a..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CarTypeBLL.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class CarTypeBLL
- {
- readonly BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_CarType md)
- {
- try
- {
- var list = db.SearchInfoByKey("CarTypeName", md.CarTypeName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID).Count() > 0)
- {
- return false;
- }
-
- }
- md.CreateTime = DateTime.Now;
- var result = db.AddInfo(md);
- return result;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_CarType md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.CarTypeName == md.CarTypeName && p.ID != md.ID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[] {
- "CarTypeName",
- "ManufactureID",
- "UpdateTime",
- };
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- md.UpdateTime = DateTime.Now;
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_CarType md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string name, string manufacturerID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- IEnumerable list = db.SearchAllInfo();
-
- if (!string.IsNullOrEmpty(name))
- {
- list = list.Where(p => p.CarTypeName != null && p.CarTypeName.Contains(name));
- }
- if (!string.IsNullOrEmpty(manufacturerID))
- {
- list = list.Where(p => p.ManufacturerID != null && p.ManufacturerID == manufacturerID);
- }
- List modelList = new List();
- if (list.Any())
- {
- total = list.Count();
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize));
-
- var manufactureBll = new ManufactureBLL();
- var manufacture = manufactureBll.SearchAll();
-
- var ctm = from c in list
- join mf in manufacture
- on c.ManufacturerID equals mf.ID
- select new CarTypeModel
- {
- ID = c.ID,
- CarTypeName = c.CarTypeName,
- ManufacturerID = c.ManufacturerID,
- ManufacturerName = mf.ManufacturerName,
- CreateTime = c.CreateTime,
- UpdateTime = c.UpdateTime
- };
-
- JsonDataModel md = new JsonDataModel
- {
- total = total.ToString(),
- rows = ctm.ToList()
- };
-
-
- jsonStr = md.ToSerializer();
- }
-
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 查询全部信息
- ///
- ///
- public List SearchAll()
- {
- try
- {
- var s_list = db.SearchAllInfo().ToList();
- return s_list;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_CarType SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string CarTypeCombo()
- {
- return SearchAll().ToSerializer();
- }
-
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
deleted file mode 100644
index 7a2e7d1..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class CheckItemBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string CheckContent, string DeviceID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(DeviceID))
- {
- list = list.Where(p => p.DeviceID == DeviceID).ToList();
- }
-
- if (!String.IsNullOrEmpty(CheckContent))
- {
- list = list.Where(p => p.CheckContent.Contains(CheckContent)).ToList();
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List ModelList = new List();
- BasicBLL p_db = new BasicBLL();
- var p_list = p_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- CheckItemModel dm = Tool.Mapper(item);
- var info = p_list.FirstOrDefault(p => p.DeviceID == item.DeviceID);
- if (info != null)
- {
- dm.DeviceName = info.DeviceName;
- }
- ModelList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = ModelList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_CheckItem md)
- {
- try
- {
- var list = db.SearchInfoByKey("CheckContent", md.CheckContent);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.DeviceID.Equals(md.DeviceID)).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_CheckItem md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.CheckContent == md.CheckContent && p.DeviceID == md.DeviceID && p.ID != md.ID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[6];
- proNames[0] = "DeviceID";
- proNames[1] = "CheckContent";
- proNames[2] = "Standard";
- proNames[3] = "Way";
- proNames[4] = "Cycle";
- proNames[5] = "CheckVersion";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_CheckItem md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
-
- public string GetTreeData(string deviceID)
- {
- try
- {
- string jsonStr = "[]";
- BasicBLL li_db = new BasicBLL();
- List trlist = new List();
- TreeModel tr = new TreeModel();
- tr.id = "-1";
- tr.text = "点检项";
- tr.state = "open";
- var li_list = li_db.SearchAllInfo().Where(p => p.DeviceID.Equals(deviceID)).ToList();
- var queryData = from a in li_list
- select new ChildTreeModel
- {
- id = a.ID,
- text = a.CheckContent
- };
- List clist = queryData.ToList();
- if (clist.Count > 0)
- {
- tr.children = clist;
- trlist.Add(tr);
- }
- jsonStr = JSONTools.ScriptSerialize>(trlist);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
deleted file mode 100644
index d02fb92..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using MESClassLibrary.DAL.BasicInfo;
-
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
-
- public class ColorBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_Color md)
- {
- try
- {
- //var list = db.SearchInfoByKey("ColorCode", md.ColorCode);//判断是否有重复数据
- //if (list != null)
- //{
- // if (list.Where(p => p.ID != md.ID).Count() > 0)
- // {
- // return false;
- // }
-
- //}
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Color md)
- {
- try
- {
- //var list = db.SearchAllInfo().Where(p => p.ColorCode == md.ColorCode && p.ID != md.ID).ToList();//判断是否有重复数据
- //if (list.Count > 0)
- //{
- // return false;
- //}
-
- //初始化要更新的字段
- string[] proNames = new string[5];
- proNames[0] = "ColorCode";
- proNames[1] = "ColorNo";
- proNames[2] = "ColorQQCode";
- proNames[3] = "Des";
- proNames[4] = "ColorDQCode";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Color md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize,string ColorCode)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(ColorCode))
- {
- list = list.Where(p => p.ColorCode.Contains(ColorCode)).ToList();
- }
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Color SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().Select(p=>p.Des).Distinct().ToList();//判断是否有重复数据
-
- List sl = new List();
-
- foreach (var item in list)
- {
- SelectModel md = new SelectModel();
- md.textField = item;
- md.valueField = item;
- sl.Add(md);
- }
-
- jsonStr = JSONTools.ScriptSerialize(sl);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
-
- public string GetComboboxColor()
- {
- var list = db.SearchAllInfo().ToList();
- return list.ToSerializer();
- }
-
- public DataTable SearchAll()
- {
- ColorDAL da = new ColorDAL();
- try
- {
- return da.SearchInfoAll();
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public DataTable SearchByName(string color)
- {
- ColorDAL da = new ColorDAL();
- try
- {
- return da.SearchByName(color);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
deleted file mode 100644
index 1e7b3f0..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.DAL.BasicInfo;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class DefectBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string DefectName, string LineID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(LineID))
- {
- list = list.Where(p => p.LineID == LineID).ToList();
- }
-
- if (!String.IsNullOrEmpty(DefectName))
- {
- list = list.Where(p => p.DefectName.Contains(DefectName)).ToList();
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List ModelList = new List();
- BasicBLL p_db = new BasicBLL();
- var p_list = p_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- DefectModel dm = Tool.Mapper(item);
- var info = p_list.FirstOrDefault(p => p.LineID == item.LineID);
- if (info != null)
- {
- dm.LineName = info.LineName;
- }
- ModelList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = ModelList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Defect md)
- {
- try
- {
- var list = db.SearchInfoByKey("DefectName", md.DefectName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Defect md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.DefectName == md.DefectName && p.ID != md.ID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "LineID";
- proNames[1] = "DefectName";
- proNames[2] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Defect md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
-
- public DataTable SearchInfo(string LineID)
- {
- DefectDAL da=new DefectDAL();
- try
- {
- return da.SearchInfoAll(LineID);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
deleted file mode 100644
index 281c860..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class DeptBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string DeptName)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(DeptName))
- {
- list = list.Where(p => p.DeptName.Contains(DeptName)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- jsonStr = JSONTools.ScriptSerialize(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(TA_DEPT md)
- {
- try
- {
- var list = db.SearchInfoByKey("LineName", md.DeptName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.GUID != md.GUID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(TA_DEPT md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.DeptName == md.DeptName && p.GUID != md.GUID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "DeptCode";
- proNames[1] = "DeptName";
- proNames[2] = "Remark";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(TA_DEPT md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception ex)
- {
- return "";
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
deleted file mode 100644
index 4b9d94c..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class DeviceBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string DeviceNo, string StationID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(StationID))
- {
- list = list.Where(p => p.StationID == StationID).ToList();//按条件分页查询
- }
-
- if (!String.IsNullOrEmpty(DeviceNo))
- {
- list = list.Where(p => p.DeviceNo.Contains(DeviceNo)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List StationList = new List();
- BasicBLL pl_db = new BasicBLL();
- var pl_list = pl_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- DeviceModel dm = Tool.Mapper(item);
- var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
- if (info != null)
- {
- dm.StationNo = info.StationNo;
- }
- StationList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = StationList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
-
-
- public string SearchInfoByID(string DeviceID) {
- try
- {
- string jsonStr = "[]";
- tb_Device info = db.SearchInfoByID(DeviceID);
- jsonStr = JSONTools.ScriptSerialize(info);
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
- }
-
-
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Device md)
- {
- try
- {
- var list = db.SearchInfoByKey("DeviceNo", md.DeviceNo);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.DeviceID != md.DeviceID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Device md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.DeviceNo == md.DeviceNo && p.DeviceID != md.DeviceID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[6];
- proNames[0] = "StationID";
- proNames[1] = "DeviceNo";
- proNames[2] = "DeviceName";
- proNames[3] = "FixNo";
- proNames[4] = "Des";
- proNames[5] = "DeviceModel";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Device md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- foreach (var item in list)
- {
- item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
- }
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
-
-
- }
-
- public string QueryForComboboxByLineID(string fl_id)
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- if (fl_id != null && fl_id != "")
- {
- BasicBLL s_db = new BasicBLL();
- var s_list = s_db.SearchAllInfo().Where(p => p.LineID == fl_id).ToList();//判断是否有重复数据
- if (s_list.Count > 0)
- {
- string[] arr = s_list.Select(p => p.StationID).ToArray();
- list = list.Where(p => arr.Contains(p.StationID)).ToList();
- foreach (var item in list)
- {
- item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
- }
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- }
- return "";
- }
- catch (Exception)
- {
- return "";
- }
-
-
- }
-
- public string QueryForComboboxByStationID(string fl_id)
- {
- try
- {
- string jsonStr = "[]";
-
- if (fl_id != null && fl_id != "")
- {
- var list = db.SearchAllInfo().Where(p => p.StationID == fl_id).ToList();//判断是否有重复数据
- foreach (var item in list)
- {
- item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
- }
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- return "";
- }
- catch (Exception)
- {
- return "";
- }
-
-
- }
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
deleted file mode 100644
index 68ec1a7..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class FactoryBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string FactoryName)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
-
- if (!String.IsNullOrEmpty(FactoryName))
- {
- list = list.Where(p => p.FactoryName.Contains(FactoryName)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Factory md)
- {
- try
- {
- var list = db.SearchInfoByKey("FactoryName", md.FactoryName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.FactoryID != md.FactoryID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Factory md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.FactoryName == md.FactoryName && p.FactoryID != md.FactoryID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[2];
- proNames[0] = "FactoryName";
- proNames[1] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Factory md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
-
-
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
deleted file mode 100644
index e63a31e..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class ImgVideoBLL
- {
- BBMPTEntities ef = new BBMPTEntities();
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_ImgVideo md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_ImgVideo md)
- {
- try
- {
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "fileUrl";
- proNames[1] = "fileName";
- proNames[2] = "UpdateTime";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_ImgVideo md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string StartTime, string EndTime)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- DateTime stime = Convert.ToDateTime(StartTime);
- DateTime etime = Convert.ToDateTime(EndTime);
- List list = ef.tb_ImgVideo.Where(p => p.CreateTime >= stime && p.CreateTime <= etime).OrderByDescending(p=>p.CreateTime).ToList();
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_ImgVideo SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
deleted file mode 100644
index 1792099..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
+++ /dev/null
@@ -1,414 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Data;
-using System.Data.SqlClient;
-using MESClassLibrary.DAL.BasicInfo;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class InjectionPlanBLL
- {
- BBMPTEntities ef = new BBMPTEntities();
- BasicBLL db = new BasicBLL();
- InjectionPlanDAL dal = new InjectionPlanDAL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_InjectionPlan md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_InjectionPlan md)
- {
- try
- {
-
- //初始化要更新的字段
- string[] proNames = new string[9];
- proNames[0] = "StationID";
- proNames[1] = "BeginTime";
- proNames[2] = "StockNo";
- proNames[3] = "PlanCount";
- proNames[4] = "EndTime";
- proNames[5] = "PlanDate";
- proNames[6] = "RealCycle";
- proNames[7] = "PartNo";
- proNames[8] = "ProductNature";
-
-
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
-
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_InjectionPlan md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string stationID, string stockNo)
- {
- try
- {
-
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo().Where(p => p.IsFinish != 1).ToList();
- if (!String.IsNullOrEmpty(stationID))
- {
- list = list.Where(p => p.StationID.Equals(stationID)).ToList();
- }
- if (!String.IsNullOrEmpty(stockNo))
- {
- list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
- }
-
- list = list.OrderBy(p => p.BeginTime).ToList();
-
- List modelList = new List();
- if (list.Count > 0)
- {
- total = list.Count;
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
-
- #region 联查
- BasicBLL product_db = new BasicBLL();
- var product_list = product_db.SearchAllInfo();
-
- BasicBLL station_db = new BasicBLL();
- var station_list = station_db.SearchAllInfo();
-
- foreach (var item in list)
- {
- InjectionPlanModel dm = Tool.Mapper(item);
- dm.ProductName = "";
- var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
- if (station_info != null)
- {
- dm.StationNo = station_info.StationNo;
- }
-
- if (item.PartNo != null && item.PartNo.IndexOf(",") > 0)
- {
-
- string[] arr_PartNo = item.PartNo.Split(',');
- foreach (var w in arr_PartNo)
- {
- var product_info = product_list.FirstOrDefault(p => p.PartNo == w);
- if (product_info != null)
- {
- dm.ProductName = dm.ProductName + product_info.ProductName + ",";
- }
- }
-
- dm.ProductName = dm.ProductName.Substring(0, dm.ProductName.Length - 1);
-
- }
- else
- {
- var product_info = product_list.FirstOrDefault(p => p.PartNo == item.PartNo);
- if (product_info != null)
- {
- dm.ProductName = product_info.ProductName;
- }
-
- }
-
-
-
- modelList.Add(dm);
- }
- #endregion
-
-
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = modelList;
- jsonStr = JSONTools.ScriptSerialize(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string SearchInfoAll2(string page, string pagesize, string stationID, string stockNo, string StartTime, string EndTime)
- {
- try
- {
-
- string jsonStr = "[]";
- int total = 0;//总行数
-
- total = dal.SearchByTimeCount(stationID, stockNo, StartTime, EndTime);
- DataTable dt = dal.SearchByTime(Convert.ToInt32(page), Convert.ToInt32(pagesize), stationID, stockNo, StartTime, EndTime);
-
- List list = Tool.ConvertTo(dt).ToList();
-
- //List list = ef.tb_InjectionPlan.Where(p => DateTime.Parse(p.BeginTime) >= stime && DateTime.Parse(p.EndTime) <= etime).ToList();
-
-
- if (!String.IsNullOrEmpty(stationID))
- {
- list = list.Where(p => p.StationID.Equals(stationID)).ToList();
- }
- if (!String.IsNullOrEmpty(stockNo))
- {
- list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
- }
-
- list = list.OrderBy(p => p.BeginTime).ToList();
-
- List modelList = new List();
- if (list.Count > 0)
- {
- total = list.Count;
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
-
- #region 联查
- BasicBLL product_db = new BasicBLL();
- var product_list = product_db.SearchAllInfo();
-
- BasicBLL station_db = new BasicBLL();
- var station_list = station_db.SearchAllInfo();
-
- foreach (var item in list)
- {
- InjectionPlanModel dm = Tool.Mapper(item);
- var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
- if (product_info != null)
- {
- dm.PartNo = product_info.PartNo;
- dm.ProductName = product_info.ProductName;
- }
-
- var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
- if (station_info != null)
- {
- dm.StationNo = station_info.StationNo;
- }
-
- modelList.Add(dm);
- }
- #endregion
-
-
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = modelList;
- jsonStr = JSONTools.ScriptSerialize(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- public bool UpdateInfo2(tb_InjectionPlan md)
- {
- try
- {
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "workClass";
- proNames[1] = "JK_Weight";
- proNames[2] = "Waste_Weight";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
-
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息
- ///
- ///
- public List SearchAll()
- {
- try
- {
- var s_list = db.SearchAllInfo().ToList();
- return s_list;
- }
- catch (Exception)
- {
- return null;
- }
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_InjectionPlan SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public String GetEndTime(tb_InjectionPlan md)
- {
- try
- {
- BasicBLL Plastic_db = new BasicBLL();
-
- var info = from c in Plastic_db.SearchAllInfo()
- where c.PartNo == md.PartNo && c.StationID == md.StationID && c.IsBackup == 1
- select c.CycleTime;
-
- if (info.FirstOrDefault() != null)
- {
- double seconds = Convert.ToDouble(info.FirstOrDefault().Value) * Convert.ToDouble(md.PlanCount);
- return Convert.ToDateTime(md.BeginTime).AddSeconds(seconds).ToString("yyyy-MM-dd HH:mm:ss");
- }
- return md.BeginTime;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public DataTable SearchInfoByName(string StationID)
- {
- try
- {
- return dal.SearchPlanByStation(StationID);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
- public DataTable NextSearchInfoByName(string StationID)
- {
- try
- {
- return dal.NextSearchPlanByStation(StationID);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- public bool UpdateFinish(InjectionPlanModel md)
- {
- InjectionPlanDAL dal = new InjectionPlanDAL();
- try
- {
- return dal.UpdateFinish(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
-
- public string GetStartTime(string StationID)
- {
-
- var bf = db.SearchInfoByKey("StationID", StationID).OrderByDescending(p => p.EndTime).FirstOrDefault();
- if (bf != null)
- {
- return bf.EndTime;
- }
-
- return "";
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/LineBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
deleted file mode 100644
index 58d9540..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class LineBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string LineName, string PlaceID, string userID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- //数据权限
- //BasicBLL userdb = new BasicBLL();
- //T_Sys_Users user = userdb.SearchInfoByID(userID);
- //List list = db.SearchInfoContains("LineName", user.Department);
-
- if (!String.IsNullOrEmpty(PlaceID))
- {
- list = list.Where(p => p.PlaceID == PlaceID).ToList();//按条件分页查询
- }
-
- if (!String.IsNullOrEmpty(LineName))
- {
- list = list.Where(p => p.LineName.Contains(LineName)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List ModelList = new List();
- BasicBLL p_db = new BasicBLL();
- var p_list = p_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- LineModel dm = Tool.Mapper(item);
- var info = p_list.FirstOrDefault(p => p.PlaceID == item.PlaceID);
- if (info != null)
- {
- dm.PlaceName = info.PlaceName;
- }
- ModelList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = ModelList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Line md)
- {
- try
- {
- var list = db.SearchInfoByKey("LineName", md.LineName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.LineID != md.LineID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Line md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.LineName == md.LineName && p.LineID != md.LineID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "PlaceID";
- proNames[1] = "LineName";
- proNames[2] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Line md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
deleted file mode 100644
index a38c035..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class MachineBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_Machine md)
- {
- try
- {
- var list = db.SearchInfoByKey("MachineNo", md.MachineNo);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.MachineID != md.MachineID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Machine md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.MachineNo == md.MachineNo && p.MachineID != md.MachineID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[2];
- proNames[0] = "MachineNo";
- proNames[1] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Machine md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string machineNo)
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(machineNo))
- {
- list = list.Where(p => p.MachineNo.Contains(machineNo)).ToList();
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
-
- }
-
- ///
- /// 查询全部信息
- ///
- ///
- public List SearchAll()
- {
- try
- {
- var s_list = db.SearchAllInfo().ToList();
- return s_list;
- }
- catch (Exception)
- {
- return null;
- }
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Machine SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- //下拉框查询方法
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
-
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ManufacturerBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ManufacturerBLL.cs
deleted file mode 100644
index a41cbfb..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ManufacturerBLL.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class ManufactureBLL
- {
- readonly BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_Manufacturer md)
- {
- try
- {
- var list = db.SearchInfoByKey("ManufacturerName", md.ManufacturerName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID).Count() > 0)
- {
- return false;
- }
-
- }
- md.CreateTime = DateTime.Now;
- var result = db.AddInfo(md);
- return result;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Manufacturer md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.ManufacturerName == md.ManufacturerName && p.ID != md.ID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[] {
- "ManufacturerName",
- "Des",
- "UpdateTime",
- };
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- md.UpdateTime = DateTime.Now;
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Manufacturer md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string name)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- IEnumerable list = db.SearchAllInfo();
-
- if (!string.IsNullOrEmpty(name))
- {
- list = list.Where(p => p.ManufacturerName != null && p.ManufacturerName.Contains(name));
- }
- List modelList = new List();
- if (list.Any())
- {
- total = list.Count();
-
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize));
-
- JsonDataModel md = new JsonDataModel
- {
- total = total.ToString(),
- rows = list.ToList()
- };
- jsonStr = md.ToSerializer();
- }
-
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 查询全部信息
- ///
- ///
- public List SearchAll()
- {
- try
- {
- var s_list = db.SearchAllInfo().ToList();
- return s_list;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Manufacturer SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
deleted file mode 100644
index ab06c3e..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.DAL.BasicInfo;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class ModelInfoBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_ModelInfo md)
- {
- try
- {
- var list = db.SearchInfoByKey("ModelNo", md.ModelNo);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_ModelInfo md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.ModelNo == md.ModelNo && p.ID != md.ID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[14];
- proNames[0] = "ModelName";
- proNames[1] = "ModelNo";
- proNames[2] = "PermanentAssetsNo";
- proNames[3] = "Tonnage";
- proNames[4] = "ServiceLife";
- proNames[5] = "Supplier";
- proNames[6] = "PartWeight";
- proNames[7] = "InjectionPeriod";
- proNames[8] = "LocatingRingSize";
- proNames[9] = "OutForm";
- proNames[10] = "ModelWeight";
- proNames[11] = "RunnerForm";
- proNames[12] = "ModelCavityNo";
- proNames[13] = "ModelSize";
-
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_ModelInfo md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string ModelNo)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(ModelNo))
- {
- list = list.Where(p => p.ModelNo.Contains(ModelNo)).ToList();
- }
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_ModelInfo SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().OrderBy(p => p.ModelNo).ToList();//判断是否有重复数据
-
- List sl = new List();
-
- foreach (var item in list)
- {
- SelectModel md = new SelectModel();
- md.textField = item.ModelName;
- md.valueField = item.ID;
- sl.Add(md);
- }
-
- jsonStr = JSONTools.ScriptSerialize(sl);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
-
-
- }
-
- public DataTable SearchInfo(string ModelNo)
- {
- try
- {
- ModelInfoDAL da=new ModelInfoDAL();
- return da.SearchInfo(ModelNo);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- //public DataTable SearchAll()
- //{
- // ColorDAL da = new ColorDAL();
- // try
- // {
- // return da.SearchInfoAll();
- // }
- // catch (Exception ex)
- // {
- // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- // return null;
- // }
- //}
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelProductBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelProductBLL.cs
deleted file mode 100644
index 9cd0aac..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelProductBLL.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using MESClassLibrary.DAL;
-using MESClassLibrary.DAL.BasicInfo;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class ModelProductBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_Model_Product md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Model_Product md)
- {
- try
- {
- //初始化要更新的字段
- string[] proNames = new string[] {
- "ProuctID",
- "ModelID",
- };
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Model_Product md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string ModelID, string ProductID)
- {
- try
- {
- string result = "[]";
- int total = 0;//总行数
-
- IEnumerable list = db.SearchAllInfo();
- if (!string.IsNullOrEmpty(ModelID))
- {
- list = list.Where(p => p.ModelID == ModelID);
- }
- if (!string.IsNullOrEmpty(ProductID))
- {
- list = list.Where(p => p.ProuctID == ProductID);
- }
-
-
- if (list.Any())
- {
- total = list.Count();
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- BasicBLL modelDb = new BasicBLL();
- var modelList = modelDb.SearchAllInfo();
-
- BasicBLL productDb = new BasicBLL();
- var productList = productDb.SearchAllInfo();
-
- var mpmList = new List();
- foreach (var item in list)
- {
- ModelProductModel mpm = Tool.Mapper(item);
- var productInfo = productList.FirstOrDefault(prod => prod.ProductID == item.ProuctID);
- var modelInfo = modelList.FirstOrDefault(mod => mod.ID == item.ModelID);
-
- if (productInfo != null)
- {
- mpm.ProductName = productInfo.ProductName;
- mpm.PartNo = productInfo.PartNo;
- }
- if (modelInfo != null)
- {
- mpm.ModelName = modelInfo.ModelName;
- mpm.ModelNo = modelInfo.ModelNo;
- }
-
- mpmList.Add(mpm);
- }
- JsonDataModel md = new JsonDataModel
- {
- total = total.ToString(),
- rows = mpmList
- };
- result = md.ToSerializer();
-
- }
- return result;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Model_Product SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public DataTable SearchInfo(string ModelID, string ProuctID)
- {
- try
- {
- ModelProductDAL da=new ModelProductDAL();
- return da.SearchInfo(ModelID, ProuctID);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
deleted file mode 100644
index 199d30b..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
-
- public class ModelUpdateBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddUpdateInfo(tb_Model_Update md)
- {
- try
- {
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_Model_Update md)
- {
- try
- {
- //初始化要更新的字段
- string[] proNames = new string[5];
- proNames[0] = "Purpose";
- proNames[1] = "State";
- proNames[2] = "Supplier";
- proNames[3] = "Remarks";
- proNames[4] = "AddTime";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_Model_Update md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string ModelID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- List list = db.SearchInfoByKey("ModelID", ModelID).OrderByDescending(p => p.AddTime).ToList();
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_Model_Update SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
deleted file mode 100644
index 20e13c6..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.Model;
-using MESClassLibrary.DAL.BasicInfo;
-using System.Data;
-using System.Data.SqlClient;
-using System.Reflection;
-using MESClassLibrary.EFModel;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class OperatorBLL
- {
- BasicBLL db = new BasicBLL();
-
- OperatorDAL dal = new OperatorDAL();
-
- public DataTable SearchInfoByName(string OperatorName, string StationID)
- {
- try
- {
- return dal.SearchInfoByName(OperatorName, StationID);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
-
- public DataTable SearchInfoByNameAndPsw(string OperatorName, string StationID, string psw)
- {
- try
- {
- return dal.SearchInfoByNameAndPsw(OperatorName, StationID, psw);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string OperatorName, string StationID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(StationID))
- {
- list = list.Where(p => p.StationID.Equals(StationID)).ToList();//按条件分页查询
- }
-
- if (!String.IsNullOrEmpty(OperatorName))
- {
- list = list.Where(p => p.OperatorName.Contains(OperatorName)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List StationList = new List();
- BasicBLL pl_db = new BasicBLL();
- var pl_list = pl_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- OperatorModel dm = Tool.Mapper(item);
- var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
- if (info != null)
- {
- dm.StationNo = info.StationNo;
- }
- StationList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = StationList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Operator md)
- {
- try
- {
- var list = db.SearchInfoByKey("OperatorNo", md.OperatorNo);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.OperatorID != md.OperatorID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Operator md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.OperatorNo == md.OperatorNo && p.OperatorID != md.OperatorID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[5];
- proNames[0] = "StationID";
- proNames[1] = "OperatorNo";
- proNames[2] = "OperatorName";
- proNames[3] = "OperatorPsw";
- proNames[4] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Operator md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
deleted file mode 100644
index 830fe66..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
-
- public class PaintInfoBLL
- {
- BasicBLL dbPB = new BasicBLL();
- BasicBLL db = new BasicBLL();
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddInfo(tb_PaintInfo md)
- {
- try
- {
- var list = db.SearchInfoByKey("PaintCode", md.PaintCode);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateInfo(tb_PaintInfo md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.PaintCode == md.PaintCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[5];
- proNames[0] = "PaintCode";
- proNames[1] = "PaintName";
- proNames[2] = "PaintModel";
- //proNames[3] = "UnitCode";
- proNames[3] = "CarModelCode";
- proNames[4] = "IsUsing";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 删除信息
- ///
- ///
- ///
- ///
- public bool DeleteInfo(tb_PaintInfo md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- ///
- /// 查询全部信息分页
- ///
- ///
- public string SearchInfoAll(string page, string pagesize, string PaintCode)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(PaintCode))
- {
- list = list.Where(p => p.PaintCode.Contains(PaintCode)).ToList();
- }
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = list;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- ///
- /// 根据ID查询信息
- ///
- ///
- ///
- public tb_PaintInfo SearchInfoByID(string id)
- {
- try
- {
- return db.SearchInfoByID(id);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
-
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
-
- List sl = new List();
-
- foreach (var item in list)
- {
- SelectModel md = new SelectModel();
- md.textField = item.PaintCode + "--" + item.PaintName;
- md.valueField = item.ID;
- sl.Add(md);
- }
-
- jsonStr = JSONTools.ScriptSerialize(sl);
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
-
-
- public string SearchRelation(string page, string pagesize, string PaintID, string BucketID)
- {
-
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
-
-
- List list = dbPB.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(PaintID))
- {
- list = list.Where(p => p.PaintID == PaintID).ToList();
- }
-
- if (!String.IsNullOrEmpty(BucketID))
- {
- list = list.Where(p => p.BucketID == BucketID).ToList();
- }
-
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
-
- List modelList = new List();
-
- #region 联查
- BasicBLL PaintInfo_db = new BasicBLL();
- var PaintInfo_list = PaintInfo_db.SearchAllInfo();
-
- BasicBLL BucketInfo_db = new BasicBLL();
- var BucketInfo_list = BucketInfo_db.SearchAllInfo();
-
- foreach (var item in list)
- {
- Paint_BucketModel dm = Tool.Mapper(item);
- var PaintInfo_info = PaintInfo_list.FirstOrDefault(p => p.ID == item.PaintID);
- if (PaintInfo_info != null)
- {
- dm.PaintCode = PaintInfo_info.PaintCode;
- dm.PaintName = PaintInfo_info.PaintName;
- }
-
- var BucketInfo_info = BucketInfo_list.FirstOrDefault(p => p.ID == item.BucketID);
- if (BucketInfo_info != null)
- {
- dm.BucketCode = BucketInfo_info.BucketCode;
- dm.BucketName = BucketInfo_info.BucketName;
- }
-
- modelList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = modelList;
- return JSONTools.ScriptSerialize(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return null;
- }
- }
-
- ///
- /// 新增信息
- ///
- ///
- ///
- public bool AddRelation(tb_Paint_Bucket md)
- {
- try
- {
- var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
- return dbPB.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- ///
- ///
- public bool UpdateRelation(tb_Paint_Bucket md)
- {
- try
- {
- var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.ID != md.ID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[2];
- proNames[0] = "PaintID";
- proNames[1] = "BucketID";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return dbPB.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- public bool DeleteRelation(tb_Paint_Bucket md)
- {
- try
- {
- List ef = dbPB.SearchInfoByKey("ID", md.ID);
- if (ef!=null && ef.Count>0)
- {
- return dbPB.DelInfo(ef.First());
- }
- return false;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
-
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
deleted file mode 100644
index 52b4c86..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class PlaceBLL
- {
- BasicBLL db = new BasicBLL();
- ///
- /// 查询信息
- ///
- ///
- public string SearchInfo(string page, string pagesize, string PlaceName, string FactoryID)
- {
- try
- {
- string jsonStr = "[]";
- int total = 0;//总行数
- List list = db.SearchAllInfo();
-
- if (!String.IsNullOrEmpty(FactoryID))
- {
- list = list.Where(p => p.FactoryID == FactoryID).ToList();//按条件分页查询
- }
-
- if (!String.IsNullOrEmpty(PlaceName))
- {
- list = list.Where(p => p.PlaceName.Contains(PlaceName)).ToList();//按条件分页查询
- }
-
- if (list.Count > 0)
- {
- total = list.Count;
- int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
- list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
-
- #region 联查
- List ModelList = new List();
- BasicBLL p_db = new BasicBLL();
- var p_list = p_db.SearchAllInfo().ToList();
- foreach (var item in list)
- {
- PlaceModel dm = Tool.Mapper(item);
- var info = p_list.FirstOrDefault(p => p.FactoryID == item.FactoryID);
- if (info != null)
- {
- dm.FactoryName = info.FactoryName;
- }
- ModelList.Add(dm);
- }
- #endregion
-
- JsonDataModel md = new JsonDataModel();
- md.total = total.ToString();
- md.rows = ModelList;
- jsonStr = JSONTools.ScriptSerialize>(md);
- }
- return jsonStr;
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return "";
- }
-
-
- }
- ///
- /// 添加信息
- ///
- /// 生产线模型对象
- ///
- public bool AddInfo(tb_Place md)
- {
- try
- {
- var list = db.SearchInfoByKey("PlaceName", md.PlaceName);//判断是否有重复数据
- if (list != null)
- {
- if (list.Where(p => p.PlaceID != md.PlaceID).Count() > 0)
- {
- return false;
- }
-
- }
-
- return db.AddInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
-
- }
- ///
- /// 修改信息
- ///
- /// 生产线模型对象
- ///
- public bool UpdateInfo(tb_Place md)
- {
- try
- {
- var list = db.SearchAllInfo().Where(p => p.PlaceName == md.PlaceName && p.PlaceID != md.PlaceID).ToList();//判断是否有重复数据
- if (list.Count > 0)
- {
- return false;
- }
-
- //初始化要更新的字段
- string[] proNames = new string[3];
- proNames[0] = "FactoryID";
- proNames[1] = "PlaceName";
- proNames[2] = "Des";
-
- //必填字段初始化,如果不需要更新必填字段则设置为空即可,时间类型无需初始化
- //如果没有初始化必填字段,更新会报错
- //md.Des = "";
-
- return db.UpdateInfo(md, proNames);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
- /// 删除生产线信息
- public bool DelInfo(tb_Place md)
- {
- try
- {
- return db.DelInfo(md);
- }
- catch (Exception ex)
- {
- LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- return false;
- }
- }
-
- public string GetComboboxData()
- {
- try
- {
- string jsonStr = "[]";
- var list = db.SearchAllInfo().ToList();//判断是否有重复数据
- jsonStr = JSONTools.ScriptSerialize>(list);
- return jsonStr;
- }
- catch (Exception)
- {
- return "";
- }
- }
- }
-}
diff --git a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs b/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
deleted file mode 100644
index e137fa5..0000000
--- a/喷涂上线/Code/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
+++ /dev/null
@@ -1,471 +0,0 @@
-using MESClassLibrary.BLL.Log;
-using MESClassLibrary.DAL.BasicInfo;
-using MESClassLibrary.EFModel;
-using MESClassLibrary.Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-
-namespace MESClassLibrary.BLL.BasicInfo
-{
- public class ProductBLL
- {
- BasicBLL db = new BasicBLL();
-
- ///