From 5268e682faf30d229fbcd36f5541ba75510d5512 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 01 十一月 2024 15:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs | 357 ++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs | 148 ++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs | 219 ++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 310 +++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 12
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.resx | 120 +++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 800 ++++++++++++++++++++++++
8 files changed, 1,967 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
new file mode 100644
index 0000000..dea5f47
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -0,0 +1,800 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+ partial class Frm_InitialBarcode
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.gvMx1trLotno = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_fSubsidiary = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fumbrella = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit();
+ this.lb_itemUnit = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemUnit = new DevExpress.XtraEditors.TextEdit();
+ this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_itemName = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_iCount = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_tc = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_psnQty = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gvMx1trLotno
+ //
+ this.gvMx1trLotno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1trLotno.AppearanceCell.Options.UseFont = true;
+ this.gvMx1trLotno.Caption = "渚涘簲鍟嗘壒娆�";
+ this.gvMx1trLotno.FieldName = "trLotno";
+ this.gvMx1trLotno.MinWidth = 50;
+ this.gvMx1trLotno.Name = "gvMx1trLotno";
+ this.gvMx1trLotno.Tag = "query_a.TR_LOTNO";
+ this.gvMx1trLotno.Visible = true;
+ this.gvMx1trLotno.VisibleIndex = 2;
+ this.gvMx1trLotno.Width = 94;
+ //
+ // gvMx1lotDate
+ //
+ this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
+ this.gvMx1lotDate.Caption = "鐢熶骇鏃ユ湡 ";
+ this.gvMx1lotDate.FieldName = "lotDate";
+ this.gvMx1lotDate.MinWidth = 50;
+ this.gvMx1lotDate.Name = "gvMx1lotDate";
+ this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
+ this.gvMx1lotDate.Visible = true;
+ this.gvMx1lotDate.VisibleIndex = 5;
+ this.gvMx1lotDate.Width = 94;
+ //
+ // gvMx1createBy
+ //
+ this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+ this.gvMx1createBy.Caption = "鍒涘缓浜� ";
+ this.gvMx1createBy.FieldName = "createBy";
+ this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.Name = "gvMx1createBy";
+ this.gvMx1createBy.Tag = "query_a.CREATE_BY";
+ this.gvMx1createBy.Visible = true;
+ this.gvMx1createBy.VisibleIndex = 4;
+ this.gvMx1createBy.Width = 94;
+ //
+ // gvMx1quantity
+ //
+ this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx1quantity.Caption = "鏁伴噺 ";
+ this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.Name = "gvMx1quantity";
+ this.gvMx1quantity.Tag = "query_a.QUANTITY";
+ this.gvMx1quantity.Visible = true;
+ this.gvMx1quantity.VisibleIndex = 1;
+ this.gvMx1quantity.Width = 94;
+ //
+ // gvMx1lotNo
+ //
+ this.gvMx1lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1lotNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1lotNo.Caption = "鎵规 ";
+ this.gvMx1lotNo.FieldName = "lotNo";
+ this.gvMx1lotNo.MinWidth = 50;
+ this.gvMx1lotNo.Name = "gvMx1lotNo";
+ this.gvMx1lotNo.Tag = "query_a.LOT_NO";
+ this.gvMx1lotNo.Visible = true;
+ this.gvMx1lotNo.VisibleIndex = 3;
+ this.gvMx1lotNo.Width = 94;
+ //
+ // gvMx1itemBarcode
+ //
+ this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
+ this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+ this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx1itemBarcode.Visible = true;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
+ this.gvMx1itemBarcode.Width = 94;
+ //
+ // gvMx1guid
+ //
+ this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx1guid.Caption = "guid ";
+ this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.Tag = "query_a.guid";
+ this.gvMx1guid.Width = 94;
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 356);
+ this.tabMxPage1.Text = "鏄庣粏1";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.Size = new System.Drawing.Size(1124, 356);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1guid,
+ this.gvMx1itemBarcode,
+ this.gvMx1quantity,
+ this.gvMx1trLotno,
+ this.gvMx1lotNo,
+ this.gvMx1createBy,
+ this.gvMx1lotDate,
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_fSubsidiary
+ //
+ this.gv_fSubsidiary.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fSubsidiary.AppearanceCell.Options.UseFont = true;
+ this.gv_fSubsidiary.Caption = "浣跨敤缁勭粐 ";
+ this.gv_fSubsidiary.FieldName = "fSubsidiary";
+ this.gv_fSubsidiary.MinWidth = 50;
+ this.gv_fSubsidiary.Name = "gv_fSubsidiary";
+ this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
+ this.gv_fSubsidiary.Tag = "query_a.FSubsidiary";
+ this.gv_fSubsidiary.Width = 94;
+ //
+ // gv_fumbrella
+ //
+ this.gv_fumbrella.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fumbrella.AppearanceCell.Options.UseFont = true;
+ this.gv_fumbrella.Caption = "鍒涘缓缁勭粐 ";
+ this.gv_fumbrella.FieldName = "fumbrella";
+ this.gv_fumbrella.MinWidth = 50;
+ this.gv_fumbrella.Name = "gv_fumbrella";
+ this.gv_fumbrella.OptionsColumn.AllowEdit = false;
+ this.gv_fumbrella.Tag = "query_a.Fumbrella";
+ this.gv_fumbrella.Width = 94;
+ //
+ // lb_createDate1
+ //
+ this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_createDate1.Appearance.Options.UseFont = true;
+ this.lb_createDate1.Location = new System.Drawing.Point(257, 15);
+ this.lb_createDate1.Name = "lb_createDate1";
+ this.lb_createDate1.Size = new System.Drawing.Size(68, 21);
+ this.lb_createDate1.TabIndex = 252;
+ this.lb_createDate1.Text = "鍏ュ簱鏃堕棿";
+ //
+ // txt_createDate1
+ //
+ this.txt_createDate1.Location = new System.Drawing.Point(349, 12);
+ this.txt_createDate1.Name = "txt_createDate1";
+ this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate1.Size = new System.Drawing.Size(150, 28);
+ this.txt_createDate1.TabIndex = 252;
+ //
+ // lb_itemUnit
+ //
+ this.lb_itemUnit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemUnit.Appearance.Options.UseFont = true;
+ this.lb_itemUnit.Location = new System.Drawing.Point(11, 91);
+ this.lb_itemUnit.Name = "lb_itemUnit";
+ this.lb_itemUnit.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemUnit.TabIndex = 231;
+ this.lb_itemUnit.Text = "鐗╂枡鍗曚綅 ";
+ //
+ // txt_itemUnit
+ //
+ this.txt_itemUnit.Location = new System.Drawing.Point(85, 88);
+ this.txt_itemUnit.Name = "txt_itemUnit";
+ this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemUnit.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemUnit.TabIndex = 231;
+ //
+ // gv_itemUnit
+ //
+ this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
+ this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅 ";
+ this.gv_itemUnit.FieldName = "itemUnit";
+ this.gv_itemUnit.MinWidth = 50;
+ this.gv_itemUnit.Name = "gv_itemUnit";
+ this.gv_itemUnit.OptionsColumn.AllowEdit = false;
+ this.gv_itemUnit.Tag = "query_a.item_unit";
+ this.gv_itemUnit.Visible = true;
+ this.gv_itemUnit.VisibleIndex = 3;
+ this.gv_itemUnit.Width = 94;
+ //
+ // lb_itemModel
+ //
+ this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemModel.Appearance.Options.UseFont = true;
+ this.lb_itemModel.Location = new System.Drawing.Point(11, 123);
+ this.lb_itemModel.Name = "lb_itemModel";
+ this.lb_itemModel.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemModel.TabIndex = 226;
+ this.lb_itemModel.Text = "瑙勬牸鍨嬪彿 ";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(85, 122);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemModel.TabIndex = 226;
+ //
+ // gv_itemModel
+ //
+ this.gv_itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemModel.AppearanceCell.Options.UseFont = true;
+ this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿 ";
+ this.gv_itemModel.FieldName = "itemModel";
+ this.gv_itemModel.MinWidth = 50;
+ this.gv_itemModel.Name = "gv_itemModel";
+ this.gv_itemModel.OptionsColumn.AllowEdit = false;
+ this.gv_itemModel.Tag = "query_a.item_model";
+ this.gv_itemModel.Visible = true;
+ this.gv_itemModel.VisibleIndex = 2;
+ this.gv_itemModel.Width = 94;
+ //
+ // lb_itemName
+ //
+ this.lb_itemName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemName.Appearance.Options.UseFont = true;
+ this.lb_itemName.Location = new System.Drawing.Point(11, 52);
+ this.lb_itemName.Name = "lb_itemName";
+ this.lb_itemName.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemName.TabIndex = 219;
+ this.lb_itemName.Text = "鐗╂枡鍚嶇О ";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(85, 52);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemName.TabIndex = 219;
+ //
+ // gv_itemName
+ //
+ this.gv_itemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemName.AppearanceCell.Options.UseFont = true;
+ this.gv_itemName.Caption = "鐗╂枡鍚嶇О ";
+ this.gv_itemName.FieldName = "itemName";
+ this.gv_itemName.MinWidth = 50;
+ this.gv_itemName.Name = "gv_itemName";
+ this.gv_itemName.OptionsColumn.AllowEdit = false;
+ this.gv_itemName.Tag = "query_a.item_name";
+ this.gv_itemName.Visible = true;
+ this.gv_itemName.VisibleIndex = 1;
+ this.gv_itemName.Width = 94;
+ //
+ // lb_itemNo
+ //
+ this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemNo.Appearance.Options.UseFont = true;
+ this.lb_itemNo.Location = new System.Drawing.Point(11, 15);
+ this.lb_itemNo.Name = "lb_itemNo";
+ this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
+ this.lb_itemNo.TabIndex = 217;
+ this.lb_itemNo.Text = "鐗╂枡缂栫爜";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(85, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.TabIndex = 217;
+ //
+ // gv_itemNo
+ //
+ this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿 ";
+ this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.Name = "gv_itemNo";
+ this.gv_itemNo.OptionsColumn.AllowEdit = false;
+ this.gv_itemNo.Tag = "query_a.item_no";
+ this.gv_itemNo.Visible = true;
+ this.gv_itemNo.VisibleIndex = 0;
+ this.gv_itemNo.Width = 94;
+ //
+ // gv_id
+ //
+ this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_id.AppearanceCell.Options.UseFont = true;
+ this.gv_id.Caption = "鐗╂枡ID ";
+ this.gv_id.FieldName = "id";
+ this.gv_id.MinWidth = 50;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.Tag = "query_a.id";
+ this.gv_id.Width = 94;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "guid ";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.TabIndex = 1;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gv_id,
+ this.gv_itemNo,
+ this.gv_itemName,
+ this.gv_itemModel,
+ this.gv_itemUnit,
+ this.gv_fumbrella,
+ this.gv_fSubsidiary});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.tabMx);
+ this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 182);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(1126, 388);
+ this.tabMx.TabIndex = 2;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1});
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.txt_iCount);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_tc);
+ this.panel1.Controls.Add(this.labelControl3);
+ this.panel1.Controls.Add(this.txt_psnQty);
+ this.panel1.Controls.Add(this.labelControl2);
+ this.panel1.Controls.Add(this.txt_suppName);
+ this.panel1.Controls.Add(this.labelControl1);
+ this.panel1.Controls.Add(this.txt_suppNo);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.lb_createDate1);
+ this.panel1.Controls.Add(this.txt_createDate1);
+ this.panel1.Controls.Add(this.lb_itemUnit);
+ this.panel1.Controls.Add(this.txt_itemUnit);
+ this.panel1.Controls.Add(this.lb_itemModel);
+ this.panel1.Controls.Add(this.txt_itemModel);
+ this.panel1.Controls.Add(this.lb_itemName);
+ this.panel1.Controls.Add(this.txt_itemName);
+ this.panel1.Controls.Add(this.lb_itemNo);
+ this.panel1.Controls.Add(this.txt_itemNo);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1126, 182);
+ this.panel1.TabIndex = 1;
+ this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(518, 55);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(102, 21);
+ this.labelControl5.TabIndex = 261;
+ this.labelControl5.Text = "鎵撳嵃鏉＄爜寮犳暟";
+ //
+ // txt_iCount
+ //
+ this.txt_iCount.Location = new System.Drawing.Point(626, 49);
+ this.txt_iCount.Name = "txt_iCount";
+ this.txt_iCount.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_iCount.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount.Size = new System.Drawing.Size(150, 28);
+ this.txt_iCount.TabIndex = 262;
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(546, 15);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(34, 21);
+ this.labelControl4.TabIndex = 259;
+ this.labelControl4.Text = "鐗归噰";
+ //
+ // txt_tc
+ //
+ this.txt_tc.Location = new System.Drawing.Point(626, 12);
+ this.txt_tc.Name = "txt_tc";
+ this.txt_tc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_tc.Properties.Appearance.Options.UseFont = true;
+ this.txt_tc.Size = new System.Drawing.Size(150, 28);
+ this.txt_tc.TabIndex = 260;
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(518, 91);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(102, 21);
+ this.labelControl3.TabIndex = 257;
+ this.labelControl3.Text = "姣忓紶鏉＄爜鏁伴噺";
+ //
+ // txt_psnQty
+ //
+ this.txt_psnQty.Location = new System.Drawing.Point(626, 88);
+ this.txt_psnQty.Name = "txt_psnQty";
+ this.txt_psnQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_psnQty.Properties.Appearance.Options.UseFont = true;
+ this.txt_psnQty.Size = new System.Drawing.Size(150, 28);
+ this.txt_psnQty.TabIndex = 258;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(245, 91);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(85, 21);
+ this.labelControl2.TabIndex = 255;
+ this.labelControl2.Text = "渚涘簲鍟嗗悕绉�";
+ //
+ // txt_suppName
+ //
+ this.txt_suppName.Location = new System.Drawing.Point(349, 88);
+ this.txt_suppName.Name = "txt_suppName";
+ this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_suppName.Properties.Appearance.Options.UseFont = true;
+ this.txt_suppName.Size = new System.Drawing.Size(150, 28);
+ this.txt_suppName.TabIndex = 256;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(245, 55);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(85, 21);
+ this.labelControl1.TabIndex = 253;
+ this.labelControl1.Text = "渚涘簲鍟嗙紪鍙�";
+ //
+ // txt_suppNo
+ //
+ this.txt_suppNo.Location = new System.Drawing.Point(349, 49);
+ this.txt_suppNo.Name = "txt_suppNo";
+ this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_suppNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_suppNo.TabIndex = 254;
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(580, 372);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(0, 18);
+ this.labelControl11.TabIndex = 130;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(151, 279);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "搴撲綅";
+ this.gridColumn1.FieldName = "depostSections";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "浠撳簱";
+ this.gridColumn2.FieldName = "depostCode";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn3.FieldName = "dpName";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 8;
+ this.gridColumn3.Width = 94;
+ //
+ // Frm_InitialBarcode
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "Frm_InitialBarcode";
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private UserControls.Data.UcPageBar pageBar1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl labelControl11;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1trLotno;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fSubsidiary;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fumbrella;
+
+private DevExpress.XtraEditors.LabelControl lb_createDate1;
+private DevExpress.XtraEditors.TextEdit txt_createDate1;
+
+private DevExpress.XtraEditors.LabelControl lb_itemUnit;
+private DevExpress.XtraEditors.TextEdit txt_itemUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
+
+private DevExpress.XtraEditors.LabelControl lb_itemModel;
+private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
+
+private DevExpress.XtraEditors.LabelControl lb_itemName;
+private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
+
+private DevExpress.XtraEditors.LabelControl lb_itemNo;
+private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.TextEdit txt_suppName;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.TextEdit txt_suppNo;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.TextEdit txt_iCount;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.TextEdit txt_tc;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
new file mode 100644
index 0000000..8bc3082
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -0,0 +1,310 @@
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm
+{
+ public partial class Frm_InitialBarcode : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "MesInvItemBarcodesManager/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public Frm_InitialBarcode()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ getPageList(1, UtilityHelper.GetPageSize());
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ {
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ }
+ };
+ gridView1.CustomDrawEmptyForeground += (s, e) =>
+ {
+ string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
+ Font f = new Font("寰蒋闆呴粦", 16);
+ Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
+ e.Graphics.DrawString(str, f, Brushes.Gray, r);
+ };
+ }
+
+ /// <summary>
+ /// 鍙屽嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+ if (!string.IsNullOrEmpty(rowGuid))
+ getModel(rowGuid, false, 999);
+ }
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1, pageBar1.RowsCount);
+ }
+
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = lst;
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ getModel(rowGuid, true, 1);
+ }
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 1);
+ lbGuid.Text = "";
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ // txt_account.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ foreach (FilterEntity itm in _filterList)
+ {
+ _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ }
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ int dddd = dd.rtnData.pages;//鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
+ {
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ //涓昏〃璧嬪��
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy["from"], isEdit, gvList);
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ //鏄庣粏琛ㄨ祴鍊�
+ foreach (var a in _job["rtnData"]["barcodes"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void panel1_Paint(object sender, PaintEventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.resx
new file mode 100644
index 0000000..d58980a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs
new file mode 100644
index 0000000..9e65984
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs
@@ -0,0 +1,357 @@
+锘縰sing System;
+
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 鐗╂枡鏉＄爜琛�
+ ///</summary>
+ public class MesInvItemBarcodes
+ {
+ /// <summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ public Guid Guid { get; set; }
+ /// <summary>
+ /// SEQ_BARCODE_PSN_ID
+ ///</summary>
+ public long? Id { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ ///</summary>
+ public string ItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鎴愬搧缂栫爜
+ ///</summary>
+ public string CProductCode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鏉＄爜
+ ///</summary>
+ public string CItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ ///</summary>
+ public string CItemCode { get; set; }
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ ///</summary>
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鍘傚鎵规
+ ///</summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ ///</summary>
+ public bool? EpFlag { get; set; }
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ ///</summary>
+ public string TaskNo { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
+ public string CustNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
+ ///</summary>
+ public string ItemBarcodeText { get; set; }
+ /// <summary>
+ /// 鍘烶SN鐗╂枡鏉＄爜
+ ///</summary>
+ public string OldItemBarcode { get; set; }
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
+ ///</summary>
+ public string Mblnr { get; set; }
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
+ ///</summary>
+ public int? Zeile { get; set; }
+ /// <summary>
+ /// 鏀舵枡琛↖D
+ ///</summary>
+ public long? RohInId { get; set; }
+ /// <summary>
+ /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public bool? Barcodestatus { get; set; }
+ /// <summary>
+ /// 鍘熷鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public long? Oldqty { get; set; }
+ /// <summary>
+ /// 浣跨敤鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public long? Useqty { get; set; }
+ /// <summary>
+ /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public byte? Location { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ public string Unit { get; set; }
+ /// <summary>
+ /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public decimal? WeightUnit { get; set; }
+ /// <summary>
+ /// 鍗曚环
+ ///</summary>
+ public decimal? Price { get; set; }
+ /// <summary>
+ /// 鍘熸潯鐮佹暟閲�
+ ///</summary>
+ public long? OldBarQuantity { get; set; }
+ /// <summary>
+ /// 姹囨�绘潯鐮�
+ ///</summary>
+ public string SumBarcode { get; set; }
+ /// <summary>
+ /// 鎵规鏃ユ湡
+ ///</summary>
+ public string LotDate { get; set; }
+ /// <summary>
+ /// 鎴愬搧鏉＄爜
+ ///</summary>
+ public string Mocode { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ public string Memo { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ ///</summary>
+ public string SuppNo { get; set; }
+ /// <summary>
+ /// 鍙戣揣浣嶇疆
+ ///</summary>
+ public string Spostion { get; set; }
+ /// <summary>
+ /// 鍒拌揣浣嶇疆
+ ///</summary>
+ public string Epostion { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
+ public string ItemSname { get; set; }
+ /// <summary>
+ /// 鏄惁鍙
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public bool? Visable { get; set; }
+ /// <summary>
+ /// 澶栧彂鎵规鍙�
+ ///</summary>
+ public string TrLotno { get; set; }
+ /// <summary>
+ /// 鍙戣揣鏃ユ湡
+ ///</summary>
+ public DateTime? FlezzDate { get; set; }
+ /// <summary>
+ /// 澶栧彂鍘熷洜
+ ///</summary>
+ public string FlezzReason { get; set; }
+ /// <summary>
+ /// 澶栧彂浜�
+ ///</summary>
+ public string FlezzBy { get; set; }
+ /// <summary>
+ /// 鍙戣揣鏈�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public int? DelanyMonth { get; set; }
+ /// <summary>
+ /// 鏄惁鏈�灏忓寘瑁�
+ ///</summary>
+ public bool? MinpackFlag { get; set; }
+ /// <summary>
+ /// 鎵撳嵃ID
+ ///</summary>
+ public string PrintId { get; set; }
+ /// <summary>
+ /// 鐜鐗╂枡
+ ///</summary>
+ public string EpItem { get; set; }
+ /// <summary>
+ /// 宸ュ巶
+ ///</summary>
+ public string Factory { get; set; }
+ /// <summary>
+ /// 鍏徃
+ ///</summary>
+ public string Company { get; set; }
+ /// <summary>
+ /// 鍙戠エ鍙风爜
+ ///</summary>
+ public string CbNo { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+ public string Linfline { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏃堕棿
+ ///</summary>
+ public DateTime? ValidTime { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵��
+ ///</summary>
+ public string IqcStatus { get; set; }
+ /// <summary>
+ /// 杞﹀彿
+ ///</summary>
+ public string Fcar { get; set; }
+ /// <summary>
+ /// 姣涢噸
+ ///</summary>
+ public string Gweight { get; set; }
+ /// <summary>
+ /// 鍑�閲�
+ ///</summary>
+ public string Nweight { get; set; }
+ /// <summary>
+ /// 鎵╁睍鏃ユ湡
+ ///</summary>
+ public long? ExtDate { get; set; }
+ /// <summary>
+ /// 鏉＄爜绫诲瀷
+ ///</summary>
+ public string Barcodetype { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ ///</summary>
+ public string SuppName { get; set; }
+ /// <summary>
+ /// 鍙戠エ缂栧彿
+ ///</summary>
+ public string BillNo { get; set; }
+ /// <summary>
+ /// 鏄惁绱ф��
+ ///</summary>
+ public bool? UrgentFlag { get; set; }
+ /// <summary>
+ /// 棰滆壊鍚嶇О
+ ///</summary>
+ public string ColorName { get; set; }
+ /// <summary>
+ /// 鏉垮瀷
+ ///</summary>
+ public string BoardStyle { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
+ public DateTime? InsDate { get; set; }
+ /// <summary>
+ /// 宸ュ簭绾�
+ ///</summary>
+ public int? WorkLine { get; set; }
+ /// <summary>
+ /// 涓嶈壇澶囨敞
+ ///</summary>
+ public string MemoBad { get; set; }
+ /// <summary>
+ /// 宸ュ崟
+ ///</summary>
+ public string WorkNo { get; set; }
+ /// <summary>
+ /// 鍒拌揣鏍囪
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public bool? ComeFlg { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+ public string LineNo { get; set; }
+ /// <summary>
+ /// 涓濆嵃鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public long? SilkPqty { get; set; }
+ /// <summary>
+ /// 涓濆嵃瑙勬牸
+ ///</summary>
+ public string Silk { get; set; }
+ /// <summary>
+ /// 涓濆嵃ID
+ ///</summary>
+ public long? SilkId { get; set; }
+ /// <summary>
+ /// 宸ュ崟鐘舵��
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public bool? WorkFlg { get; set; }
+ /// <summary>
+ /// 宸ュ崟鏈�鍚庤
+ ///</summary>
+ public int? WorkLast { get; set; }
+ /// <summary>
+ /// HBDY
+ ///</summary>
+ public int? Hbdy { get; set; }
+ /// <summary>
+ /// HBDYTM
+ ///</summary>
+ public int? Hbdytm { get; set; }
+ /// <summary>
+ /// 宸ュ簭鏃堕棿
+ ///</summary>
+ public string WorkFlgtime { get; set; }
+ /// <summary>
+ /// K3ID璁㈠崟
+ ///</summary>
+ public long? EbelnK3id { get; set; }
+ /// <summary>
+ /// K3ID琛�
+ ///</summary>
+ public long? LineK3id { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ public long? ItemId { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ public long? GxId { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ public string OrgName { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ public string OrgOwner { get; set; }
+
+ public string DepotSectionsCode { get; set; }
+
+ public string DepotsCode { get; set; }
+
+ public string DepotName { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
new file mode 100644
index 0000000..719321f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
@@ -0,0 +1,148 @@
+锘縰sing System;
+
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 鐗╂枡搴撳瓨琛�
+ ///</summary>
+ public class MesInvItemStocks
+ {
+ /// <summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ public Guid Guid { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟
+ ///</summary>
+ public string TaskNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ ///</summary>
+ public string ItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
+ public string CItemCode { get; set; }
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 瀛愬簱id
+ ///</summary>
+ public long? DepotsId { get; set; }
+ /// <summary>
+ /// 璐т綅id
+ ///</summary>
+ public long? DepotSectionsId { get; set; }
+ /// <summary>
+ /// 鍘傚鎵规
+ ///</summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 鐜繚鏍囧織锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級(0-鍚︼紝1-鏄�)
+ ///</summary>
+ public byte? EpFlag { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栫爜
+ ///</summary>
+ public string CustomerNo { get; set; }
+ /// <summary>
+ /// 閲嶉噺
+ ///</summary>
+ public decimal? ItemWt { get; set; }
+ /// <summary>
+ /// 瀛愬簱CODE
+ ///</summary>
+ public string DepotsCode { get; set; }
+ /// <summary>
+ /// 璐т綅CODE
+ ///</summary>
+ public string DepotSectionsCode { get; set; }
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+ public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public byte? ItemType { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// 榛樿鍊�: (getdate())
+ ///</summary>
+ public DateTime? IndepDate { get; set; }
+ /// <summary>
+ /// 宸ュ巶缂栧彿
+ ///</summary>
+ public string Factory { get; set; }
+ /// <summary>
+ /// 鍏徃缂栧彿
+ ///</summary>
+ public string Company { get; set; }
+ /// <summary>
+ /// 璐ㄩ噺鐘舵��
+ ///</summary>
+ public string IqcStatus { get; set; }
+ /// <summary>
+ /// F鍗�
+ ///</summary>
+ public string Fcar { get; set; }
+ /// <summary>
+ /// 鍙鎻愪氦鏍囧織锛�0-鍚︼紝1-鏄級
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public byte? VisableSubmit { get; set; }
+ /// <summary>
+ /// 鍙鎻愪氦浜�
+ ///</summary>
+ public string VisableSubmitBy { get; set; }
+ /// <summary>
+ /// 鍙鎻愪氦鏃堕棿
+ ///</summary>
+ public DateTime? VisableSubmitDate { get; set; }
+ /// <summary>
+ /// 鏉垮瀷
+ ///</summary>
+ public string BoardStyle { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ ///</summary>
+ public string WorkNo { get; set; }
+ /// <summary>
+ /// 宸ュ崟琛屽彿
+ ///</summary>
+ public int? WorkLine { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ ///</summary>
+ public string SuppNo { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+ public string LineNo { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ public string BillNo { get; set; }
+ /// <summary>
+ /// K3ID
+ ///</summary>
+ public long? EbelnK3id { get; set; }
+ /// <summary>
+ /// 琛孠3ID
+ ///</summary>
+ public long? LineK3id { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ public long? ItemId { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
new file mode 100644
index 0000000..6e15ae2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
@@ -0,0 +1,219 @@
+锘縰sing System;
+
+namespace MES.Service.Modes
+{
+ /// <summary>
+ ///
+ ///</summary>
+ public class MesItems
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ public Guid Guid { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ public long Id { get; set; }
+ /// <summary>
+ /// 宸ュ巶
+ ///</summary>
+ public string Factory { get; set; }
+ /// <summary>
+ /// 鍏徃缂栧彿
+ ///</summary>
+ public string Company { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
+ ///</summary>
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
+ public string ItemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ ///</summary>
+ public string ItemSname { get; set; }
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
+ public string ItemModel { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎻忚堪
+ ///</summary>
+ public string ItemDescription { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍗曚綅
+ ///</summary>
+ public string ItemUnit { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ ///</summary>
+ public string ItemType { get; set; }
+ /// <summary>
+ /// 浜у搧鐗堟湰
+ ///</summary>
+ public string ItemVersion { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
+ public string CustNo { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 鏈�浣庡簱瀛�
+ ///</summary>
+ public decimal? Lowlimit { get; set; }
+ /// <summary>
+ /// 鏈�澶у簱瀛�
+ ///</summary>
+ public decimal? Highlimit { get; set; }
+ /// <summary>
+ /// 鏈�灏忓寘瑁呮暟
+ ///</summary>
+ public decimal? PrdPack { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曚綅
+ ///</summary>
+ public string Orderunit { get; set; }
+ /// <summary>
+ /// 閿�鍞崟浣�
+ ///</summary>
+ public string Saleunit { get; set; }
+ /// <summary>
+ /// 搴撴埧鍗曚綅
+ ///</summary>
+ public string Storeunit { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ public long? EItemId { get; set; }
+ /// <summary>
+ /// ERP鏂欏彿
+ ///</summary>
+ public string ErpItemNo { get; set; }
+ /// <summary>
+ /// 榛樿浠撳簱
+ ///</summary>
+ public string DepotCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙被缂栧彿
+ ///</summary>
+ public string Ppbom00019124 { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
+ public string Remarks { get; set; }
+ /// <summary>
+ /// 閲囪喘鍛�
+ ///</summary>
+ public string Fpurchaserid { get; set; }
+ /// <summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
+ public string Fforbidstatus { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
+ public string Fmaterialgroup { get; set; }
+ /// <summary>
+ /// 瀹屽伐瓒呮敹姣斾緥
+ ///</summary>
+ public int? Ffinishreceiptoverrate { get; set; }
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ ///</summary>
+ public string Fissuetype { get; set; }
+ /// <summary>
+ /// 鍚敤鎵瑰彿绠＄悊
+ ///</summary>
+ public int? Fisbatchmanage { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ ///</summary>
+ public string Fpurchaseunitid { get; set; }
+ /// <summary>
+ /// 鎹熻�楃巼
+ ///</summary>
+ public string LossPercent { get; set; }
+ /// <summary>
+ /// 鍔╄鐮�
+ ///</summary>
+ public string MnemonicCode { get; set; }
+ /// <summary>
+ /// 淇濊川鏈�
+ ///</summary>
+ public string ExpPeriod { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
+ public string ProductionWorkshop { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ ///</summary>
+ public string MaterialProperti { get; set; }
+ /// <summary>
+ /// 鐢熶骇鍗曚綅
+ ///</summary>
+ public string ProduceUnit { get; set; }
+ /// <summary>
+ /// 濮斿鍗曚綅
+ ///</summary>
+ public string SubconUnit { get; set; }
+ /// <summary>
+ /// 鍥剧墖1
+ ///</summary>
+ public string Bz06 { get; set; }
+ /// <summary>
+ /// 鍥剧墖2
+ ///</summary>
+ public string Bz07 { get; set; }
+ /// <summary>
+ /// 鍥剧墖3
+ ///</summary>
+ public string Bz08 { get; set; }
+ /// <summary>
+ /// 鍥剧墖4
+ ///</summary>
+ public string Bz09 { get; set; }
+ /// <summary>
+ /// 鍥剧墖5
+ ///</summary>
+ public string Bz10 { get; set; }
+ /// <summary>
+ /// QC鍒嗙粍ID
+ ///</summary>
+ public string QcTeamid { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ public int? ItemId { get; set; }
+ /// <summary>
+ /// 棰滆壊
+ ///</summary>
+ public string ColorName { get; set; }
+ /// <summary>
+ /// 鍒涘缓缁勭粐
+ ///</summary>
+ public string Fumbrella { get; set; }
+ /// <summary>
+ /// 浣跨敤缁勭粐
+ ///</summary>
+ public string FSubsidiary { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0892584..11ecd6e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -367,6 +367,12 @@
<Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.Designer.cs">
<DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.Designer.cs">
+ <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs">
<SubType>Form</SubType>
</Compile>
@@ -377,6 +383,9 @@
<Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemArn.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemArnDetail.cs" />
+ <Compile Include="DevFrm\Warehouse\Models\MesInvItemBarcodes.cs" />
+ <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" />
+ <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" />
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
@@ -579,6 +588,9 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemArn.resx">
<DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Warehouse\Frm_InitialBarcode.resx">
+ <DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx">
<DependentUpon>Frm_MesRohIn.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index 7a74901..cebb4cf 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
--
Gitblit v1.9.3