From f2631a7c034fda478641f04b21b9f13d4af25190 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期六, 02 十一月 2024 14:58:49 +0800 Subject: [PATCH] 到货条码打印浏览 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs | 319 +++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 321 +++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs | 51 +++ DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs | 71 ++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 13 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs | 78 +++++ 6 files changed, 853 insertions(+), 0 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs new file mode 100644 index 0000000..4e298cb --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -0,0 +1,321 @@ +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_ArrivalBarcode : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "VArrivalBarcodeManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_ArrivalBarcode() + { + 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, isEdit, gvList); + JObject _job = JObject.Parse(strJson); + JArray array = new JArray(); + JArray list3 = new JArray(); + foreach (var a in _job["rtnData"]["list"]) + { + 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); + } + + foreach (var a in _job["rtnData"]["list3"]) + { + list3.Add(a); + } + + DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString()); + if (dt1.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt1; + gcMx2.ForceInitialize(); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); + } + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs new file mode 100644 index 0000000..a8167bf --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs @@ -0,0 +1,319 @@ +锘� + +using System; + +namespace Gs.Warehouse.Models +{ + + /// <summary> + /// 鐗╂枡鍏ュ簱鏉$爜鏄庣粏 + /// </summary> + public class MesInvItemInCDetails + { + /// <summary> + /// 榛樿鍊�: (newid()) + /// </summary> + public Guid Guid { get; set; } + + /// <summary> + /// 鍏ュ簱鍗昳d + /// </summary> + public long? ItemInId { get; set; } + + /// <summary> + /// 鐗╂枡鏉$爜PSN + /// </summary> + public string ItemBarcode { get; set; } + + /// <summary> + /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 + /// </summary> + public string CItemCode { get; set; } + + /// <summary> + /// 瀹㈡埛鐗╂枡鏉$爜 + /// </summary> + public string CItemBarcode { get; set; } + + /// <summary> + /// 楠屾敹鏁伴噺 + /// </summary> + public decimal? Quantity { get; set; } + + /// <summary> + /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�) + /// 榛樿鍊�: ((1)) + /// </summary> + public bool? BarcodeFlag { get; set; } + + /// <summary> + /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛� + /// 榛樿鍊�: ((1)) + /// </summary> + public bool? EpFlag { 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> + /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉$爜鏋�1-鏃犵嚎鏉$爜鏋� + /// </summary> + public long? WorkType { get; set; } + + /// <summary> + /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 + /// </summary> + public string ItemNo { get; set; } + + /// <summary> + /// 鍘傚鎵规 + /// </summary> + public string LotNo { get; set; } + + /// <summary> + /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�) + /// 榛樿鍊�: ((0)) + /// </summary> + public bool? ComanagementFlag { get; set; } + + /// <summary> + /// 瀹㈡埛缂栫爜 + /// </summary> + public string CustNo { get; set; } + + /// <summary> + /// 妫�楠岀粨鏋� + /// </summary> + public string CheckRes { get; set; } + + /// <summary> + /// 杩涜揣鏁伴噺 + /// </summary> + public decimal? CheckQty { get; set; } + + /// <summary> + /// 妫�楠岀姸鎬� + /// </summary> + public string CheckStates { get; set; } + + /// <summary> + /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤 + /// 榛樿鍊�: ((0)) + /// </summary> + public bool? ForceInFlag { get; set; } + + /// <summary> + /// 浠撳簱缂栫爜 + /// </summary> + public string DepotCode { get; set; } + + /// <summary> + /// 璐т綅缂栫爜 + /// </summary> + public string DepotSectionCode { get; set; } + + /// <summary> + /// 鐗硅浜嬮」 + /// </summary> + public string Remark { get; set; } + + /// <summary> + /// 鐗╂枡鏉$爜 + /// </summary> + public string ItemBarcode2 { get; set; } + + /// <summary> + /// 鏂版潯鐮� + /// </summary> + public string ItemBarcode3 { get; set; } + + /// <summary> + /// 宸蹭娇鐢ㄦ暟閲� + /// </summary> + public decimal? UseQty { get; set; } + + /// <summary> + /// 鍑哄簱鏁伴噺 + /// </summary> + public decimal? OutQty { get; set; } + + /// <summary> + /// 鐗╂枡鍚嶇О + /// </summary> + public string ItemSname { get; set; } + + /// <summary> + /// 璧峰浣嶇疆 + /// </summary> + public int? Spostion { get; set; } + + /// <summary> + /// 缁撴潫浣嶇疆 + /// </summary> + public int? Epostion { get; set; } + + /// <summary> + /// 妫�楠屾棩鏈� + /// </summary> + public DateTime? CheckDate { get; set; } + + /// <summary> + /// 鍗曚綅 + /// </summary> + public string Unit { get; set; } + + /// <summary> + /// 鏄惁妫�楠� + /// 榛樿鍊�: ((0)) + /// </summary> + public bool? Ischeck { get; set; } + + /// <summary> + /// 閲囪喘鍗曞彿 + /// </summary> + public string Ebeln { get; set; } + + /// <summary> + /// 鎵规鏃ユ湡 + /// </summary> + public string LotDate { get; set; } + + /// <summary> + /// 鍙戠エ鍙� + /// </summary> + public string BillNo { get; set; } + + /// <summary> + /// 鏄惁鍏ュ簱鎴愬姛 + /// 榛樿鍊�: ((0)) + /// </summary> + public bool? StockOk { get; set; } + + /// <summary> + /// 宸ュ巶 + /// </summary> + public string Factory { get; set; } + + /// <summary> + /// 鍏徃 + /// </summary> + public string Company { get; set; } + + /// <summary> + /// CB鍗曞彿 + /// </summary> + public string CbNo { get; set; } + + /// <summary> + /// 绠卞彿 + /// </summary> + public string BoxNo { get; set; } + + /// <summary> + /// 浠撳簱ID + /// </summary> + public long? DepotId { get; set; } + + /// <summary> + /// 璐т綅ID + /// </summary> + public long? DepotSectionId { get; set; } + + /// <summary> + /// 琛屽彿 + /// </summary> + public string LineNum { get; set; } + + /// <summary> + /// 鎵弿鏁伴噺 + /// </summary> + public decimal? SmQty { get; set; } + + /// <summary> + /// 鍙戣揣鍗曞彿 + /// </summary> + public string Vgbel { get; set; } + + /// <summary> + /// 琛屽彿 + /// </summary> + public long? Kdpos { get; set; } + + /// <summary> + /// 浣滀笟鍗曞彿 + /// </summary> + public string WorkNo { get; set; } + + /// <summary> + /// 琛屽彿 + /// </summary> + public long? EbelnLineNo { get; set; } + + /// <summary> + /// CB鍗曞彿 + /// </summary> + public string CbillNo { get; set; } + + /// <summary> + /// 绱ф�ユ爣璁� + /// </summary> + public bool? UrgentFlag { get; set; } + + /// <summary> + /// 鏉垮瀷 + /// </summary> + public string BoardStyle { get; set; } + + /// <summary> + /// 宸ヤ綔琛屽彿 + /// </summary> + public int? WorkLine { get; set; } + + /// <summary> + /// 浠诲姟鍙� + /// </summary> + public string TaskNo { get; set; } + + /// <summary> + /// 渚涘簲鍟嗙紪鐮� + /// </summary> + public string SuppNo { get; set; } + + /// <summary> + /// 鏀惰揣鍗曞彿 + /// </summary> + public string RbillNo { get; set; } + + /// <summary> + /// K3 閲囪喘鍗曞彿 + /// </summary> + public long? EbelnK3id { get; set; } + + /// <summary> + /// K3 琛屽彿 + /// </summary> + public long? LineK3id { get; set; } + + /// <summary> + /// 鐗╂枡ID + /// </summary> + public long? ItemId { get; set; } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs new file mode 100644 index 0000000..67a20d6 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs @@ -0,0 +1,78 @@ +锘縰sing MES.Service.Modes; +using System; +using System.Collections.Generic; + +namespace Gs.Warehouse.Models +{ + + /// <summary> + /// 鏁版嵁婧愬鍏� + /// </summary> + public class VArrivalBarcode + { + /// <summary> + /// </summary> + public Guid? guid { get; set; } + + /// <summary> + /// </summary> + public string depotsCode { get; set; } + + /// <summary> + /// </summary> + public string remark { get; set; } + + /// <summary> + /// </summary> + public DateTime? insDate { get; set; } + + /// <summary> + /// </summary> + public int? status { get; set; } + + /// <summary> + /// </summary> + public DateTime? checkDate { get; set; } + + /// <summary> + /// </summary> + public string suppNo { get; set; } + + /// <summary> + /// </summary> + public bool? fstatus { get; set; } + + /// <summary> + /// </summary> + public bool? urgentFlag { get; set; } + + /// <summary> + /// </summary> + public string billNo { get; set; } + + /// <summary> + /// </summary> + public string createBy { get; set; } + + /// <summary> + /// </summary> + public string depotName { get; set; } + + /// <summary> + /// </summary> + public string suppName { get; set; } + + /// <summary> + /// </summary> + public decimal? oldqty { get; set; } + + /// <summary> + /// </summary> + public string percentage { get; set; } + + + public List<VArrivalBarcodeItem> list { get; set; } + + public List<VArrivalBarcodeItem3> list3 { get; set; } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs new file mode 100644 index 0000000..0557822 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs @@ -0,0 +1,71 @@ +锘縰sing System; + +namespace Gs.Warehouse.Models +{ + + /// <summary> + /// 鏁版嵁婧愬鍏� + /// </summary> + public class VArrivalBarcodeItem + { + /// <summary> + /// </summary> + public Guid? guid { get; set; } + + /// <summary> + /// </summary> + public Guid parentGuid { get; set; } + + /// <summary> + /// </summary> + public int? workLine { get; set; } + + /// <summary> + /// </summary> + public bool? urgentFlag { get; set; } + + /// <summary> + /// </summary> + public string ebeln { get; set; } + + /// <summary> + /// </summary> + public int? okRkqty { get; set; } + + /// <summary> + /// </summary> + public decimal? quantity { get; set; } + + /// <summary> + /// </summary> + public string itemNo { get; set; } + + /// <summary> + /// </summary> + public string itemName { get; set; } + + /// <summary> + /// </summary> + public string fname { get; set; } + + /// <summary> + /// </summary> + public string cgUnit { get; set; } + + /// <summary> + /// </summary> + public string kcUnit { get; set; } + + /// <summary> + /// </summary> + public string itemModel { get; set; } + + /// <summary> + /// </summary> + public decimal? icount { get; set; } + + /// <summary> + /// </summary> + public long? prnQty { get; set; } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs new file mode 100644 index 0000000..a6d8789 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs @@ -0,0 +1,51 @@ +锘縰sing System; + +namespace MES.Service.Modes +{ + /// <summary> + /// 鏁版嵁婧愬鍏� + ///</summary> + public class VArrivalBarcodeItem3 + { + /// <summary> + /// + ///</summary> + public Guid? Guid { get; set; } + /// <summary> + /// + ///</summary> + public string BILL_NO { get; set; } + /// <summary> + /// + ///</summary> + public string ITEM_BARCODE { get; set; } + /// <summary> + /// + ///</summary> + public string ITEM_NO { get; set; } + /// <summary> + /// + ///</summary> + public string LOT_DATE { get; set; } + /// <summary> + /// + ///</summary> + public long? OLDQTY { get; set; } + /// <summary> + /// + ///</summary> + public string ITEM_NAME { get; set; } + /// <summary> + /// + ///</summary> + public string ITEM_MODEL { get; set; } + /// <summary> + /// + ///</summary> + public int? ICOUNT { get; set; } + /// <summary> + /// + ///</summary> + public bool? COME_FLG { get; set; } + } +} diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 11ecd6e..7efb2ee 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -355,6 +355,12 @@ <Compile Include="DevFrm\User\UserSetPwd.Designer.cs"> <DependentUpon>UserSetPwd.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.Designer.cs"> + <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Warehouse\Frm_MesDepot.cs"> <SubType>Form</SubType> </Compile> @@ -384,8 +390,12 @@ <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\MesInvItemInCDetails.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" /> + <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" /> + <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" /> + <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" /> <Compile Include="Entity\LoginInfoModel.cs" /> <Compile Include="Entity\PageQueryModel.cs" /> <Compile Include="Entity\ReturnModel.cs" /> @@ -582,6 +592,9 @@ <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx"> <DependentUpon>UserSetPwd.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Warehouse\Frm_ArrivalBarcode.resx"> + <DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx"> <DependentUpon>Frm_MesDepot.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.9.3