From 612c69fa1a99cab1f1e80934d81dfb20c0ca72c4 Mon Sep 17 00:00:00 2001 From: zgf Date: Fri, 22 Dec 2023 15:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XWMS/Controllers/XWMSPOHController.cs | 17 +- HHWMS.Web/DataContext.cs | 3 + HHWMS.Web/DataContext2.cs | 40 ++++ HHWMS.Web/Models/XWMS/ReceiptDetail.cs | 184 ++++++++++++++++++ HHWMS.Web/Models/XWMS/ReceiptHeader.cs | 149 ++++++++++++++ HHWMS.Web/appsettings.json | 12 +- 6 files changed, 393 insertions(+), 12 deletions(-) create mode 100644 HHWMS.Web/DataContext2.cs create mode 100644 HHWMS.Web/Models/XWMS/ReceiptDetail.cs create mode 100644 HHWMS.Web/Models/XWMS/ReceiptHeader.cs diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index efb9581..a1b5e4e 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -15,13 +15,11 @@ namespace HHWMS.Web.Controllers; [Area("xwms")] [ActionDescription("采购订单")] +[Public] public class XWMSPOHController : BaseController { - private readonly IUnitWork _unitWork; - - public XWMSPOHController(IUnitWork unitWork) + public XWMSPOHController() { - _unitWork = unitWork; } #region Search @@ -55,7 +53,7 @@ public class XWMSPOHController : BaseController var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select - (x => new + (x => new { POHFCY_0 = x.Field("POHFCY_0"), ORDDAT_0 = x.Field("ORDDAT_0").ToShortDateString(), @@ -88,10 +86,17 @@ public class XWMSPOHController : BaseController } #endregion Search + [HttpPost] - [Public] + [FixConnection(CsName = "hangyong")] public ActionResult Create(List data) { + var _unitwork = new UnitWork(Wtm); + + var receipt = new ReceiptHeader2(); + receipt.Code = "12345"; + _unitwork.Add(receipt); + return JsonMore(null); } } diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index af4365c..dbe8b41 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -54,6 +54,9 @@ namespace HHWMS.Web public DbSet ReportDesigns { get; set; } public DbSet Materials { get; set; } public DbSet MaterialQrs { get; set; } + + public DbSet ReceiptHeader2s { get; set; } + public DbSet ReceiptDetail2s { get; set; } public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/DataContext2.cs b/HHWMS.Web/DataContext2.cs new file mode 100644 index 0000000..39b940e --- /dev/null +++ b/HHWMS.Web/DataContext2.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; + +namespace HHWMS.Web +{ + public class DataContext2 : FrameworkContext + { + public DataContext2(CS cs) + : base(cs) + { + } + + public DataContext2(string cs, DBTypeEnum dbtype) + : base(cs, dbtype) + { + } + + public DataContext2(string cs, DBTypeEnum dbtype, string version = null) + : base(cs, dbtype, version) + { + } + + public DataContext2(DbContextOptions options) : base(options) { } + + public DbSet ReceiptHeader2s { get; set; } + public DbSet ReceiptDetail2s { get; set; } + + } + + +} diff --git a/HHWMS.Web/Models/XWMS/ReceiptDetail.cs b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs new file mode 100644 index 0000000..953c91c --- /dev/null +++ b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs @@ -0,0 +1,184 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + /// + /// 入库明细表 + /// + [Table("receipt_detail")] + public partial class ReceiptDetail2 : 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("receiptId")] + public int? ReceiptId { get; set; } + /// + /// 入库单编码 + /// + [Column("receiptCode")] + public string ReceiptCode { 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; } + /// + /// 物料状态:0:存货编码;1:批次;2:序列号 + /// + [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; } + /// + /// 宽度 + /// + [Column("userDef1")] + public string UserDef1 { get; set; } + /// + /// 片厚 + /// + [Column("userDef2")] + public string UserDef2 { get; set; } + /// + /// 直径 + /// + [Column("userDef3")] + public string UserDef3 { get; set; } + + /// + /// 站台 + /// + [Column("station")] + public string Station { get; set; } + /// + /// 已分配数量 + /// + [Column("qtyDivided")] + public decimal? QtyDivided { get; set; } + } +} diff --git a/HHWMS.Web/Models/XWMS/ReceiptHeader.cs b/HHWMS.Web/Models/XWMS/ReceiptHeader.cs new file mode 100644 index 0000000..a51974c --- /dev/null +++ b/HHWMS.Web/Models/XWMS/ReceiptHeader.cs @@ -0,0 +1,149 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + /// + /// 入库单主表 + /// + [Table("receipt_header")] + public class ReceiptHeader2 : 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; } + /// + /// 货主编码 + /// + [Column("companyCode")] + public string CompanyCode { get; set; } + /// + /// 入库类型 + /// + [Column("type")] + public string Type { get; set; } + /// + /// 上游系统单号 + /// + [Column("sourceCode")] + public string SourceCode { get; set; } + /// + /// 上游平台:单据ID + /// + [Column("sourcePlatform")] + public string SourcePlatform { get; set; } + /// + /// 供应商id + /// + [Column("supplierId")] + public int? SupplierId { get; set; } + /// + /// 供应商编码 + /// + [Column("supplierCode")] + public string SupplierCode { get; set; } + /// + /// 供应商名称 + /// + [Column("supplierName")] + public string SupplierName { get; set; } + /// + /// 总数量 + /// + [Column("totalQty")] + public decimal? TotalQty { get; set; } + /// + /// 总行数 + /// + [Column("totalLines")] + public int? TotalLines { get; set; } + /// + /// 扫码绑定标记 + /// + [Column("freeScan")] + public int? FreeScan { get; set; } + /// + /// 入库单备注 + /// + [Column("remark")] + public string Remark { get; set; } + /// + /// upload状态 + /// + [Column("uploadStatus")] + public int? UploadStatus { 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; } + /// + /// + /// + [Column("enable")] + public bool? Enable { get; set; } + /// + /// + /// + [Column("deleted")] + public bool? Deleted { get; set; } + /// + /// 扫描标识 + /// + [Column("scanid")] + public string Scanid { 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("station")] + public string Station { get; set; } + } +} diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index e36fcd1..5afc6b0 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -28,12 +28,12 @@ "DbContext": "DataContext", "DBType": "mysql" }, - //{ - // "Key": "oracle", - // "Value": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=202.101.164.132)(PORT=15555))(CONNECT_DATA=(SERVICE_NAME=SAGEX3)));User Id=guest;Password=guest123;", - // "DbContext": "XWMSContext", - // "DBType": "oracle" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - //} + { + "Key": "hangyong", + "Value": "Server=127.0.0.1;Port=3306;Database=hangyongwms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "DbContext": "DataContext", + "DBType": "mysql" + } //{ // "Key": "default", // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",