From e2dead6c3fb5df88aaf6f1a76bb0e971454ae6e8 Mon Sep 17 00:00:00 2001 From: zgf Date: Sun, 24 Dec 2023 17:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89erp=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XWMS/Controllers/XWMSMFMController.cs | 47 +++- .../XWMS/Controllers/XWMSPTHController.cs | 49 +++- .../XWMS/Controllers/XWMSSOHController.cs | 49 +++- .../Areas/XWMS/Views/XWMSMFM/Index.cshtml | 93 +++++-- .../Areas/XWMS/Views/XWMSPOH/Index.cshtml | 1 + .../Areas/XWMS/Views/XWMSPTH/Index.cshtml | 89 +++++-- .../Areas/XWMS/Views/XWMSSOH/Index.cshtml | 85 +++++-- HHWMS.Web/DataContext.cs | 3 + HHWMS.Web/Models/XWMS/ShipmentDetail.cs | 234 ++++++++++++++++++ HHWMS.Web/Models/XWMS/ShipmentHeader.cs | 156 ++++++++++++ HHWMS.Web/Models/XWMS/XWMSMFM.cs | 44 ++++ HHWMS.Web/Models/XWMS/XWMSPTH.cs | 51 ++++ HHWMS.Web/Models/XWMS/XWMSSOH.cs | 40 +++ 13 files changed, 864 insertions(+), 77 deletions(-) create mode 100644 HHWMS.Web/Models/XWMS/ShipmentDetail.cs create mode 100644 HHWMS.Web/Models/XWMS/ShipmentHeader.cs create mode 100644 HHWMS.Web/Models/XWMS/XWMSMFM.cs create mode 100644 HHWMS.Web/Models/XWMS/XWMSPTH.cs create mode 100644 HHWMS.Web/Models/XWMS/XWMSSOH.cs diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs index fe90bdb..efba034 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs @@ -17,11 +17,8 @@ namespace HHWMS.Web.Controllers; [ActionDescription("生产工单领料")] public class XWMSMFMController : BaseController { - private readonly IUnitWork _unitWork; - - public XWMSMFMController(IUnitWork unitWork) + public XWMSMFMController() { - _unitWork = unitWork; } #region Search @@ -85,6 +82,7 @@ public class XWMSMFMController : BaseController RETEXTCOE_0 = x.Field("RETEXTCOE_0"), RETQTY_0 = x.Field("RETQTY_0"), USEQTY_0 = x.Field("USEQTY_0"), + THISQTYSTU = "", WMD_USEQTY_0 = x.Field("WMD_USEQTY_0"), } ).ToList(); @@ -92,4 +90,45 @@ public class XWMSMFMController : BaseController } #endregion Search + + [HttpPost] + [FixConnection(CsName = "hangyong")] + public ActionResult Create(List data) + { + var _unitwork = new UnitWork(Wtm); + + var shipment = new ShipmentHeader2(); + shipment.Code = _unitwork.GetSerialNumber("SCC"); + shipment.Type = "SCC"; + shipment.FirstStatus = 0; + shipment.UserDef1 = data.FirstOrDefault().MFGFCY_0; + + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.ZoneCode = "L"; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.MFGNUM_0; + detail.SourceLine = item.MFGLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = item.ITMDES1_0; + detail.Lot = item.ITMDES2_0; + detail.Qty = item.THISQTYSTU; + detail.Unit = item.BOMSEQ_0.ToString(); + //detail.PurchasQty = item.THISQTYUOM; + //detail.PurchasUnits = item.UOM_0; + //detail.InventoryStatus = item.STA_0; + //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + return JsonMore(null); + } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs index 108685b..b25b6f2 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs @@ -17,11 +17,8 @@ namespace HHWMS.Web.Controllers; [ActionDescription("采购退货")] public class XWMSPTHController : BaseController { - private readonly IUnitWork _unitWork; - - public XWMSPTHController(IUnitWork unitWork) + public XWMSPTHController() { - _unitWork = unitWork; } #region Search @@ -93,4 +90,48 @@ public class XWMSPTHController : BaseController } #endregion Search + + [HttpPost] + [FixConnection(CsName = "hangyong")] + public ActionResult Create(List data) + { + var _unitwork = new UnitWork(Wtm); + + var shipment = new ShipmentHeader2(); + shipment.Code = _unitwork.GetSerialNumber("CGT"); + shipment.SourceCode = data.FirstOrDefault().POHNUM_0; + shipment.ShipTo = data.FirstOrDefault().BPSNUM_0; + shipment.Type = "CGT"; + shipment.FirstStatus = 0; + shipment.AppointmentTime = data.FirstOrDefault().RCPDAT_0; + shipment.UserDef1 = data.FirstOrDefault().PRHFCY_0; + + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.ZoneCode = "L"; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.PTHNUM_0; + detail.SourceLine = item.PTDLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = item.ITMDES1_0; + detail.Lot = item.ITMDES2_0; + detail.Qty = item.THISQTYSTU; + detail.Unit = item.STU_0; + detail.PurchasQty = item.THISQTYUOM; + detail.PurchasUnits = item.UOM_0; + detail.InventoryStatus = item.STA_0; + detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + return JsonMore(null); + } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs index ac60ac8..ddf11c6 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs @@ -17,11 +17,9 @@ namespace HHWMS.Web.Controllers; [ActionDescription("销售订单列表")] public class XWMSSOHController : BaseController { - private readonly IUnitWork _unitWork; - public XWMSSOHController(IUnitWork unitWork) + public XWMSSOHController() { - _unitWork = unitWork; } #region Search @@ -71,6 +69,7 @@ public class XWMSSOHController : BaseController YITMDES4_0 = x.Field("YITMDES4_0"), QTY_0 = x.Field("QTY_0"), NODLQTY_0 = x.Field("NODLQTY_0"), + THISQTYSTU = "", STU_0 = x.Field("STU_0"), BPAADD_0 = x.Field("BPAADD_0") } @@ -79,4 +78,48 @@ public class XWMSSOHController : BaseController } #endregion Search + + [HttpPost] + [FixConnection(CsName = "hangyong")] + public ActionResult Create(List data) + { + var _unitwork = new UnitWork(Wtm); + + var shipment = new ShipmentHeader2(); + shipment.Code = _unitwork.GetSerialNumber("XSC"); + shipment.Type = "XSC"; + shipment.ShipTo = data.FirstOrDefault().BPCORD_0; + shipment.FirstStatus = 0; + shipment.AppointmentTime = data.FirstOrDefault().ORDDAT_0; + shipment.UserDef1 = $"{data.FirstOrDefault().SALFCY_0} {data.FirstOrDefault().BPAADD_0}"; + + + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.ZoneCode = "L"; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.SourceCode = item.SOHNUM_0; + detail.SourceLine = item.SOPLIN_0.ToString(); + detail.MaterialCode = item.ITMREF_0; + detail.MaterialName = item.ITMDES1_0; + detail.Lot = item.ITMDES2_0; + detail.Qty = item.THISQTYSTU; + detail.Unit = item.STU_0; + //detail.PurchasQty = item.THISQTYUOM; + //detail.PurchasUnits = item.UOM_0; + //detail.InventoryStatus = item.STA_0; + //detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + return JsonMore(null); + } } diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml index 4fb588c..27c7eb5 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml @@ -63,6 +63,8 @@ @@ -74,13 +76,19 @@ - + + +
+ +
{{scope.row.THISQTYSTU}}
+
+
@@ -113,7 +121,7 @@ materialcode: '', gdbill: '', gdline:'', - ms:'' + ms:'1' }, //1:正常扣料,2:倒扣料,3:不管理 msList: [{ @@ -127,19 +135,20 @@ label: '不管理' }], addressList: [{ - value: 'QCT', - label: 'QCT' + value: 'QDB', + label: 'QDB' }, { value: 'SBD', label: 'SBD' }], + loading: false, tableData: [], currentPage: 1, // 当前页码 total: 20, // 总条数 pageSize: 20, // 每页的数据条数 multipleSelection: [], // 需要编辑的属性 - editProp: ['POHFCY_0'] + editProp: ['THISQTYSTU'] }; }, mounted: function () { @@ -180,6 +189,13 @@ cell.querySelector('.item__input').style.display = 'none' cell.querySelector('.item__txt').style.display = 'block' } + if (property == "THISQTYSTU") { + // 库存单位除以系数 + row.THISQTYSTU = row.THISQTYSTU * row.RETEXTCOE_0 + if (row.THISQTYSTU > row.RETQTY_0 - row.USEQTY_0) { + row.THISQTYSTU = row.THISQTYSTU; + } + } }, //每页条数改变时触发 选择一页显示多少行 handleSizeChange(val) { @@ -195,6 +211,7 @@ }, search() { var _this = this; + _this.loading = true; $.ajax({ type: "post", dataType: "json", @@ -208,34 +225,62 @@ }, url: "/xwms/XWMSMFM/Search", success: function (json) { - app.tableData = json.Data; + _this.tableData = json.Data; + _this.loading = false; }, error: function (json) { - alert("加载失败"); + _this.$message.error("加载失败"); + _this.loading = false; } }); }, create() { var _this = this; - $.ajax({ - type: "post", - dataType: "json", - data: { - data: _this.multipleSelection - }, - url: "/xwms/XWMSMFM/Create", - success: function (json) { - if (json.Code == 200) { - _this.$message({ - message: "创建成功!" - }); - _this.$refs.multipleTable.clearSelection(); - } - }, - error: function (json) { - alert("加载失败"); + _this.$confirm('注意:您确认要对此单据进行创建采购退货吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + //加校验 + if (_this.multipleSelection.length == 0) { + _this.$message.error("至少选择一张单据!"); + return; } + if (_this.verify(_this.multipleSelection)) { + _this.$message.error("请选择同一张单据!"); + return; + } + $.ajax({ + type: "post", + dataType: "json", + data: { + data: _this.multipleSelection + }, + url: "/xwms/XWMSMFM/Create", + success: function (json) { + if (json.Code == 200) { + _this.$message("创建成功!"); + _this.$refs.tableData.clearSelection(); + } + else { + _this.$message.error("创建失败!" + json.Msg); + } + }, + error: function (json) { + _this.$message.error("创建失败!"); + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消!' + }); }); + }, + verify(array) { + const tmp = new Set(); + array.forEach(x => tmp.add(x.MFGNUM_0)); + return tmp.size > 1 ? true : false; } }, }); diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml index d3a0a24..38b1044 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml @@ -395,6 +395,7 @@ }, error: function (json) { _this.$message.error("加载失败"); + _this.loading = false; } }); }, diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml index 9fe85fd..29611b6 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml @@ -56,6 +56,8 @@ @@ -86,7 +88,12 @@ - + +
+ +
{{scope.row.THISQTYSTU}}
+
+
row.QTYSTU_0) { + row.THISQTYSTU = row.QTYSTU_0; + this.$message.error("不能超出单据数量"); + } + else { + row.THISQTYUOM = row.THISQTYSTU / row.UOMSTUCOE_0; + } + } }, //每页条数改变时触发 选择一页显示多少行 handleSizeChange(val) { @@ -181,6 +199,7 @@ }, search() { var _this = this; + _this.loading = true; $.ajax({ type: "post", dataType: "json", @@ -193,34 +212,62 @@ }, url: "/xwms/XWMSPTH/Search", success: function (json) { - app.tableData = json.Data; + _this.tableData = json.Data; + _this.loading = false; }, error: function (json) { - alert("加载失败"); + _this.$message.error("加载失败"); + _this.loading = false; } }); }, create() { var _this = this; - $.ajax({ - type: "post", - dataType: "json", - data: { - data: _this.multipleSelection - }, - url: "/xwms/XWMSPTH/Create", - success: function (json) { - if (json.Code == 200) { - _this.$message({ - message: "创建成功!" - }); - _this.$refs.multipleTable.clearSelection(); - } - }, - error: function (json) { - alert("加载失败"); + _this.$confirm('注意:您确认要对此单据进行创建采购退货吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + //加校验 + if (_this.multipleSelection.length == 0) { + _this.$message.error("至少选择一张单据!"); + return; } + if (_this.verify(_this.multipleSelection)) { + _this.$message.error("请选择同一张单据!"); + return; + } + $.ajax({ + type: "post", + dataType: "json", + data: { + data: _this.multipleSelection + }, + url: "/xwms/XWMSPTH/Create", + success: function (json) { + if (json.Code == 200) { + _this.$message("创建成功!"); + _this.$refs.tableData.clearSelection(); + } + else { + _this.$message.error("创建失败!" + json.Msg); + } + }, + error: function (json) { + _this.$message.error("创建失败!"); + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消!' + }); }); + }, + verify(array) { + const tmp = new Set(); + array.forEach(x => tmp.add(x.PTHNUM_0)); + return tmp.size > 1 ? true : false; } }, }); diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml index 5e08aff..996fccb 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml @@ -53,6 +53,8 @@ @@ -71,7 +73,12 @@ - + +
+ +
{{scope.row.THISQTYSTU}}
+
+
@@ -106,13 +113,14 @@ value: 'SBD', label: 'SBD' }], + loading: false, tableData: [], currentPage: 1, // 当前页码 total: 20, // 总条数 pageSize: 20, // 每页的数据条数 multipleSelection: [], // 需要编辑的属性 - editProp: ['POHFCY_0'] + editProp: ['THISQTYSTU'] }; }, mounted: function () { @@ -153,6 +161,12 @@ cell.querySelector('.item__input').style.display = 'none' cell.querySelector('.item__txt').style.display = 'block' } + if (property == "THISQTYSTU") { + // 库存单位除以系数 + if (row.THISQTYSTU > row.NODLQTY_0) { + row.THISQTYSTU = row.NODLQTY_0; + } + } }, //每页条数改变时触发 选择一页显示多少行 handleSizeChange(val) { @@ -168,6 +182,7 @@ }, search() { var _this = this; + _this.loading = true; $.ajax({ type: "post", dataType: "json", @@ -179,34 +194,62 @@ }, url: "/xwms/XWMSSOH/Search", success: function (json) { - app.tableData = json.Data; + _this.tableData = json.Data; + _this.loading = false; }, error: function (json) { - alert("加载失败"); + _this.$message.error("加载失败"); + _this.loading = false; } }); }, create() { var _this = this; - $.ajax({ - type: "post", - dataType: "json", - data: { - data: _this.multipleSelection - }, - url: "/xwms/XWMSSOH/Create", - success: function (json) { - if (json.Code == 200) { - _this.$message({ - message: "创建成功!" - }); - _this.$refs.multipleTable.clearSelection(); - } - }, - error: function (json) { - alert("加载失败"); + _this.$confirm('注意:您确认要对此单据进行创建领料出库单吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + //加校验 + if (_this.multipleSelection.length == 0) { + _this.$message.error("至少选择一张单据!"); + return; } + if (_this.verify(_this.multipleSelection)) { + _this.$message.error("请选择同一张单据!"); + return; + } + $.ajax({ + type: "post", + dataType: "json", + data: { + data: _this.multipleSelection + }, + url: "/xwms/XWMSSOH/Create", + success: function (json) { + if (json.Code == 200) { + _this.$message("创建成功!"); + _this.$refs.tableData.clearSelection(); + } + else { + _this.$message.error("创建失败!" + json.Msg); + } + }, + error: function (json) { + _this.$message.error("创建失败!"); + } + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消!' + }); }); + }, + verify(array) { + const tmp = new Set(); + array.forEach(x => tmp.add(x.SOHNUM_0)); + return tmp.size > 1 ? true : false; } }, }); diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index dbe8b41..978df7e 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -57,6 +57,9 @@ namespace HHWMS.Web public DbSet ReceiptHeader2s { get; set; } public DbSet ReceiptDetail2s { get; set; } + + public DbSet ShipmentHeader2s { get; set; } + public DbSet ShipmentDetail2s { get; set; } public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs new file mode 100644 index 0000000..e9a6da5 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs @@ -0,0 +1,234 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + /// + /// 出库明细表 + /// + [Table("shipment_detail")] + public partial class ShipmentDetail2 : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + /// + /// 库区 + /// + [Column("zoneCode")] + public string ZoneCode { get; set; } + + /// + /// 货主id + /// + [Column("companyId")] + public int? CompanyId { get; set; } + + /// + /// 货主编码 + /// + [Column("companyCode")] + public string CompanyCode { get; set; } + + /// + /// 上游系统单号 + /// + [Column("sourceCode")] + public string SourceCode { get; set; } + + /// + /// 供应商编码 + /// + [Column("supplierCode")] + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + [Column("supplierName")] + public string SupplierName { get; set; } + + /// + /// 订单号 + /// + [Column("cPoCode")] + public string CPoCode { get; set; } + + /// + /// 工作令号 + /// + [Column("moCode")] + public string MoCode { get; set; } + + /// + /// 上游系统行号 + /// + [Column("sourceLine")] + public string SourceLine { get; set; } + + /// + /// 出库单id + /// + [Column("shipmentId")] + public int? ShipmentId { get; set; } + + /// + /// 出库单编码 + /// + [Column("shipmentCode")] + public string ShipmentCode { get; set; } + + /// + /// 物料Id + /// + [Column("materialId")] + public int? MaterialId { get; set; } + + /// + /// 物料编码 + /// + [Column("materialCode")] + public string MaterialCode { get; set; } + + /// + /// 物料名称 + /// + [Column("materialName")] + public string MaterialName { get; set; } + + /// + /// 批次 + /// + [Column("batch")] + public string Batch { get; set; } + + /// + /// 批号----规格 + /// + [Column("lot")] + public string Lot { get; set; } + + /// + /// SN + /// + [Column("sn")] + public string Sn { get; set; } + + /// + /// 项目号 + /// + [Column("project")] + public string Project { get; set; } + + /// + /// 生产日期 + /// + [Column("manufactureDate")] + public System.DateTime? ManufactureDate { get; set; } + + /// + /// 失效日期 + /// + [Column("expirationDate")] + public System.DateTime? ExpirationDate { get; set; } + + /// + /// 入库日期 + /// + [Column("agingDate")] + public System.DateTime? AgingDate { get; set; } + + /// + /// 库存状态 + /// + [Column("inventoryStatus")] + public string InventoryStatus { get; set; } + + /// + /// 发货数量 + /// + [Column("qty")] + public decimal? Qty { get; set; } + + /// + /// 已出数量 + /// + [Column("qtyCompleted")] + public decimal? QtyCompleted { get; set; } + + /// + /// 单位 + /// + [Column("unit")] + public string Unit { get; set; } + + /// + /// 物料单价 + /// + [Column("price")] + public decimal? Price { get; set; } + + /// + /// 状态 + /// + [Column("status")] + public int? Status { get; set; } + + /// + /// + /// + [Column("deleted")] + public bool? Deleted { get; set; } + + /// + /// + /// + [Column("autoId")] + public int? AutoId { get; set; } + + /// + /// 自定义字段1---宽度 + /// + [Column("userDef1")] + public string UserDef1 { get; set; } + + /// + /// 自定义字段2----片厚 + /// + [Column("userDef2")] + public string UserDef2 { get; set; } + + /// + /// 自定义字段3 + /// + [Column("userDef3")] + public string UserDef3 { get; set; } + + /// + /// 已分配数量 + /// + [Column("qtyDivided")] + public decimal? QtyDivided { get; set; } + + /// + /// 需求地点 + /// + [Column("requireAddr")] + public string RequireAddr { get; set; } + + /// + /// 采购数量 + /// + [Column("purchasQty")] + public decimal? PurchasQty { get; set; } + + /// + /// 采购单位 + /// + [Column("purchasUnits")] + public string PurchasUnits { get; set; } + } +} diff --git a/HHWMS.Web/Models/XWMS/ShipmentHeader.cs b/HHWMS.Web/Models/XWMS/ShipmentHeader.cs new file mode 100644 index 0000000..7219720 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/ShipmentHeader.cs @@ -0,0 +1,156 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + /// + /// 出库单主表 + /// + [Table("shipment_header")] + public class ShipmentHeader2 : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + /// + /// 出库单号 + /// + [Column("code")] + public string Code { get; set; } + + /// + /// 货主id + /// + [Column("companyId")] + public int? CompanyId { get; set; } + + /// + /// 货主code + /// + [Column("companyCode")] + public string CompanyCode { get; set; } + + /// + /// 上游系统单号 + /// + [Column("sourceCode")] + public string SourceCode { get; set; } + + /// + /// 上游平台 + /// + [Column("sourcePlatform")] + public string SourcePlatform { get; set; } + + /// + /// 出库单类型 + /// + [Column("type")] + public string Type { get; set; } + + /// + /// 客户编码 + /// + [Column("shipTo")] + public string ShipTo { get; set; } + + /// + /// 优先级 + /// + [Column("priority")] + public int? Priority { get; set; } + + /// + /// 发货站台 + /// + [Column("station")] + public string Station { get; set; } + + /// + /// 总数量 + /// + [Column("totalQty")] + public decimal? TotalQty { get; set; } + + /// + /// 总行数 + /// + [Column("totalLines")] + public int? TotalLines { get; set; } + + /// + /// 备注 + /// + [Column("remark")] + public string Remark { get; set; } + + /// + /// 上传备注 + /// + [Column("uploadremark")] + public string Uploadremark { get; set; } + + /// + /// 上传时间 + /// + [Column("uploadTime")] + public System.DateTime? UploadTime { get; set; } + + /// + /// 发货预约时间 + /// + [Column("appointmentTime")] + public System.DateTime? AppointmentTime { get; set; } + + /// + /// 单据头状态 + /// + [Column("firstStatus")] + public int? FirstStatus { get; set; } + + /// + /// 单据尾状态 + /// + [Column("lastStatus")] + public int? LastStatus { get; set; } + + /// + /// upload状态 + /// + [Column("uploadStatus")] + public int? UploadStatus { get; set; } + + /// + /// + /// + [Column("enable")] + public bool? Enable { get; set; } + + /// + /// + /// + [Column("deleted")] + public bool? Deleted { get; set; } + + /// + /// 自定义字段1---分解状态 + /// + [Column("userDef1")] + public string UserDef1 { get; set; } + + /// + /// 自定义字段2---领料仓库 + /// + [Column("userDef2")] + public string UserDef2 { get; set; } + + /// + /// 自定义字段3 + /// + [Column("userDef3")] + public string UserDef3 { get; set; } + } +} diff --git a/HHWMS.Web/Models/XWMS/XWMSMFM.cs b/HHWMS.Web/Models/XWMS/XWMSMFM.cs new file mode 100644 index 0000000..d6e9172 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/XWMSMFM.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Text; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + public class XWMSMFM : TopBasePoco + { + public string MFGFCY_0 { get; set; } + public string MFGNUM_0 { get; set; } + public int MFGLIN_0 { get; set; } + public string PJT_0 { get; set; } + public string OPPEXTNUM_0 { get; set; } + public string MFIITMREF_0 { get; set; } + public string MFIITMDES1_0 { get; set; } + public string MFIITMDES2_0 { get; set; } + public decimal EXTQTY_0 { get; set; } + public int BOMSEQ_0 { get; set; } + public string ITMREF_0 { get; set; } + public string ITMDES1_0 { get; set; } + public string ITMDES2_0 { get; set; } + public string ITMDES3_0 { get; set; } + public string YITMDES4_0 { get; set; } + public int STOCOD_0 { get; set; } + public decimal RETEXTCOE_0 { get; set; } + public decimal RETQTY_0 { get; set; } + public decimal USEQTY_0 { get; set; } + public decimal WMD_USEQTY_0 { get; set; } + + /// + /// 本次收量(采购单位) + /// + public decimal THISQTYUOM { get; set; } + + /// + /// 本次收量(库存单位) + /// + public decimal THISQTYSTU { get; set; } + + } +} diff --git a/HHWMS.Web/Models/XWMS/XWMSPTH.cs b/HHWMS.Web/Models/XWMS/XWMSPTH.cs new file mode 100644 index 0000000..7b8d7b3 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/XWMSPTH.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Text; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + public class XWMSPTH : TopBasePoco + { + public string PRHFCY_0 { get; set; } + public DateTime RCPDAT_0 { get; set; } + public string BPSNUM_0 { get; set; } + public string BPSNAM_0 { get; set; } + public string PTHNUM_0 { get; set; } + public int PTDLIN_0 { get; set; } + public string PJT_0 { get; set; } + public string OPPEXTNUM_0 { get; set; } + public string ITMREF_0 { get; set; } + public string POHITMDES1_0 { get; set; } + public string ITMDES1_0 { get; set; } + public string ITMDES2_0 { get; set; } + public string ITMDES3_0 { get; set; } + public string YITMDES4_0 { get; set; } + public string POHNUM_0 { get; set; } + public int POPLIN_0 { get; set; } + public decimal POHQTYSTU_0 { get; set; } + public decimal POHQTYUOM_0 { get; set; } + public decimal QTYUOM_0 { get; set; } + public string UOM_0 { get; set; } + public decimal QTYSTU_0 { get; set; } + public string STU_0 { get; set; } + public decimal RTNQTYSTU_0 { get; set; } + public decimal UOMSTUCOE_0 { get; set; } + /// + /// 默认质量状态 + /// + public string STA_0 { get; set; } + /// + /// 本次收量(采购单位) + /// + public decimal THISQTYUOM { get; set; } + + /// + /// 本次收量(库存单位) + /// + public decimal THISQTYSTU { get; set; } + + } +} diff --git a/HHWMS.Web/Models/XWMS/XWMSSOH.cs b/HHWMS.Web/Models/XWMS/XWMSSOH.cs new file mode 100644 index 0000000..30a22b4 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/XWMSSOH.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Text; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + public class XWMSSOH : TopBasePoco + { + public string SALFCY_0 { get; set; } + public DateTime ORDDAT_0 { get; set; } + public string BPCORD_0 { get; set; } + public string BPCNAM_0 { get; set; } + public string SOHNUM_0 { get; set; } + public int SOPLIN_0 { get; set; } + public string ITMREF_0 { get; set; } + public string ITMDES1_0 { get; set; } + public string ITMDES2_0 { get; set; } + public string ITMDES3_0 { get; set; } + public string YITMDES4_0 { get; set; } + public decimal QTY_0 { get; set; } + public decimal NODLQTY_0 { get; set; } + public string STU_0 { get; set; } + public string BPAADD_0 { get; set; } + + + /// + /// 本次收量(采购单位) + /// + public decimal THISQTYUOM { get; set; } + + /// + /// 本次收量(库存单位) + /// + public decimal THISQTYSTU { get; set; } + + } +}