From 2110c02afd0b493527bd03558f51bfee36f4858f Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 13 Jun 2018 22:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=89=B2=E5=93=81=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E3=80=82=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ButcherFactory.BO/Enums/DriveType.cs | 2 +-
.../ButcherFactory.Form.csproj | 9 ++
.../SegmentInStoreForm.Designer.cs | 48 +++++++
.../SegmentInStore_/SegmentInStoreForm.cs | 32 +++++
.../SegmentInStore_/SegmentInStoreForm.resx | 120 ++++++++++++++++++
ButcherFactory.Login/Login.xaml | 2 +-
ButcherFactory.Login/Login.xaml.cs | 59 +++++----
7 files changed, 245 insertions(+), 27 deletions(-)
create mode 100644 ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
create mode 100644 ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs
create mode 100644 ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx
diff --git a/ButcherFactory.BO/Enums/DriveType.cs b/ButcherFactory.BO/Enums/DriveType.cs
index d5577d4..44f41d9 100644
--- a/ButcherFactory.BO/Enums/DriveType.cs
+++ b/ButcherFactory.BO/Enums/DriveType.cs
@@ -12,6 +12,6 @@ namespace ButcherFactory.BO
白条入库 = 0,
白条领用 = 1,
分割生产 = 2,
- 分割入库 = 3,
+ 扫码入库 = 3,
}
}
diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index d989ccf..475c3ca 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -128,6 +128,12 @@
CarcassTakeOutForm.cs
+
+ Form
+
+
+ SegmentInStoreForm.cs
+
Form
@@ -184,6 +190,9 @@
WeightRecordDialog.cs
+
+ SegmentInStoreForm.cs
+
SegmentProductionForm.cs
diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
new file mode 100644
index 0000000..4ec4682
--- /dev/null
+++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.Designer.cs
@@ -0,0 +1,48 @@
+namespace ButcherFactory.SegmentInStore_
+{
+ partial class SegmentInStoreForm
+ {
+ ///
+ /// 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.SuspendLayout();
+ //
+ // SegmentInStoreForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.ClientSize = new System.Drawing.Size(797, 488);
+ this.Name = "SegmentInStoreForm";
+ this.Text = "扫码入库";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs
new file mode 100644
index 0000000..4e45a95
--- /dev/null
+++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs
@@ -0,0 +1,32 @@
+using ButcherFactory.BO;
+using ButcherFactory.BO.Utils;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ButcherFactory.SegmentInStore_
+{
+ public partial class SegmentInStoreForm : Form, IWithRoleForm
+ {
+ public List RoleName
+ {
+ get { return new List { (short)设备类别.扫码入库 }; }
+ }
+
+ public Form Generate()
+ {
+ return this;
+ }
+
+ public SegmentInStoreForm()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file
diff --git a/ButcherFactory.Login/Login.xaml b/ButcherFactory.Login/Login.xaml
index eea7c60..1c92037 100644
--- a/ButcherFactory.Login/Login.xaml
+++ b/ButcherFactory.Login/Login.xaml
@@ -16,7 +16,7 @@
-