From 8247aadf5c723f17e01e684c9b4a29c6cfb87ba6 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 3 Apr 2018 14:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ButcherFactory.BO/Bill/CarcassTakeOut.cs | 37 ++
ButcherFactory.BO/ButcherFactory.BO.csproj | 1 +
.../ButcherFactory.Form.csproj | 9 +-
.../CarcassInStoreForm.Designer.cs | 166 +++---
.../CarcassInStore_/CarcassInStoreForm.resx | 57 --
.../CarcassTakeOutForm.Designer.cs | 504 ++++++++++++++++++
.../CarcassTakeOutForm.cs} | 26 +-
.../CarcassTakeOut_/CarcassTakeOutForm.resx | 153 ++++++
.../SegmentationPickOut.Designer.cs | 38 --
9 files changed, 808 insertions(+), 183 deletions(-)
create mode 100644 ButcherFactory.BO/Bill/CarcassTakeOut.cs
create mode 100644 ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.Designer.cs
rename ButcherFactory.Form/{SegmentationPick_/SegmentationPickOut.cs => CarcassTakeOut_/CarcassTakeOutForm.cs} (53%)
create mode 100644 ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.resx
delete mode 100644 ButcherFactory.Form/SegmentationPick_/SegmentationPickOut.Designer.cs
diff --git a/ButcherFactory.BO/Bill/CarcassTakeOut.cs b/ButcherFactory.BO/Bill/CarcassTakeOut.cs
new file mode 100644
index 0000000..9e06b8c
--- /dev/null
+++ b/ButcherFactory.BO/Bill/CarcassTakeOut.cs
@@ -0,0 +1,37 @@
+using Forks.EnterpriseServices.DataDictionary;
+using Forks.EnterpriseServices.DomainObjects2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ButcherFactory.BO
+{
+ [MapToTable("Butcher_CarcassTakeOut")]
+ [DBIndex("IDX_Butcher_CarcassTakeOut_Clustered", "BarCode", false, 0)]
+ [DBIndexType("IDX_Butcher_CarcassTakeOut_Clustered", IndexType.Clustered)]
+ public class CarcassTakeOut : SyncBill
+ {
+ public CarcassTakeOut()
+ {
+ CreateTime = DateTime.Now;
+ }
+
+ public string BarCode { get; set; }
+
+ public long? WorkUnit_ID { get; set; }
+
+ public long? Goods_ID { get; set; }
+
+ public decimal? Weight { get; set; }
+
+ public decimal? BeforeWeight { get; set; }
+
+ [ReferenceTo(typeof(Goods), "Name")]
+ [Join("Goods_ID", "ID")]
+ public string Goods_Name { get; set; }
+
+ public long? GroupID { get; set; }
+ }
+}
diff --git a/ButcherFactory.BO/ButcherFactory.BO.csproj b/ButcherFactory.BO/ButcherFactory.BO.csproj
index 63b5855..d5df29b 100644
--- a/ButcherFactory.BO/ButcherFactory.BO.csproj
+++ b/ButcherFactory.BO/ButcherFactory.BO.csproj
@@ -61,6 +61,7 @@
+
diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index 12425e4..ac2cc31 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -54,11 +54,11 @@
CarcassInStoreForm.cs
-
+
Form
-
- SegmentationPickOut.cs
+
+ CarcassTakeOutForm.cs
@@ -72,6 +72,9 @@
CarcassInStoreForm.cs
+
+ CarcassTakeOutForm.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
+ goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
+ KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
+ goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
+ KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
+ goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
+ KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAAGAAAAAwCAIAAABhdOiYAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAAHNJREFUaEPt0AENACAMwDAkowVB14aDz0CTKui5b1gICoKCoCAoCAqCgqAgKAgK
+ goKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAgKAgKgoKgICgICoKCoCAoCAqCgqAg
+ KAgKgoKg1ZsPvpCB0hBohjQAAAAASUVORK5CYII=
+
+
+
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentationPick_/SegmentationPickOut.Designer.cs b/ButcherFactory.Form/SegmentationPick_/SegmentationPickOut.Designer.cs
deleted file mode 100644
index 4689cc5..0000000
--- a/ButcherFactory.Form/SegmentationPick_/SegmentationPickOut.Designer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace ButcherFactory.SegmentationPick_
-{
- partial class SegmentationPickOut
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "SegmentationPickOut";
- }
-
- #endregion
- }
-}
\ No newline at end of file