diff --git a/ButcherFactory.BO/LocalBL/SegmentStockUpBL.cs b/ButcherFactory.BO/LocalBL/SegmentStockUpBL.cs index fc1edb0..d45aee1 100644 --- a/ButcherFactory.BO/LocalBL/SegmentStockUpBL.cs +++ b/ButcherFactory.BO/LocalBL/SegmentStockUpBL.cs @@ -49,7 +49,7 @@ namespace ButcherFactory.BO.LocalBL return JsonConvert.DeserializeObject>(json); } - public static void InsertStockUpDetail(StockUpDetail detail) + public static string InsertStockUpDetail(StockUpDetail detail) { var min = new MinStockUpDetail() { BarCode = detail.BarCode, SecondNumber = detail.SecondNumber, UnitNumber = detail.UnitNumber }; var json = JsonConvert.SerializeObject(min); diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj index 5d143c4..485d0da 100644 --- a/ButcherFactory.Form/ButcherFactory.Form.csproj +++ b/ButcherFactory.Form/ButcherFactory.Form.csproj @@ -240,6 +240,7 @@ SegmentStockUpForm.cs + @@ -341,6 +342,11 @@ + + + + + if $(Configuration)==Debug ( diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html new file mode 100644 index 0000000..d60a336 --- /dev/null +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html @@ -0,0 +1,19 @@ + + + + + + + + + + + + +
$Goods_Name
规格：$Goods_Spec
产品重量：$Weight
生产日期: $Date
+ + \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrintEnd.html b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrintEnd.html new file mode 100644 index 0000000..6518d8f --- /dev/null +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrintEnd.html @@ -0,0 +1,30 @@ + + + + + + + + $tableContent +
+
$DateTime
+ + \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs index a335708..d45ffdd 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.Designer.cs @@ -28,18 +28,18 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.uScanPanel1 = new WinFormControl.UScanPanel(); this.label1 = new System.Windows.Forms.Label(); this.dataPicker = new System.Windows.Forms.Label(); @@ -79,6 +79,7 @@ this.label11 = new System.Windows.Forms.Label(); this.panel7 = new System.Windows.Forms.Panel(); this.refresh = new ButcherFactory.Controls.ColorButton(); + this.printCk = new System.Windows.Forms.CheckBox(); this.roundPanel1.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.mainGridView)).BeginInit(); @@ -209,8 +210,8 @@ this.mainGridView.AllowUserToDeleteRows = false; this.mainGridView.AllowUserToResizeColumns = false; this.mainGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); - this.mainGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.mainGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.mainGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -218,12 +219,12 @@ this.mainGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.mainGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.mainGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); - dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle26.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mainGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mainGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.mainGridView.ColumnHeadersHeight = 30; this.mainGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.mainGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -244,10 +245,10 @@ this.mainGridView.Name = "mainGridView"; this.mainGridView.ReadOnly = true; this.mainGridView.RowHeadersVisible = false; - dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(243)))), ((int)(((byte)(250))))); - dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 9F); - dataGridViewCellStyle31.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); - this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(243)))), ((int)(((byte)(250))))); + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F); + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); + this.mainGridView.RowsDefaultCellStyle = dataGridViewCellStyle12; this.mainGridView.RowTemplate.Height = 40; this.mainGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.mainGridView.Size = new System.Drawing.Size(545, 320); @@ -315,8 +316,8 @@ // D_SecondNumber // this.D_SecondNumber.DataPropertyName = "SecondNumber"; - dataGridViewCellStyle27.Format = "#0.######"; - this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle8.Format = "#0.######"; + this.D_SecondNumber.DefaultCellStyle = dataGridViewCellStyle8; this.D_SecondNumber.HeaderText = "订货数量"; this.D_SecondNumber.Name = "D_SecondNumber"; this.D_SecondNumber.ReadOnly = true; @@ -324,8 +325,8 @@ // D_UnitNum // this.D_UnitNum.DataPropertyName = "UnitNum"; - dataGridViewCellStyle28.Format = "#0.######"; - this.D_UnitNum.DefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle9.Format = "#0.######"; + this.D_UnitNum.DefaultCellStyle = dataGridViewCellStyle9; this.D_UnitNum.HeaderText = "订货重量"; this.D_UnitNum.Name = "D_UnitNum"; this.D_UnitNum.ReadOnly = true; @@ -333,8 +334,8 @@ // D_SSecondNumber // this.D_SSecondNumber.DataPropertyName = "SSecondNumber"; - dataGridViewCellStyle29.Format = "#0.######"; - this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle10.Format = "#0.######"; + this.D_SSecondNumber.DefaultCellStyle = dataGridViewCellStyle10; this.D_SSecondNumber.HeaderText = "备货数量"; this.D_SSecondNumber.Name = "D_SSecondNumber"; this.D_SSecondNumber.ReadOnly = true; @@ -342,8 +343,8 @@ // D_SUnitNum // this.D_SUnitNum.DataPropertyName = "SUnitNum"; - dataGridViewCellStyle30.Format = "#0.######"; - this.D_SUnitNum.DefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle11.Format = "#0.######"; + this.D_SUnitNum.DefaultCellStyle = dataGridViewCellStyle11; this.D_SUnitNum.HeaderText = "备货重量"; this.D_SUnitNum.Name = "D_SUnitNum"; this.D_SUnitNum.ReadOnly = true; @@ -388,8 +389,8 @@ this.detailGridView.AllowUserToDeleteRows = false; this.detailGridView.AllowUserToResizeColumns = false; this.detailGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); - this.detailGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(228)))), ((int)(((byte)(203))))); + this.detailGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.detailGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -397,12 +398,12 @@ this.detailGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.detailGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.detailGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); - dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle33.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.detailGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.detailGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.detailGridView.ColumnHeadersHeight = 30; this.detailGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.detailGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -418,10 +419,10 @@ this.detailGridView.Name = "detailGridView"; this.detailGridView.ReadOnly = true; this.detailGridView.RowHeadersVisible = false; - dataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); - dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 10F); - dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); - this.detailGridView.RowsDefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(247)))), ((int)(((byte)(240))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 10F); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(148)))), ((int)(((byte)(74))))); + this.detailGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; this.detailGridView.RowTemplate.Height = 40; this.detailGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.detailGridView.Size = new System.Drawing.Size(580, 320); @@ -464,8 +465,8 @@ // B_SecondNumber // this.B_SecondNumber.DataPropertyName = "SecondNumber"; - dataGridViewCellStyle34.Format = "#0.######"; - this.B_SecondNumber.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle3.Format = "#0.######"; + this.B_SecondNumber.DefaultCellStyle = dataGridViewCellStyle3; this.B_SecondNumber.HeaderText = "数量"; this.B_SecondNumber.Name = "B_SecondNumber"; this.B_SecondNumber.ReadOnly = true; @@ -474,8 +475,8 @@ // B_UnitNumber // this.B_UnitNumber.DataPropertyName = "UnitNumber"; - dataGridViewCellStyle35.Format = "#0.######"; - this.B_UnitNumber.DefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle4.Format = "#0.######"; + this.B_UnitNumber.DefaultCellStyle = dataGridViewCellStyle4; this.B_UnitNumber.HeaderText = "重量"; this.B_UnitNumber.Name = "B_UnitNumber"; this.B_UnitNumber.ReadOnly = true; @@ -546,6 +547,7 @@ // // panel7 // + this.panel7.Controls.Add(this.printCk); this.panel7.Controls.Add(this.refresh); this.panel7.Location = new System.Drawing.Point(824, 5); this.panel7.Name = "panel7"; @@ -565,6 +567,17 @@ this.refresh.UseVisualStyleBackColor = false; this.refresh.Click += new System.EventHandler(this.refresh_Click); // + // printCk + // + this.printCk.AutoSize = true; + this.printCk.Font = new System.Drawing.Font("黑体", 12F); + this.printCk.Location = new System.Drawing.Point(14, 13); + this.printCk.Name = "printCk"; + this.printCk.Size = new System.Drawing.Size(91, 20); + this.printCk.TabIndex = 1; + this.printCk.Text = "打印条码"; + this.printCk.UseVisualStyleBackColor = true; + // // SegmentStockUpForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -583,6 +596,7 @@ this.panel6.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.detailGridView)).EndInit(); this.panel7.ResumeLayout(false); + this.panel7.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -629,5 +643,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn B_SaleOutStoreID; private System.Windows.Forms.DataGridViewTextBoxColumn B_SecondNumber; private System.Windows.Forms.DataGridViewTextBoxColumn B_UnitNumber; + private System.Windows.Forms.CheckBox printCk; } } \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs index 74e6c33..eb233f2 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.cs @@ -95,11 +95,13 @@ namespace ButcherFactory.SegmentStockUp_ detail.UnitNumber = scan.DecimalExt1; if (detail.UnitNumber.HasValue && first.Rate.HasValue) detail.SecondNumber = detail.UnitNumber * first.Rate; - SegmentStockUpBL.InsertStockUpDetail(detail); + var customer = SegmentStockUpBL.InsertStockUpDetail(detail); allDetail.Add(detail); first.SSecondNumber = (first.SSecondNumber ?? 0) + (detail.SecondNumber ?? 0); first.SUnitNum = (first.SUnitNum ?? 0) + (detail.UnitNumber ?? 0); BindMainGrid(sendTime, first.Goods_ID); + if(printCk.Checked) + SegmentStockUpPrint.Print(detail, customer); } void FillAllDetail(DateTime date, long driverLineID, long goodsID) diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx index 2e36077..d1e40c1 100644 --- a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpForm.resx @@ -117,55 +117,55 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True \ No newline at end of file diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.cs b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.cs new file mode 100644 index 0000000..9198b9a --- /dev/null +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.cs @@ -0,0 +1,22 @@ +using ButcherFactory.BO; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ButcherFactory.SegmentStockUp_ +{ + internal static class SegmentStockUpPrint + { + const string PRINTFILE = @"PrintTemplate\SegmentStockUpPrint.html"; + public static void Print(StockUpDetail entity, string customer) + { + var dic = new Dictionary(); + dic.Add("$Customer_Name", customer); + dic.Add("$DriverLine_Name", entity.DeliverGoodsLine_Name); + dic.Add("$Date", entity.Date.ToString("yyyy/MM/dd")); + BwpClientPrint.BwpClientWebPrint.Print(PRINTFILE, dic); + } + } +} diff --git a/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.html b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.html new file mode 100644 index 0000000..e1bbaa2 --- /dev/null +++ b/ButcherFactory.Form/SegmentStockUp_/SegmentStockUpPrint.html @@ -0,0 +1,30 @@ + + + + + + +
+
客 户：$Customer_Name
+
线 路：$DriverLine_Name
+
发货日期：$Date
+
+ + \ No newline at end of file diff --git a/ButcherFactorySolution/ButcherFactorySolution.vdproj b/ButcherFactorySolution/ButcherFactorySolution.vdproj index 60f395d..07a7110 100644 --- a/ButcherFactorySolution/ButcherFactorySolution.vdproj +++ b/ButcherFactorySolution/ButcherFactorySolution.vdproj @@ -21,24 +21,6 @@ } "Entry" { - "MsmKey" = "8:_01E56548E879FA791BE1522C98562ED5" - "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_01E56548E879FA791BE1522C98562ED5" - "OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_01E56548E879FA791BE1522C98562ED5" - "OwnerKey" = "8:_60407C93181F42DFB15499FA85D78DE3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_083AAEAE39990B76FE06389D076F1D2C" "OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC" "MsmSig" = "8:_UNDEFINED" @@ -57,7 +39,7 @@ } "Entry" { - "MsmKey" = "8:_205FCEA99488480A87AEB53DD601C834" + "MsmKey" = "8:_356C0DCDD67E4B6190DA797DBC373C65" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -81,62 +63,68 @@ } "Entry" { - "MsmKey" = "8:_42002CAFBC974A5E8927D0CB32BE755D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784" + "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_45A67B7D2502BF76FA9795FF8899DE9E" - "OwnerKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784" + "OwnerKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_45A67B7D2502BF76FA9795FF8899DE9E" - "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" + "MsmKey" = "8:_4083346C24A7D8470DB4B61D58809784" + "OwnerKey" = "8:_60407C93181F42DFB15499FA85D78DE3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_45A67B7D2502BF76FA9795FF8899DE9E" - "OwnerKey" = "8:_9FC311468D3F37CF5966009732A129CC" + "MsmKey" = "8:_42002CAFBC974A5E8927D0CB32BE755D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4D70C75DA5B25015E8DDBF829D234FE8" - "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5" + "MsmKey" = "8:_522FFC69C80F4D5DA4C9B348F8590C61" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4D70C75DA5B25015E8DDBF829D234FE8" - "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" + "MsmKey" = "8:_60407C93181F42DFB15499FA85D78DE3" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_522FFC69C80F4D5DA4C9B348F8590C61" + "MsmKey" = "8:_654AEDD527E14D5B8535CC81E96B8185" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_60407C93181F42DFB15499FA85D78DE3" + "MsmKey" = "8:_6B8CB9F55DD94D858DE81FA1CF43B162" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_654AEDD527E14D5B8535CC81E96B8185" + "MsmKey" = "8:_6F0E808293504BA19048B340A88AEAA1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6F0E808293504BA19048B340A88AEAA1" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_70C18C0E0DFD66B15418411D1857F74B" + "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_70C18C0E0DFD66B15418411D1857F74B" + "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -177,20 +165,20 @@ } "Entry" { - "MsmKey" = "8:_8D58B6FD6249E85E930D55CCE736855E" - "OwnerKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "MsmKey" = "8:_7D717FB201604CFA7400BFF79560F461" + "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8D58B6FD6249E85E930D55CCE736855E" + "MsmKey" = "8:_7D717FB201604CFA7400BFF79560F461" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8D58B6FD6249E85E930D55CCE736855E" - "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5" + "MsmKey" = "8:_7D717FB201604CFA7400BFF79560F461" + "OwnerKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -213,62 +201,68 @@ } "Entry" { - "MsmKey" = "8:_9FC311468D3F37CF5966009732A129CC" - "OwnerKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "MsmKey" = "8:_9F705636DF3FC7591C089E51A914B437" + "OwnerKey" = "8:_4083346C24A7D8470DB4B61D58809784" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9FC311468D3F37CF5966009732A129CC" + "MsmKey" = "8:_9F705636DF3FC7591C089E51A914B437" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B24BD1F54711439BA132ABC05EC82AF6" + "MsmKey" = "8:_ACAF252E422F4D7CB5B3A8158DE3E7DA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C05D1B3E0BB241258C4AACD21FAB6E72" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2" + "OwnerKey" = "8:_4083346C24A7D8470DB4B61D58809784" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2" + "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" - "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5" + "MsmKey" = "8:_B027E23B6E431EA7A5006FCB5BB20236" + "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "MsmKey" = "8:_B027E23B6E431EA7A5006FCB5BB20236" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_B027E23B6E431EA7A5006FCB5BB20236" + "OwnerKey" = "8:_70C18C0E0DFD66B15418411D1857F74B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D32656229814B10B3981022C6BAE7B85" - "OwnerKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "MsmKey" = "8:_B24BD1F54711439BA132ABC05EC82AF6" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D32656229814B10B3981022C6BAE7B85" - "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" + "MsmKey" = "8:_C05D1B3E0BB241258C4AACD21FAB6E72" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D32656229814B10B3981022C6BAE7B85" - "OwnerKey" = "8:_4D70C75DA5B25015E8DDBF829D234FE8" + "MsmKey" = "8:_CDEF0D7FE4F14E5E84A3902D05B165EC" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -279,20 +273,26 @@ } "Entry" { - "MsmKey" = "8:_D75F76D9C28EDCFD7454D52CBB18C6E9" - "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5" + "MsmKey" = "8:_DD91DACD7A0B48CE8926B0CA4EAB5E50" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D75F76D9C28EDCFD7454D52CBB18C6E9" + "MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2" + "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2" "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DD91DACD7A0B48CE8926B0CA4EAB5E50" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2" + "OwnerKey" = "8:_4083346C24A7D8470DB4B61D58809784" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -303,14 +303,20 @@ } "Entry" { - "MsmKey" = "8:_F6C3568789ED47638FCE9494DA24CF51" + "MsmKey" = "8:_FCCE14D01A514BCF927F597A9F5842D2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FCCE14D01A514BCF927F597A9F5842D2" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35" + "OwnerKey" = "8:_4083346C24A7D8470DB4B61D58809784" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35" + "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -352,49 +358,49 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5" + "OwnerKey" = "8:_4083346C24A7D8470DB4B61D58809784" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D75F76D9C28EDCFD7454D52CBB18C6E9" + "OwnerKey" = "8:_FD82AF7F959387F3F4C23A0EB1AC0E35" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4D70C75DA5B25015E8DDBF829D234FE8" + "OwnerKey" = "8:_AED9467B5BDCD87EC2746DB4EF7A24D2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C1BAA40E3F5E065EA88D97DA96D5992D" + "OwnerKey" = "8:_9F705636DF3FC7591C089E51A914B437" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9FC311468D3F37CF5966009732A129CC" + "OwnerKey" = "8:_70C18C0E0DFD66B15418411D1857F74B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_45A67B7D2502BF76FA9795FF8899DE9E" + "OwnerKey" = "8:_B027E23B6E431EA7A5006FCB5BB20236" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8D58B6FD6249E85E930D55CCE736855E" + "OwnerKey" = "8:_DE32A8488C67365FC9BBB4CAF2E074E2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D32656229814B10B3981022C6BAE7B85" + "OwnerKey" = "8:_7D717FB201604CFA7400BFF79560F461" "MsmSig" = "8:_UNDEFINED" } } @@ -512,37 +518,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_01E56548E879FA791BE1522C98562ED5" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherFactory.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_01E56548E879FA791BE1522C98562ED5" - { - "Name" = "8:ButcherFactory.BO.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:ButcherFactory.BO.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_083AAEAE39990B76FE06389D076F1D2C" { "AssemblyRegister" = "3:1" @@ -614,10 +589,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_205FCEA99488480A87AEB53DD601C834" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_356C0DCDD67E4B6190DA797DBC373C65" { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\SegmentProductionPrint.html" - "TargetName" = "8:SegmentProductionPrint.html" + "SourcePath" = "8:..\\ButcherFactory.Form\\SegmentStockUp_\\SegmentStockUpPrint.html" + "TargetName" = "8:SegmentStockUpPrint.html" "Tag" = "8:" "Folder" = "8:_3F4A4FA4686E48BC8111A3DABADB7686" "Condition" = "8:" @@ -665,40 +640,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42002CAFBC974A5E8927D0CB32BE755D" - { - "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\click.wav" - "TargetName" = "8:click.wav" - "Tag" = "8:" - "Folder" = "8:_6866532246094A308566729453EB35CA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_45A67B7D2502BF76FA9795FF8899DE9E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4083346C24A7D8470DB4B61D58809784" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ButcherFactory.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_45A67B7D2502BF76FA9795FF8899DE9E" + "_4083346C24A7D8470DB4B61D58809784" { - "Name" = "8:MongoDB.Bson.dll" + "Name" = "8:ButcherFactory.BO.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MongoDB.Bson.dll" + "SourcePath" = "8:ButcherFactory.BO.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" @@ -712,27 +667,16 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4D70C75DA5B25015E8DDBF829D234FE8" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42002CAFBC974A5E8927D0CB32BE755D" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4D70C75DA5B25015E8DDBF829D234FE8" - { - "Name" = "8:Forks.JsonRpc.Client.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Forks.JsonRpc.Client.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\click.wav" + "TargetName" = "8:click.wav" "Tag" = "8:" - "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" + "Folder" = "8:_6866532246094A308566729453EB35CA" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -744,7 +688,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_522FFC69C80F4D5DA4C9B348F8590C61" @@ -818,6 +762,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B8CB9F55DD94D858DE81FA1CF43B162" + { + "SourcePath" = "8:..\\ButcherFactory.Form\\SegmentProduction_\\SegmentProductionPrint.html" + "TargetName" = "8:SegmentProductionPrint.html" + "Tag" = "8:" + "Folder" = "8:_3F4A4FA4686E48BC8111A3DABADB7686" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6F0E808293504BA19048B340A88AEAA1" { "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Images\\formTitle.png" @@ -838,6 +802,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70C18C0E0DFD66B15418411D1857F74B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_70C18C0E0DFD66B15418411D1857F74B" + { + "Name" = "8:MongoDB.Driver.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MongoDB.Driver.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_748F78F338674C3884B702673BEDE665" { "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l60.wav" @@ -938,20 +933,20 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D58B6FD6249E85E930D55CCE736855E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7D717FB201604CFA7400BFF79560F461" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8D58B6FD6249E85E930D55CCE736855E" + "_7D717FB201604CFA7400BFF79560F461" { - "Name" = "8:Forks.Utils.dll" + "Name" = "8:Forks.Json.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Forks.Utils.dll" + "SourcePath" = "8:Forks.Json.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" @@ -1040,20 +1035,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9FC311468D3F37CF5966009732A129CC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9F705636DF3FC7591C089E51A914B437" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" "ScatterAssemblies" { - "_9FC311468D3F37CF5966009732A129CC" + "_9F705636DF3FC7591C089E51A914B437" { - "Name" = "8:MongoDB.Driver.dll" + "Name" = "8:Forks.EnterpriseServices.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MongoDB.Driver.dll" + "SourcePath" = "8:Forks.EnterpriseServices.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" @@ -1067,16 +1062,16 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B24BD1F54711439BA132ABC05EC82AF6" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACAF252E422F4D7CB5B3A8158DE3E7DA" { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l55.wav" - "TargetName" = "8:l55.wav" + "SourcePath" = "8:..\\ButcherFactory.Form\\SegmentProduction_\\SegmentProductionPrintEnd.html" + "TargetName" = "8:SegmentProductionPrintEnd.html" "Tag" = "8:" - "Folder" = "8:_6866532246094A308566729453EB35CA" + "Folder" = "8:_3F4A4FA4686E48BC8111A3DABADB7686" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1091,10 +1086,21 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C05D1B3E0BB241258C4AACD21FAB6E72" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AED9467B5BDCD87EC2746DB4EF7A24D2" { - "SourcePath" = "8:C:\\360驱动大师目录\\app.ico" - "TargetName" = "8:app.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_AED9467B5BDCD87EC2746DB4EF7A24D2" + { + "Name" = "8:Forks.JsonRpc.Client.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Forks.JsonRpc.Client.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" "Condition" = "8:" @@ -1108,23 +1114,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C1BAA40E3F5E065EA88D97DA96D5992D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B027E23B6E431EA7A5006FCB5BB20236" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C1BAA40E3F5E065EA88D97DA96D5992D" + "_B027E23B6E431EA7A5006FCB5BB20236" { - "Name" = "8:Forks.EnterpriseServices.dll" + "Name" = "8:MongoDB.Bson.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Forks.EnterpriseServices.dll" + "SourcePath" = "8:MongoDB.Bson.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" @@ -1138,25 +1144,34 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CDEF0D7FE4F14E5E84A3902D05B165EC" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B24BD1F54711439BA132ABC05EC82AF6" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherFactory.Form, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_CDEF0D7FE4F14E5E84A3902D05B165EC" - { - "Name" = "8:ButcherFactory.Form.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:..\\ButcherFactory.Form\\bin\\Release\\ButcherFactory.Form.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l55.wav" + "TargetName" = "8:l55.wav" + "Tag" = "8:" + "Folder" = "8:_6866532246094A308566729453EB35CA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C05D1B3E0BB241258C4AACD21FAB6E72" + { + "SourcePath" = "8:C:\\360驱动大师目录\\app.ico" + "TargetName" = "8:app.ico" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" "Condition" = "8:" @@ -1173,20 +1188,20 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D32656229814B10B3981022C6BAE7B85" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CDEF0D7FE4F14E5E84A3902D05B165EC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ButcherFactory.Form, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D32656229814B10B3981022C6BAE7B85" + "_CDEF0D7FE4F14E5E84A3902D05B165EC" { - "Name" = "8:Forks.Json.dll" + "Name" = "8:ButcherFactory.Form.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Forks.Json.dll" + "SourcePath" = "8:..\\ButcherFactory.Form\\bin\\Release\\ButcherFactory.Form.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" @@ -1201,7 +1216,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D38B860E2FD246B790618B9B4FB991C5" @@ -1224,23 +1239,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D75F76D9C28EDCFD7454D52CBB18C6E9" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD91DACD7A0B48CE8926B0CA4EAB5E50" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_D75F76D9C28EDCFD7454D52CBB18C6E9" - { - "Name" = "8:Newtonsoft.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Newtonsoft.Json.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\di.wav" + "TargetName" = "8:di.wav" "Tag" = "8:" - "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" + "Folder" = "8:_6866532246094A308566729453EB35CA" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1252,15 +1256,26 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD91DACD7A0B48CE8926B0CA4EAB5E50" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE32A8488C67365FC9BBB4CAF2E074E2" { - "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\di.wav" - "TargetName" = "8:di.wav" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_DE32A8488C67365FC9BBB4CAF2E074E2" + { + "Name" = "8:Forks.Utils.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Forks.Utils.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_6866532246094A308566729453EB35CA" + "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1272,7 +1287,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F45F0EE0BF2446558F2C1F4F902125DB" @@ -1295,12 +1310,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F6C3568789ED47638FCE9494DA24CF51" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FCCE14D01A514BCF927F597A9F5842D2" { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\SegmentProductionPrintEnd.html" - "TargetName" = "8:SegmentProductionPrintEnd.html" + "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l65.wav" + "TargetName" = "8:l65.wav" "Tag" = "8:" - "Folder" = "8:_3F4A4FA4686E48BC8111A3DABADB7686" + "Folder" = "8:_6866532246094A308566729453EB35CA" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1315,12 +1330,23 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FCCE14D01A514BCF927F597A9F5842D2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FD82AF7F959387F3F4C23A0EB1AC0E35" { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l65.wav" - "TargetName" = "8:l65.wav" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_FD82AF7F959387F3F4C23A0EB1AC0E35" + { + "Name" = "8:Newtonsoft.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Newtonsoft.Json.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_6866532246094A308566729453EB35CA" + "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1332,7 +1358,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } } @@ -1458,7 +1484,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:青花瓷屠宰车间管理" "ProductCode" = "8:{8D06A3CB-94E1-40DF-BF89-0A822D5302EF}" - "PackageCode" = "8:{A4E9B02C-DB7B-43D5-BE1C-239FBFD7C1BB}" + "PackageCode" = "8:{8127AF77-C3B1-4814-8094-97F6C458F56B}" "UpgradeCode" = "8:{D5614731-239C-49A6-8F35-DB6F5D8E8A8C}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -2021,7 +2047,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7BC73039AAAE423AB1ADC71EDB603430" { - "SourcePath" = "8:..\\ButcherFactory.Login\\obj\\Debug\\ButcherFactory.Login.exe" + "SourcePath" = "8:..\\ButcherFactory.Login\\obj\\Release\\ButcherFactory.Login.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88"