diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 27558e4..43c1720 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -49,8 +49,11 @@ - - + + + + diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs index 509a028..c56cbb5 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs @@ -138,7 +138,10 @@ namespace QMAPP.FJC.BLL.TianJin info.CREATEDATE = DateTime.Now.ToString(); info.UPDATEUSER = info.CREATEUSER; info.UPDATEDATE = info.CREATEDATE; - info.State = "1"; + + //返迁入库，状态从前端传入 State=3 + if (string.IsNullOrEmpty(info.State)) + info.State = "1"; StorageDAL cmdDAL = new StorageDAL(); result.Result = cmdDAL.Insert(info); @@ -181,36 +184,71 @@ namespace QMAPP.FJC.BLL.TianJin result.IsSuccess = true; try { - Storage info = new StorageDAL().Get(model.ProductCode); + Storage info = new Storage(); + if (!string.IsNullOrEmpty(model.ProductCode)) + { + info = new StorageDAL().Get(model.ProductCode); + } - if (info.State == "2") + if (!string.IsNullOrEmpty(model.PID)) { - result.IsSuccess = false; - result.Msg = $"条码{model.ProductCode}在{info.UPDATEDATE}已进行过出库操作！"; - return result; + info = new StorageDAL().GetPID(model.ProductCode); } + //条码涉及到返迁入库，条码会有重复的可能 + //if (info.State == "2") + //{ + // result.IsSuccess = false; + // result.Msg = $"条码{model.ProductCode}在{info.UPDATEDATE}已进行过出库操作！"; + // return result; + //} + + int temp = 0; //基本信息 - info.State = "2"; - info.UPDATEDATE = DateTime.Now.ToString(); - info.UPDATEUSER = this.LoginUser.UserName; - info.OutStorageType = model.OutStorageType; - int temp = new StorageDAL().Update(info); + if (!string.IsNullOrEmpty(model.State)) + { + info.UPDATEDATE = DateTime.Now.ToString(); + info.UPDATEUSER = this.LoginUser.UserName; + temp = new StorageDAL().Update(info); - var storageLog = new StorageLog(); - storageLog.PID = Guid.NewGuid().ToString(); - storageLog.CREATEUSER = this.LoginUser.UserName; - storageLog.CREATEDATE = DateTime.Now.ToString(); - storageLog.UPDATEUSER = info.CREATEUSER; - storageLog.UPDATEDATE = info.CREATEDATE; - storageLog.State = "2"; - storageLog.ProductCode = info.ProductCode; - storageLog.MATERIALCODE = info.MATERIALCODE; - storageLog.MATERIALNAME = info.MATERIALNAME; - storageLog.InStorageType = info.InStorageType; + var storageLog2 = new StorageLog(); + storageLog2.PID = Guid.NewGuid().ToString(); + storageLog2.CREATEUSER = this.LoginUser.UserName; + storageLog2.CREATEDATE = DateTime.Now.ToString(); + storageLog2.UPDATEUSER = info.CREATEUSER; + storageLog2.UPDATEDATE = info.CREATEDATE; + storageLog2.State = "2"; + storageLog2.ProductCode = info.ProductCode; + storageLog2.MATERIALCODE = info.MATERIALCODE; + storageLog2.MATERIALNAME = info.MATERIALNAME; + storageLog2.InStorageType = info.InStorageType; - StorageLogDAL cmdDALlog = new StorageLogDAL(); - cmdDALlog.Insert(storageLog); + StorageLogDAL cmdDALlog2 = new StorageLogDAL(); + cmdDALlog2.Insert(storageLog2); + } + else + { + info.State = "2"; + info.UPDATEDATE = DateTime.Now.ToString(); + info.UPDATEUSER = this.LoginUser.UserName; + info.OutStorageType = model.OutStorageType; + temp = new StorageDAL().Update(info); + + var storageLog = new StorageLog(); + storageLog.PID = Guid.NewGuid().ToString(); + storageLog.CREATEUSER = this.LoginUser.UserName; + storageLog.CREATEDATE = DateTime.Now.ToString(); + storageLog.UPDATEUSER = info.CREATEUSER; + storageLog.UPDATEDATE = info.CREATEDATE; + storageLog.State = "2"; + storageLog.ProductCode = info.ProductCode; + storageLog.MATERIALCODE = info.MATERIALCODE; + storageLog.MATERIALNAME = info.MATERIALNAME; + storageLog.InStorageType = info.InStorageType; + + StorageLogDAL cmdDALlog = new StorageLogDAL(); + cmdDALlog.Insert(storageLog); + } if (temp == 0) { diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs index fce2856..e6207f4 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs @@ -65,6 +65,31 @@ namespace QMAPP.FJC.DAL.TianJin } } + /// + /// 获取信息 + /// + /// 条件 + /// *信息 + public Storage GetPID(string PID) + { + try + { + string sql = $"SELECT top 1 * FROM [T_AW_Storage] WHERE [PID]= '{PID}' "; + List parameters = new List(); + parameters.Add(new DataParameter("PID", PID)); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + var info = session.Get(sql, parameters.ToArray()); + return info; + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion #region 获取列表 diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs index 500824e..ad122fe 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs @@ -1039,7 +1039,11 @@ namespace QMAPP.FJC.DAL.TianJin { sql += $" AND MATERIAL_CODE not in ('{MaterielCode}L','{MaterielCode}R')"; } - using (IDataSession session = AppDataFactory.CreateMainSession()) + else if (MaterielCode.Length == 8 && MaterielCode.Substring(0,4) == "018D") + { + sql += $" AND MATERIAL_CODE not in ('{MaterielCode}-L','{MaterielCode}-R')"; + } + using (IDataSession session = AppDataFactory.CreateMainSession()) { var datatable = session.GetList(sql, parameters.ToArray()).ToList(); return datatable; diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index fcb50a4..c8b9020 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -40,10 +40,10 @@ - - + - + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 4622341..2d1f1b4 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -10,7 +10,7 @@ - + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs new file mode 100644 index 0000000..e6cd6a6 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.Designer.cs @@ -0,0 +1,418 @@ +namespace QMAPP.WinForm.Forms.TianJin +{ + partial class TJLinStorageForm + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJLinStorageForm)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = 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 dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + this.label3 = new System.Windows.Forms.Label(); + this.txtProductCode = new System.Windows.Forms.TextBox(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.tsbSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.LinStorage = new System.Windows.Forms.ToolStripButton(); + this.panelSearchTitle = new System.Windows.Forms.Panel(); + this.lblSearchTitle = new System.Windows.Forms.Label(); + this.panelSearch = new System.Windows.Forms.Panel(); + this.dtpCREATEDATEEND = new DateTimePickerA(); + this.dtpCREATEDATESTART = new DateTimePickerA(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.DGView = new System.Windows.Forms.DataGridView(); + this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.入库类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.操作人 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.入库时间 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pager1 = new QMAPP.WinForm.Controls.Pager(); + this.toolStrip1.SuspendLayout(); + this.panelSearchTitle.SuspendLayout(); + this.panelSearch.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.DGView)).BeginInit(); + this.SuspendLayout(); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(8, 21); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(39, 20); + this.label3.TabIndex = 4; + this.label3.Text = "条码"; + // + // txtProductCode + // + this.txtProductCode.Font = new System.Drawing.Font("宋体", 11F); + this.txtProductCode.Location = new System.Drawing.Point(54, 19); + this.txtProductCode.Name = "txtProductCode"; + this.txtProductCode.Size = new System.Drawing.Size(237, 24); + this.txtProductCode.TabIndex = 3; + // + // toolStrip1 + // + this.toolStrip1.AutoSize = false; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsbSearch, + this.toolStripButton1, + this.LinStorage}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(998, 70); + this.toolStrip1.Stretch = true; + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // tsbSearch + // + this.tsbSearch.AutoSize = false; + this.tsbSearch.Font = new System.Drawing.Font("微软雅黑", 12F); + this.tsbSearch.Image = ((System.Drawing.Image)(resources.GetObject("tsbSearch.Image"))); + this.tsbSearch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tsbSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbSearch.Name = "tsbSearch"; + this.tsbSearch.Size = new System.Drawing.Size(100, 60); + this.tsbSearch.Text = "查询"; + this.tsbSearch.Click += new System.EventHandler(this.tsbSearch_Click); + // + // toolStripButton1 + // + this.toolStripButton1.AutoSize = false; + this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(140, 60); + this.toolStripButton1.Text = "正式入库"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // LinStorage + // + this.LinStorage.AutoSize = false; + this.LinStorage.Font = new System.Drawing.Font("微软雅黑", 12F); + this.LinStorage.Image = ((System.Drawing.Image)(resources.GetObject("LinStorage.Image"))); + this.LinStorage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.LinStorage.ImageTransparentColor = System.Drawing.Color.Magenta; + this.LinStorage.Name = "LinStorage"; + this.LinStorage.Size = new System.Drawing.Size(140, 60); + this.LinStorage.Text = "零件报废"; + this.LinStorage.Click += new System.EventHandler(this.LinStorage_Click); + // + // panelSearchTitle + // + this.panelSearchTitle.BackColor = System.Drawing.SystemColors.ScrollBar; + this.panelSearchTitle.Controls.Add(this.lblSearchTitle); + this.panelSearchTitle.Dock = System.Windows.Forms.DockStyle.Top; + this.panelSearchTitle.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panelSearchTitle.Location = new System.Drawing.Point(0, 70); + this.panelSearchTitle.Name = "panelSearchTitle"; + this.panelSearchTitle.Size = new System.Drawing.Size(998, 35); + this.panelSearchTitle.TabIndex = 8; + // + // lblSearchTitle + // + this.lblSearchTitle.AutoSize = true; + this.lblSearchTitle.Font = new System.Drawing.Font("微软雅黑", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblSearchTitle.Location = new System.Drawing.Point(15, 7); + this.lblSearchTitle.Name = "lblSearchTitle"; + this.lblSearchTitle.Size = new System.Drawing.Size(69, 20); + this.lblSearchTitle.TabIndex = 0; + this.lblSearchTitle.Text = "查询条件"; + // + // panelSearch + // + this.panelSearch.BackColor = System.Drawing.SystemColors.InactiveBorder; + this.panelSearch.Controls.Add(this.dtpCREATEDATEEND); + this.panelSearch.Controls.Add(this.dtpCREATEDATESTART); + this.panelSearch.Controls.Add(this.label4); + this.panelSearch.Controls.Add(this.label5); + this.panelSearch.Controls.Add(this.txtProductCode); + this.panelSearch.Controls.Add(this.label3); + this.panelSearch.Dock = System.Windows.Forms.DockStyle.Top; + this.panelSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panelSearch.Location = new System.Drawing.Point(0, 105); + this.panelSearch.Name = "panelSearch"; + this.panelSearch.Size = new System.Drawing.Size(998, 60); + this.panelSearch.TabIndex = 9; + // + // dtpCREATEDATEEND + // + this.dtpCREATEDATEEND.CustomFormat = " "; + this.dtpCREATEDATEEND.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + this.dtpCREATEDATEEND.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATEEND.FormatString = "yyyy年MM月dd日"; + this.dtpCREATEDATEEND.Location = new System.Drawing.Point(579, 18); + this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND"; + this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 26); + this.dtpCREATEDATEEND.TabIndex = 14; + this.dtpCREATEDATEEND.ValueX = null; + // + // dtpCREATEDATESTART + // + this.dtpCREATEDATESTART.CustomFormat = " "; + this.dtpCREATEDATESTART.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + this.dtpCREATEDATESTART.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATESTART.FormatString = "yyyy年MM月dd日"; + this.dtpCREATEDATESTART.Location = new System.Drawing.Point(381, 18); + this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART"; + this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 26); + this.dtpCREATEDATESTART.TabIndex = 13; + this.dtpCREATEDATESTART.ValueX = null; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(305, 21); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(69, 20); + this.label4.TabIndex = 9; + this.label4.Text = "入库时间"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(548, 21); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(24, 20); + this.label5.TabIndex = 12; + this.label5.Text = "至"; + // + // panel1 + // + this.panel1.Controls.Add(this.DGView); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 165); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(998, 442); + this.panel1.TabIndex = 10; + // + // DGView + // + this.DGView.AllowUserToAddRows = false; + this.DGView.AllowUserToDeleteRows = false; + this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.条码, + this.物料号, + this.物料名称, + this.入库类型, + this.操作人, + this.入库时间, + this.Pid}); + this.DGView.Dock = System.Windows.Forms.DockStyle.Fill; + this.DGView.Location = new System.Drawing.Point(0, 0); + this.DGView.Name = "DGView"; + this.DGView.ReadOnly = true; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle16; + this.DGView.RowTemplate.Height = 23; + this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.DGView.Size = new System.Drawing.Size(998, 442); + this.DGView.TabIndex = 4; + this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint); + // + // 条码 + // + this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.条码.DataPropertyName = "ProductCode"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.条码.DefaultCellStyle = dataGridViewCellStyle10; + this.条码.FillWeight = 90F; + this.条码.HeaderText = "条码"; + this.条码.Name = "条码"; + this.条码.ReadOnly = true; + this.条码.Width = 220; + // + // 物料号 + // + this.物料号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.物料号.DataPropertyName = "MATERIALCODE"; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 15.75F); + this.物料号.DefaultCellStyle = dataGridViewCellStyle11; + this.物料号.HeaderText = "物料号"; + this.物料号.Name = "物料号"; + this.物料号.ReadOnly = true; + this.物料号.Width = 220; + // + // 物料名称 + // + this.物料名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.物料名称.DataPropertyName = "MATERIALNAME"; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 15.75F); + this.物料名称.DefaultCellStyle = dataGridViewCellStyle12; + this.物料名称.HeaderText = "物料名称"; + this.物料名称.Name = "物料名称"; + this.物料名称.ReadOnly = true; + this.物料名称.Width = 350; + // + // 入库类型 + // + this.入库类型.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.入库类型.DataPropertyName = "InStorageType"; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 15.75F); + dataGridViewCellStyle13.Format = "f"; + dataGridViewCellStyle13.NullValue = null; + this.入库类型.DefaultCellStyle = dataGridViewCellStyle13; + this.入库类型.HeaderText = "入库类型"; + this.入库类型.Name = "入库类型"; + this.入库类型.ReadOnly = true; + // + // 操作人 + // + this.操作人.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.操作人.DataPropertyName = "CREATEUSER"; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F); + this.操作人.DefaultCellStyle = dataGridViewCellStyle14; + this.操作人.HeaderText = "操作人"; + this.操作人.Name = "操作人"; + this.操作人.ReadOnly = true; + this.操作人.Width = 90; + // + // 入库时间 + // + this.入库时间.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.入库时间.DataPropertyName = "CREATEDATE"; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F); + this.入库时间.DefaultCellStyle = dataGridViewCellStyle15; + this.入库时间.HeaderText = "入库时间"; + this.入库时间.Name = "入库时间"; + this.入库时间.ReadOnly = true; + this.入库时间.Width = 240; + // + // Pid + // + this.Pid.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; + this.Pid.DataPropertyName = "PID"; + this.Pid.HeaderText = "Pid"; + this.Pid.Name = "Pid"; + this.Pid.ReadOnly = true; + this.Pid.Visible = false; + // + // pager1 + // + this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); + this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pager1.Location = new System.Drawing.Point(0, 607); + this.pager1.Name = "pager1"; + this.pager1.OSearch = null; + this.pager1.Size = new System.Drawing.Size(998, 35); + this.pager1.TabIndex = 7; + this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + // + // TJLinStorageForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(998, 642); + this.Controls.Add(this.panel1); + this.Controls.Add(this.panelSearch); + this.Controls.Add(this.panelSearchTitle); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.pager1); + this.Name = "TJLinStorageForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "临时库存"; + this.Load += new System.EventHandler(this.Form_Load); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.panelSearchTitle.ResumeLayout(false); + this.panelSearchTitle.PerformLayout(); + this.panelSearch.ResumeLayout(false); + this.panelSearch.PerformLayout(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.DGView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton tsbSearch; + private System.Windows.Forms.TextBox txtProductCode; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel panelSearchTitle; + private System.Windows.Forms.Label lblSearchTitle; + private System.Windows.Forms.Panel panelSearch; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.ToolStripButton LinStorage; + private System.Windows.Forms.DataGridView DGView; + private DateTimePickerA dtpCREATEDATEEND; + private DateTimePickerA dtpCREATEDATESTART; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.DataGridViewTextBoxColumn 条码; + private System.Windows.Forms.DataGridViewTextBoxColumn 物料号; + private System.Windows.Forms.DataGridViewTextBoxColumn 物料名称; + private System.Windows.Forms.DataGridViewTextBoxColumn 入库类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 操作人; + private System.Windows.Forms.DataGridViewTextBoxColumn 入库时间; + private System.Windows.Forms.DataGridViewTextBoxColumn Pid; + private Controls.Pager pager1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.cs new file mode 100644 index 0000000..b590b5c --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.cs @@ -0,0 +1,184 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Windows.Forms; +using QMAPP.Entity; +using QMAPP.MD.Entity.TianJin; +using QMAPP.WinForm.Common; +using QMFrameWork.Common.Serialization; +using QMFrameWork.Data; + +namespace QMAPP.WinForm.Forms.TianJin +{ + /// + ///　作 用：入库 + ///　作 者：周晓东 + ///　编写日期：20180404 + /// + public partial class TJLinStorageForm : Form + { + Storage searchModel = new Storage();//查询条件 + public TJLinStorageForm() + { + InitializeComponent(); + } + + #region 窗体载入 + + private void Form_Load(object sender, EventArgs e) + { + //初始化控件属性 + this.DGView.AutoGenerateColumns = false; + //初始化分页 + this.pager1.Init(); + //加载下拉框 + BasicData basicData = new BasicData(); + //入库类型 + //this.comINTTYPE.DataSource = basicData.GetDictionaryList("TJINTTYPE"); + //this.comINTTYPE.DisplayMember = "value"; + //this.comINTTYPE.ValueMember = "key"; + //加载默认查询条件 + SetSearchModel(); + BindGirdData(); + + } + + #endregion + + #region 绑定数据 + + private DataPage BindGirdData() + { + List recorders = null;//查询结果列表 + DataPage dataPage = new DataPage(); + //获取前台分页设置信息 + dataPage = pager1.DataPage; + try + { + //State = 1 为入库记录 + searchModel.State = "3"; + + #region 服务查询 + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + + var result = agent.InvokeServiceFunction>("StorageBLL_GetList", searchModel, dataPage); + recorders = JsonConvertHelper.GetDeserialize>(result.Result.Result.ToString()); + #endregion + + + this.DGView.DataSource = recorders; + this.pager1.DataPage = dataPage; + } + catch (Exception ex) + { + throw ex; + } + return dataPage; + } + + #endregion + /// + /// 分页事件 + /// + /// + /// + private DataPage pager1_EventPaging(Controls.EventPagingArg e) + { + return BindGirdData(); + } + + /// + /// 查询事件 + /// + /// + /// + private void tsbSearch_Click(object sender, EventArgs e) + { + SetSearchModel(); + //this.pager1.Init(); + BindGirdData(); + } + + /// + /// 设置查询条件 + /// + private void SetSearchModel() + { + searchModel = new Storage(); + + //条码 + if (string.IsNullOrEmpty(this.txtProductCode.Text.Trim()) == false) + { + searchModel.ProductCode = this.txtProductCode.Text.Trim(); + } + //入库类型 + //if (this.comINTTYPE.SelectedValue != null && string.IsNullOrEmpty(this.comINTTYPE.SelectedValue.ToString().Trim()) == false) + //{ + // searchModel.InStorageType = this.comINTTYPE.SelectedValue.ToString().Trim(); + //} + + //操作开始时间 + if (string.IsNullOrEmpty(this.dtpCREATEDATESTART.Text.Trim()) == false) + { + searchModel.BeginTime = Convert.ToDateTime((this.dtpCREATEDATESTART.Value).ToString("yyyy-MM-dd") + " 00:00:00"); + } + //操作结束时间 + if (string.IsNullOrEmpty(this.dtpCREATEDATEEND.Text.Trim()) == false) + { + searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59"); + } + + } + + + + /// + /// 报废 + /// + /// + /// + private void LinStorage_Click(object sender, EventArgs e) + { + if (MessageBox.Show("您确定要报废当前条码吗？", "报废提示", MessageBoxButtons.YesNo) == DialogResult.Yes) + { + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + foreach (System.Windows.Forms.DataGridViewRow row in DGView.SelectedRows) + { + var pid = row.Cells["PID"].Value.ToString(); + var storage = new Storage(); + storage.PID = pid; + storage.State = "4"; + var result = agent.InvokeServiceFunction("StorageBLL_Update", storage); + } + } + + } + // 行序号 + private void DGView_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Rectangle rectangle = new Rectangle(e.RowBounds.Location.X, e.RowBounds.Location.Y, this.DGView.RowHeadersWidth - 4, e.RowBounds.Height); + TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), new Font("宋体", 12, FontStyle.Bold), rectangle, this.DGView.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right); + } + + /// + /// 报废 + /// + /// + /// + private void toolStripButton1_Click(object sender, EventArgs e) + { + if (MessageBox.Show("您确定要正式入库当前条码吗？", "入库提示", MessageBoxButtons.YesNo) == DialogResult.Yes) + { + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + foreach (System.Windows.Forms.DataGridViewRow row in DGView.SelectedRows) + { + var pid = row.Cells["PID"].Value.ToString(); + var storage = new Storage(); + storage.PID = pid; + storage.State = "1"; + var result = agent.InvokeServiceFunction("StorageBLL_Update", storage); + } + } + } + } +} diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx new file mode 100644 index 0000000..954f49f --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJLinStorageForm.resx @@ -0,0 +1,389 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + + + 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 + iWo1AAAAAElFTkSuQmCC + + + + + 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 + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFJRTUZyYW1lV29yay5EYXRhLkF0dHJpYnV0ZXMsIFZlcnNpb249 + MS4zLjMuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAZUU1GcmFtZVdv + cmsuRGF0YS5EYXRhUGFnZQoAAAAaPFBhZ2VJbmRleD5rX19CYWNraW5nRmllbGQZPFBhZ2VTaXplPmtf + X0JhY2tpbmdGaWVsZBo8UGFnZUNvdW50PmtfX0JhY2tpbmdGaWVsZBw8UmVjb3JkQ291bnQ+a19fQmFj + a2luZ0ZpZWxkGDxLZXlOYW1lPmtfX0JhY2tpbmdGaWVsZB88U29ydEV4cHJlc3Npb24+a19fQmFja2lu + Z0ZpZWxkFzxSZXN1bHQ+a19fQmFja2luZ0ZpZWxkGTxDb3VudFNxbD5rX19CYWNraW5nRmllbGQbPElz + UGFyYWxsZWw+a19fQmFja2luZ0ZpZWxkIjxBY2N1cmF0ZVBhcnRpdGlvbj5rX19CYWNraW5nRmllbGQA + AAAAAQECAQAACAgICAEBAgAAAAEAAAAyAAAAAAAAAAAAAAAKCgoKAAAL + + + + 25 + + \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index a588379..c233a44 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -29,16 +29,16 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = 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 dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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 dataGridViewCellStyle2 = 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel)); this.dgvPlan = new System.Windows.Forms.DataGridView(); this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -55,6 +55,7 @@ this.tpContent = new System.Windows.Forms.TabControl(); this.tpPlanList = new System.Windows.Forms.TabPage(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.tsbPrint = new System.Windows.Forms.ToolStripButton(); this.tsbOrderOperation = new System.Windows.Forms.ToolStripDropDownButton(); @@ -75,7 +76,6 @@ this.label2 = new System.Windows.Forms.Label(); this.comboBox2 = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.dtpCREATEDATEEND = new DateTimePickerA(); this.dtpCREATEDATESTART = new DateTimePickerA(); this.label4 = new System.Windows.Forms.Label(); @@ -95,14 +95,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcOrderNo, @@ -119,16 +119,16 @@ this.dgvPlan.Location = new System.Drawing.Point(6, 11); this.dgvPlan.Name = "dgvPlan"; this.dgvPlan.ReadOnly = true; - dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle39.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle39; - dataGridViewCellStyle40.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); - this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle40; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvPlan.Size = new System.Drawing.Size(1777, 341); @@ -139,8 +139,8 @@ // dgcOrderNo // this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; - dataGridViewCellStyle32.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle2; this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.ReadOnly = true; @@ -149,8 +149,8 @@ // dgcSeq // this.dgcSeq.DataPropertyName = "SEQ"; - dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle3; this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.ReadOnly = true; @@ -159,8 +159,8 @@ // dgcMaterialCode // this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; - dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle4; this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.ReadOnly = true; @@ -169,8 +169,8 @@ // dgcMaterialName // this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; - dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle5; this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.ReadOnly = true; @@ -178,8 +178,8 @@ // // dgcState // - dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcState.DefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcState.DefaultCellStyle = dataGridViewCellStyle6; this.dgcState.HeaderText = "工单状态"; this.dgcState.MinimumWidth = 80; this.dgcState.Name = "dgcState"; @@ -189,8 +189,8 @@ // dgcPlanDate // this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; - dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle7; this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.ReadOnly = true; @@ -199,8 +199,8 @@ // dgcShift // this.dgcShift.DataPropertyName = "SHIFT_CODE"; - dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcShift.DefaultCellStyle = dataGridViewCellStyle38; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcShift.DefaultCellStyle = dataGridViewCellStyle8; this.dgcShift.HeaderText = "计划类型"; this.dgcShift.Name = "dgcShift"; this.dgcShift.ReadOnly = true; @@ -287,6 +287,18 @@ this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.White; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(126, 67); + this.toolStripButton2.Text = "条码补打"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // toolStripButton1 // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -514,25 +526,13 @@ this.label3.TabIndex = 20; this.label3.Text = "计划类型"; // - // toolStripButton2 - // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.White; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(126, 67); - this.toolStripButton2.Text = "条码补打"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // // dtpCREATEDATEEND // this.dtpCREATEDATEEND.CustomFormat = " "; this.dtpCREATEDATEEND.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.dtpCREATEDATEEND.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpCREATEDATEEND.FormatString = "yyyy年MM月dd日"; - this.dtpCREATEDATEEND.Location = new System.Drawing.Point(788, 66); + this.dtpCREATEDATEEND.Location = new System.Drawing.Point(669, 66); this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND"; this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 26); @@ -546,7 +546,7 @@ this.dtpCREATEDATESTART.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.dtpCREATEDATESTART.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpCREATEDATESTART.FormatString = "yyyy年MM月dd日"; - this.dtpCREATEDATESTART.Location = new System.Drawing.Point(590, 66); + this.dtpCREATEDATESTART.Location = new System.Drawing.Point(471, 66); this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART"; this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 26); @@ -558,7 +558,7 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(514, 69); + this.label4.Location = new System.Drawing.Point(395, 69); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 20); this.label4.TabIndex = 21; @@ -568,7 +568,7 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(757, 69); + this.label5.Location = new System.Drawing.Point(638, 69); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(24, 20); this.label5.TabIndex = 22; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index 845a04e..07453f3 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -153,11 +153,8 @@ 17, 17 - - 17, 17 - - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L @@ -227,7 +224,7 @@ Ae6xxmll7eSUAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L @@ -297,10 +294,7 @@ Ae6xxmll7eSUAAAAAElFTkSuQmCC - - 127, 17 - - + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L @@ -370,6 +364,9 @@ Ae6xxmll7eSUAAAAAElFTkSuQmCC + + 127, 17 + 63 diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs index c74add6..db95297 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs @@ -41,7 +41,8 @@ this.txtProductCode = new System.Windows.Forms.TextBox(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.tsbSearch = new System.Windows.Forms.ToolStripButton(); - this.tsbAdd = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.LinStorage = new System.Windows.Forms.ToolStripButton(); this.panelSearchTitle = new System.Windows.Forms.Panel(); this.lblSearchTitle = new System.Windows.Forms.Label(); this.panelSearch = new System.Windows.Forms.Panel(); @@ -92,7 +93,8 @@ this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbSearch, - this.tsbAdd}); + this.toolStripButton1, + this.LinStorage}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(998, 70); @@ -112,17 +114,29 @@ this.tsbSearch.Text = "查询"; this.tsbSearch.Click += new System.EventHandler(this.tsbSearch_Click); // - // tsbAdd - // - this.tsbAdd.AutoSize = false; - this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 12F); - this.tsbAdd.Image = ((System.Drawing.Image)(resources.GetObject("tsbAdd.Image"))); - this.tsbAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbAdd.Name = "tsbAdd"; - this.tsbAdd.Size = new System.Drawing.Size(100, 60); - this.tsbAdd.Text = "入库"; - this.tsbAdd.Click += new System.EventHandler(this.tsbAdd_Click); + // toolStripButton1 + // + this.toolStripButton1.AutoSize = false; + this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(100, 60); + this.toolStripButton1.Text = "入库"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // LinStorage + // + this.LinStorage.AutoSize = false; + this.LinStorage.Font = new System.Drawing.Font("微软雅黑", 12F); + this.LinStorage.Image = ((System.Drawing.Image)(resources.GetObject("LinStorage.Image"))); + this.LinStorage.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.LinStorage.ImageTransparentColor = System.Drawing.Color.Magenta; + this.LinStorage.Name = "LinStorage"; + this.LinStorage.Size = new System.Drawing.Size(140, 60); + this.LinStorage.Text = "临时库存"; + this.LinStorage.Click += new System.EventHandler(this.LinStorage_Click); // // panelSearchTitle // @@ -412,7 +426,7 @@ private System.Windows.Forms.Label lblSearchTitle; private System.Windows.Forms.Panel panelSearch; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.ToolStripButton tsbAdd; + private System.Windows.Forms.ToolStripButton LinStorage; private System.Windows.Forms.DataGridView DGView; private DateTimePickerA dtpCREATEDATEEND; private DateTimePickerA dtpCREATEDATESTART; @@ -428,5 +442,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn 入库时间; private System.Windows.Forms.DataGridViewTextBoxColumn Pid; private Controls.Pager pager1; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs index 1c6f552..f167035 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs @@ -153,12 +153,43 @@ namespace QMAPP.WinForm.Forms.TianJin //BindGirdData(); } + + /// + /// 入库 + /// + /// + /// + private void LinStorage_Click(object sender, EventArgs e) + { + TJLinStorageForm editForm = new TJLinStorageForm(); + DialogResult result = editForm.ShowDialog(); + if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作 + { + this.pager1.Init(); + BindGirdData(); + } + } // 行序号 private void DGView_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) { Rectangle rectangle = new Rectangle(e.RowBounds.Location.X, e.RowBounds.Location.Y, this.DGView.RowHeadersWidth - 4, e.RowBounds.Height); TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), new Font("宋体", 12, FontStyle.Bold), rectangle, this.DGView.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right); } - + + /// + /// 入库 + /// + /// + /// + private void toolStripButton1_Click(object sender, EventArgs e) + { + TJProductInSendCodeForm editForm = new TJProductInSendCodeForm(); + DialogResult result = editForm.ShowDialog(); + if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作 + { + this.pager1.Init(); + BindGirdData(); + } + } } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx index e793511..d9fb669 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx @@ -124,93 +124,163 @@ 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 - y+7D8eQU3AAAAABJRU5ErkJggg== + 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 + nOvthQdEy2UAAAAASUVORK5CYII= - + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA8HSURBVGhD1Zh5bJvnfcdldKmvxontNFka27GTbsmWdkOa + OJeXIQiGYRu6FcP+6PbHWmzDVmBDt6YdnGFB41w+kiyJD13WffImRVISKZEiJeo+qFuWqIumbFmSLVEn + JVm8vvs+7/vSlj0pTSNjWx7hg4d8X0r8fZ/f+SoJX/H1pQTE48qL/wfr1xYQV6yPcReItxLinnTnf3f9 + WgKEwWJNzCygsKwWWYYKqB3NMNZ2wdLig63Tj8q+q6ganEL16DQ8Y7OoG19Ew2QIjTdW0Dx9Ey3BNbTN + R+BdiJE42onYvfNkLo62WV4joYj0Vb/yUL6wgITxo+PXUeAZxHmTB6czdTircyG1rAkZzk7k1g2gsGUU + xZ1Xob00BcPgNEz+OZjHFmEdX0bZ1CrKp9dgC0Zhp5EVCvYgmSHTcZRf5zUyF5a+7t4ISBjvC0wio6Ib + 5kszKPb04LzejcxKL3Jr+lDUNAR1+2XoesZhHLgO80gQ1sA8ysaXYJtaQQVP3zEbhnM+iiqe+B3w9J08 + fSeFOCikikLm75WAWEz+E33+CVys7IGpZ4phsQxjyxDSSpsl4wsah6DyBqDtpvH911EyHISFxpfS+PJJ + 2fhKYfwCjV+igetZJBThVEQ4KKKKIhhl0tqSgMTJ9/gnkV7ZC8ulG3AHFtDFOLb1XEGmsxtFjcNQtQnj + r8HAkxfGWy8v8ORDsEnGr8ExF4FzMYaqUByu5TjcKzLitUtcSwihCAdFVFHElgUkqk336CQuOvth7Z9G + DY1vYzj4QzG4fZPI8fig9l6h8RMwXFJOXhh/VTbeLoyflY0XhkqGr8ZRfVNGvJaEJEQonnAxL7YkIPFL + 3sEJZLgHUe4LovbqEjpurMLH4JxmfDaMziCv0Q9d1wT0fddhGgzC7GfYjDFsJpZhv86wCcox76Jg1zJF + r5KbMVSvyYjX0rWECHpBEkAvbNkD9X0BZFb7UD7Acsh49k6FMDi/hquhKFZ5v+PaElSdN1Dim4dldImG + r8I2sYaKG1GeujhNwL0M1NwEPBRcGyW0pk78bQXxWlyr5mekcKIXnPSCiyK2JGBtLYyTaRoc/ygDb7x3 + FsfPpOHE+QK8czYH713IRVFFEwrd3chwdCG7phe59f3Ib/KhsHUYxR0jUHdfhoYHoO0fg843Bv0gGR6D + YXQMRv8YTAEZoz8gvXcuhekFilByQQhY2JKAcBj/lWHC6Qwr3kk24OensvDPJy7gh//4c/zNT36BX5xK + wVufZeOX53Lw9oU8nEjJxztpBXj3YiHeyyzG+9kqfJBDclU4mUfySYEKpwpJkQqni2VOFhZz18B2YwHV + dGvVUuweeSAcQbK6Bsn6ZmTbLyGvaggZ9j6cM7Ug1dYFQ/csSgaWYBleRunlNZRfZWOajKNyGnDO0hCG + j2tJDiFhWCKMPEoY1fI7JPhaXBPJnEhkScBWcyAcieKisRVp5k5k2Rke1ZdRWDuGDy4a8NanOTiRXIR3 + Uovxbroa72do8EGWFidzdDiVp8fpfANOF5BCA84UkWIDPlQRNdEQrQEfKXyo0eMjnYkeWJTE3rMqJARk + l/Ui0+bj6ftp/DiKGyehap6ExjsNXecsDL3zMNELZnrB4l9lEt9k+byJ8ms3mcw3YZ8irERSE5sRjYzM + sRvP34m4ViV6xL3sA+FIDHmVQ8ip9KOgRhh/HarGKZzVevBxUSU+1bjwmc6Ns8YanC/x4IK1DhdK65Bc + RsrrkGKrQ6qdVBCHTJqTVNUhfR3iWrqrAXYOeq5Fhp/oxKKCiU68lVEiHI2h0DWGPBeNr5uCujkITUsQ + qdZ2DnFNSLG2coBrQ5q9neNFBxtdBzKqZDLdpLoDWTXEQ2o7kC2o60BO/d20I6ehk55a5elDGiMqabxz + q7NQOBpHcfUET38KqoYZaFrnoWtf5B6Etn0W+q4FhtASQyiEksEQzENkJMR+EILVTwIhhhS5EpJGirJr + ZCLEBqfA8VpCer/MhheTjBeDXOUNCiBbEhChAHXtNIrqglA30XjvMrStC/gw14Z3U7R4/6IRH2QacTJL + IUfmVC7JM+K0IF+hwIgzhdyJ2M8UrYOJ/mFxCawct51BSMaLUdoxdQ8EaOtnoaqfh7YlBL13BcauNVj6 + 4ygdAspGgfLLgG0MsF8h40DFBJmiEdcZCoIbjOkZQsOqRGmdU2Co3AGvifIrDK+g4VI5Jmz60vrSAnSN + C0zcEHStKzB0hKFvX8V5Qws+Ka7GZ0xmwVkd0RMDMXrYJwiT+pzZg/MWmQtWhdINsLLX8MnOGmAYUbR9 + Ig7bNQrgvmUB+sZlqBtXoW9bo4AIPRCFtm0JmjZ6xcuw6iCd89B3k555qawa+ub5PEAGCGck0+A8c0Rh + SGF4HdK1BdjG2QhptJ3G28bpCe5zWxMAGJpXoWlaowAa3xmHoTOKHKefHXmAT2GDyHL4kOX0IdtF3ISD + n0CM2Lm1CnWknjSwn2wE7+U3DqI0IPpHjAkfQenVCMqvRBC8SSMQRTQek43aZG0qwNgchrYpAoM3RgEU + 1B5Bemk/ko3tSGGHTrF0sKySUlLWgbRyYutAul2hgogSK3CsgyX3Fsp78+gyqphHbuZTFakhSxw/Eisa + jyLGn43W5whgyDTHKCAOYzvpoBeYC4aONYZTGMbuMEy9YZT0kUthmPvJABkMwzJEhslIGFbBKPGv20kp + sfjZtUc5fo9FkeUfxT/0f4yXe36AV8if+P4Cb197G/0r/QjH5ZK0kYjPERCDrpm50ErjvWAohXn6XfhU + 1cCO3EyacE7fxAd7YiBGwiYnuFBCzDLJAouC9TbnrQ1Ipwc/LnfiT7v+CbvbH0BSWxKSWraRJGxrlvev + e3fgb/0/wvgaXcR1t4hNBZhovLaJAlpkEZInOni9CyjpJj2AuY9cAssr8QHWQRlRakuHyQhhyRVlt8x/ + G6s/Bk4pyBwcxG91HpUM/w3v17GjfTeO9r+I13yv44WBF7GzYzfu826XhPx2z9PwLvMkudaL2NwDNF7b + wHIqvNAC7hFcpHXJxm6klvQi1UwsvUgTlPYyPwgHwPRyYuvFxQR2UnGb9MpuZFX0I8XVgafaXkCSNwk7 + vd/A17z3Ybf3fvTO90o29I73YnfF/bivczvu99I7FPGd3u/iWviadD+u1KfNBdB4TZ3oB7IIHUOqqGYe + hdVBFNXOyrDZFQsa2PQaSdMs5ybSIqNpJW0KXnlXt8/A1LaCHzT96y3jd3h3YXv7Tuz17sPwLF3HNTQy + hIcM38QDnXuxr/UhPNL2KJIatuFfAj+V7v9KAQYKUPOJQ1svi9A2xZDvnEauY5Ij9hTyBW4ZMTNJeKY4 + eitwCCysJw0yRdLOkbzhBjKah3Gg42nsouE7WndhJ9nRSgEt++ELMga5BkYG8KB2H77Rugd76h+U2F/3 + EB5rPYDJ8KT0GSFicwE8fbWHhnPXNgCa+gjSTEO4oOtBir4PKYZepBiJiYiQUsJKCqkEVgUlxFLLupFX + ehk/dryHfW37cajjMF7qfQXHel9l9TmG17pfR2Ce8wmX/4ofr5b/IV7uPoZjbX+AF9tfwqGGw9jl3o1z + k+elz0Tikc0F6Hn6qhqGkfCCEEFPSDmhhNSt5G6TE9yglFrR9ASmLtJ9m5IefqYnDAdD/Efdp7C3bQ9e + 63wdU8tTWImuYCm8hFAkhJjSuGKxGEJrISyGF7EaX8XlyQCeMz2PJPs2HPe/KX1GlNdNBehofLGbXhAi + PKA3IkjVD+K8qhsXtL2SJwTJegUDPWNUMPUgVcBSdQszP8MGmGsK4K/cb+Bbbb+JP2v/PlZWV6TvTMT0 + 3SvxD7bg1SCez2LFsibhzdH/kK59voBqCqiiAO6yCOEJ0BO8x5DSNdJLTYQVSmBoJW2ElU70DTZsuewm + YDfXd0ZQyf3vOj/Bk81P4I9a/hjaKi1KrCUwlhphLjdjaWlJskHs5jIzDFYDLHYLcrJz8NS5p7HN/LUv + JkDriqPIwTDirnYDKncU6cYAUrSD9MQQUg1DSBMYCXMjrUQmXWAmFpmL1tukWzkXWa/guE2FZxq+i6N1 + L+DxjMN49PS38PCZR/DYmQMYmmAT4RoYGsCenz6AHSd2YvtbO7D9P3fg4exHsK9sP1zzLukzItw2F8DT + L6qkF5yyCJUrhtzyOeSUzXAPItdG7EHkVZBKmXyHAh8C8qtkClzrmeGjKneW4leb/xLP1zyHlxuP4cWm + l/Bs3XM46jmKkRl2Py7fiA9Hsp7AAftBHLQewuOlR/CQ+mF8j59b449Yn1uFNDS80E4B9IIQUeyMoaBi + hYRQUEkcIRQ6SZVMkUvBTapDfCRVqFHwyBR6FsBHB/x7jQ5PulmFbK/g2bLv4XfNz+D3Sn4fgWBAsmE0 + MIqDnx7Co6rHcKDwEI7kPYGdmt3QzGil+2LAE2tTAWqefkE5vVBB4ytBb0SRph1DcvEQUtQjZBgpmmGk + aolOQT+MNIFhHcb/SSrDLtt4DT90/xKHKw7iWQMFGL6D39E/A4fXgYAvAJvNhkMfPY7DqiN4Mvvb2Fmw + Cz8bfkOyL/Fvf7E2FhChAJ5+QRkF2Ahfi3BSOZgLVYQhKPJCoKkmNYSnKtDWEpHsiYRPJP06pHLMXc/S + /OP6T/BYqTjlR/F4HkPlrSM48PeHcPAn5OwhPJzxCPaoH8Tx0TcR5o9Y6yvWpgJUNDzfyjCiFyQSQugR + kdy3Qou5ohKIPBFlV6BUrgSigt0Be4u6NsY9Bj6B4v36Rrzq+mscNj2Fb2r2Yr/+AexV78WTJd/G91v/ + HPb5CskukbR3l9tNBRTz9PPM9EKpTCHf3yFCJLjgVo4oYqSE30DQJqiqozByN9GLn/AJ7t88OvzMo0bm + FQ2611hzlSXCZqNesbkAGp1XQuMtRHgiIULkxTohxVKOEMUrKgqRPLLOM+oECUF3UeyKSugZnmYnYGNo + Li7ItkTZkRPdeaO1oYAwBeSb4sjSxZFjJHydSzG59EguBeVRkARF5VNUPkUJCiisQOSOgMISFFLgF6GA + hSLXHkahI4ypORrBuX9dvm64NvYAq5CVp2fkHy3hqZbwVM18b+YpCiw8NQm63sIYtzCuBVbGtgRnp8Re + KmCyflHE75Rzn1uUbflSAsSi5/5P+aJrUwFflfUVFwD8N7/Nl0gJjQCoAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA8HSURBVGhD1Zh5bJvnfcdldKmvxontNFka27GTbsmWdkOa diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs index 835cd32..c4684cc 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInSendCodeForm.cs @@ -47,15 +47,16 @@ namespace QMAPP.WinForm.Forms.TianJin QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); var scode = txtCode.Text.Trim().ToUpper(); - var count = agent.InvokeServiceFunction>("StorageBLL_SelectCount", scode); - if (count.Result > 0) - { - txtCode.Text = ""; - txtCode.Focus(); - lblError.ForeColor = Color.Red; - lblError.Text = "库存中已存在此零件："+ scode; - return; - } + //增加返修入库，条码会有重复的情况 + //var count = agent.InvokeServiceFunction>("StorageBLL_SelectCount", scode); + //if (count.Result > 0) + //{ + // txtCode.Text = ""; + // txtCode.Focus(); + // lblError.ForeColor = Color.Red; + // lblError.Text = "库存中已存在此零件："+ scode; + // return; + //} try { Storage pi = new Storage(); @@ -64,7 +65,9 @@ namespace QMAPP.WinForm.Forms.TianJin { pi.InStorageType = comINTTYPE.SelectedValue.ToString();//退返入库 } - + if (comINTTYPE.SelectedValue.ToString() == "退返入库") + pi.State = "3"; + var result =agent.InvokeServiceFunction>("StorageBLL_Insert", pi); //保存成功 txtCode.Text = ""; diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj index 90aeed3..97a3cc4 100644 --- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj +++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj @@ -837,6 +837,12 @@ TJOutWarehouseForm.cs + + Form + + + TJLinStorageForm.cs + Form @@ -1364,6 +1370,10 @@ TJOutWarehouseForm.cs Designer + + TJLinStorageForm.cs + Designer + TJSendCodeForm.cs diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index c2c32ff..4064681 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -69,11 +69,11 @@ - + - - +