多数据库保存
This commit is contained in:
1 parent
720cf26a59
commit
612c69fa1a
6 files changed
+393
-12
No files matched your search
@@ -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<string>("POHFCY_0"),
|
||||
ORDDAT_0 = x.Field<DateTime>("ORDDAT_0").ToShortDateString(),
|
||||
@@ -88,10 +86,17 @@ public class XWMSPOHController : BaseController
|
||||
}
|
||||
|
||||
#endregion Search
|
||||
|
||||
[HttpPost]
|
||||
[Public]
|
||||
[FixConnection(CsName = "hangyong")]
|
||||
public ActionResult Create(List<XWMSPOH> data)
|
||||
{
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var receipt = new ReceiptHeader2();
|
||||
receipt.Code = "12345";
|
||||
_unitwork.Add(receipt);
|
||||
|
||||
return JsonMore(null);
|
||||
}
|
||||
}
|
||||
@@ -54,6 +54,9 @@ namespace HHWMS.Web
|
||||
public DbSet<ReportDesign> ReportDesigns { get; set; }
|
||||
public DbSet<Material> Materials { get; set; }
|
||||
public DbSet<MaterialQr> MaterialQrs { get; set; }
|
||||
|
||||
public DbSet<ReceiptHeader2> ReceiptHeader2s { get; set; }
|
||||
public DbSet<ReceiptDetail2> ReceiptDetail2s { get; set; }
|
||||
public override async Task<bool> DataInit(object allModules, bool IsSpa)
|
||||
{
|
||||
var state = await base.DataInit(allModules, IsSpa);
|
||||
|
||||
@@ -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<DataContext2> options) : base(options) { }
|
||||
|
||||
public DbSet<ReceiptHeader2> ReceiptHeader2s { get; set; }
|
||||
public DbSet<ReceiptDetail2> ReceiptDetail2s { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,184 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 入库明细表
|
||||
/// </summary>
|
||||
[Table("receipt_detail")]
|
||||
public partial class ReceiptDetail2 : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
/// <summary>
|
||||
/// 库区
|
||||
/// </summary>
|
||||
[Column("zoneCode")]
|
||||
public string ZoneCode { get; set; }
|
||||
/// <summary>
|
||||
/// 货主id
|
||||
/// </summary>
|
||||
[Column("companyId")]
|
||||
public int? CompanyId { get; set; }
|
||||
/// <summary>
|
||||
/// 货主编码
|
||||
/// </summary>
|
||||
[Column("companyCode")]
|
||||
public string CompanyCode { get; set; }
|
||||
/// <summary>
|
||||
/// 上游系统单号
|
||||
/// </summary>
|
||||
[Column("sourceCode")]
|
||||
public string SourceCode { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商编码
|
||||
/// </summary>
|
||||
[Column("supplierCode")]
|
||||
public string SupplierCode { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商名称
|
||||
/// </summary>
|
||||
[Column("supplierName")]
|
||||
public string SupplierName { get; set; }
|
||||
/// <summary>
|
||||
/// 订单号
|
||||
/// </summary>
|
||||
[Column("cPoCode")]
|
||||
public string CPoCode { get; set; }
|
||||
/// <summary>
|
||||
/// 工作令号
|
||||
/// </summary>
|
||||
[Column("moCode")]
|
||||
public string MoCode { get; set; }
|
||||
/// <summary>
|
||||
/// 上游系统行号
|
||||
/// </summary>
|
||||
[Column("sourceLine")]
|
||||
public string SourceLine { get; set; }
|
||||
/// <summary>
|
||||
/// 入库单id
|
||||
/// </summary>
|
||||
[Column("receiptId")]
|
||||
public int? ReceiptId { get; set; }
|
||||
/// <summary>
|
||||
/// 入库单编码
|
||||
/// </summary>
|
||||
[Column("receiptCode")]
|
||||
public string ReceiptCode { get; set; }
|
||||
/// <summary>
|
||||
/// 物料Id
|
||||
/// </summary>
|
||||
[Column("materialId")]
|
||||
public int? MaterialId { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
[Column("materialCode")]
|
||||
public string MaterialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 物料名称
|
||||
/// </summary>
|
||||
[Column("materialName")]
|
||||
public string MaterialName { get; set; }
|
||||
/// <summary>
|
||||
/// 批次
|
||||
/// </summary>
|
||||
[Column("batch")]
|
||||
public string Batch { get; set; }
|
||||
/// <summary>
|
||||
/// 批号---规格
|
||||
/// </summary>
|
||||
[Column("lot")]
|
||||
public string Lot { get; set; }
|
||||
/// <summary>
|
||||
/// SN:铁损值
|
||||
/// </summary>
|
||||
[Column("sn")]
|
||||
public string Sn { get; set; }
|
||||
/// <summary>
|
||||
/// 项目号:二维码
|
||||
/// </summary>
|
||||
[Column("project")]
|
||||
public string Project { get; set; }
|
||||
/// <summary>
|
||||
/// 生产日期
|
||||
/// </summary>
|
||||
[Column("manufactureDate")]
|
||||
public System.DateTime? ManufactureDate { get; set; }
|
||||
/// <summary>
|
||||
/// 失效日期
|
||||
/// </summary>
|
||||
[Column("expirationDate")]
|
||||
public System.DateTime? ExpirationDate { get; set; }
|
||||
/// <summary>
|
||||
/// 物料状态:0:存货编码;1:批次;2:序列号
|
||||
/// </summary>
|
||||
[Column("inventoryStatus")]
|
||||
public string InventoryStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 系统数量
|
||||
/// </summary>
|
||||
[Column("qty")]
|
||||
public decimal? Qty { get; set; }
|
||||
/// <summary>
|
||||
/// 收货数量
|
||||
/// </summary>
|
||||
[Column("qtyCompleted")]
|
||||
public decimal? QtyCompleted { get; set; }
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
[Column("unit")]
|
||||
public string Unit { get; set; }
|
||||
/// <summary>
|
||||
/// 单价
|
||||
/// </summary>
|
||||
[Column("price")]
|
||||
public decimal? Price { get; set; }
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
[Column("status")]
|
||||
public int? Status { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
[Column("deleted")]
|
||||
public bool? Deleted { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
[Column("autoId")]
|
||||
public int? AutoId { get; set; }
|
||||
/// <summary>
|
||||
/// 宽度
|
||||
/// </summary>
|
||||
[Column("userDef1")]
|
||||
public string UserDef1 { get; set; }
|
||||
/// <summary>
|
||||
/// 片厚
|
||||
/// </summary>
|
||||
[Column("userDef2")]
|
||||
public string UserDef2 { get; set; }
|
||||
/// <summary>
|
||||
/// 直径
|
||||
/// </summary>
|
||||
[Column("userDef3")]
|
||||
public string UserDef3 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 站台
|
||||
/// </summary>
|
||||
[Column("station")]
|
||||
public string Station { get; set; }
|
||||
/// <summary>
|
||||
/// 已分配数量
|
||||
/// </summary>
|
||||
[Column("qtyDivided")]
|
||||
public decimal? QtyDivided { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,149 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 入库单主表
|
||||
/// </summary>
|
||||
[Table("receipt_header")]
|
||||
public class ReceiptHeader2 : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 入库单号
|
||||
/// </summary>
|
||||
[Column("code")]
|
||||
public string Code { get; set; }
|
||||
/// <summary>
|
||||
/// 货主id
|
||||
/// </summary>
|
||||
[Column("companyId")]
|
||||
public int? CompanyId { get; set; }
|
||||
/// <summary>
|
||||
/// 货主编码
|
||||
/// </summary>
|
||||
[Column("companyCode")]
|
||||
public string CompanyCode { get; set; }
|
||||
/// <summary>
|
||||
/// 入库类型
|
||||
/// </summary>
|
||||
[Column("type")]
|
||||
public string Type { get; set; }
|
||||
/// <summary>
|
||||
/// 上游系统单号
|
||||
/// </summary>
|
||||
[Column("sourceCode")]
|
||||
public string SourceCode { get; set; }
|
||||
/// <summary>
|
||||
/// 上游平台:单据ID
|
||||
/// </summary>
|
||||
[Column("sourcePlatform")]
|
||||
public string SourcePlatform { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商id
|
||||
/// </summary>
|
||||
[Column("supplierId")]
|
||||
public int? SupplierId { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商编码
|
||||
/// </summary>
|
||||
[Column("supplierCode")]
|
||||
public string SupplierCode { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商名称
|
||||
/// </summary>
|
||||
[Column("supplierName")]
|
||||
public string SupplierName { get; set; }
|
||||
/// <summary>
|
||||
/// 总数量
|
||||
/// </summary>
|
||||
[Column("totalQty")]
|
||||
public decimal? TotalQty { get; set; }
|
||||
/// <summary>
|
||||
/// 总行数
|
||||
/// </summary>
|
||||
[Column("totalLines")]
|
||||
public int? TotalLines { get; set; }
|
||||
/// <summary>
|
||||
/// 扫码绑定标记
|
||||
/// </summary>
|
||||
[Column("freeScan")]
|
||||
public int? FreeScan { get; set; }
|
||||
/// <summary>
|
||||
/// 入库单备注
|
||||
/// </summary>
|
||||
[Column("remark")]
|
||||
public string Remark { get; set; }
|
||||
/// <summary>
|
||||
/// upload状态
|
||||
/// </summary>
|
||||
[Column("uploadStatus")]
|
||||
public int? UploadStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 上传备注
|
||||
/// </summary>
|
||||
[Column("uploadremark")]
|
||||
public string Uploadremark { get; set; }
|
||||
/// <summary>
|
||||
/// 上传时间
|
||||
/// </summary>
|
||||
[Column("uploadTime")]
|
||||
public System.DateTime? UploadTime { get; set; }
|
||||
/// <summary>
|
||||
/// 入库预约时间
|
||||
/// </summary>
|
||||
[Column("appointmentTime")]
|
||||
public System.DateTime? AppointmentTime { get; set; }
|
||||
/// <summary>
|
||||
/// 单据头状态
|
||||
/// </summary>
|
||||
[Column("firstStatus")]
|
||||
public int? FirstStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 单据尾状态
|
||||
/// </summary>
|
||||
[Column("lastStatus")]
|
||||
public int? LastStatus { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
[Column("enable")]
|
||||
public bool? Enable { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
[Column("deleted")]
|
||||
public bool? Deleted { get; set; }
|
||||
/// <summary>
|
||||
/// 扫描标识
|
||||
/// </summary>
|
||||
[Column("scanid")]
|
||||
public string Scanid { get; set; }
|
||||
/// <summary>
|
||||
/// 自定义字段1
|
||||
/// </summary>
|
||||
[Column("userDef1")]
|
||||
public string UserDef1 { get; set; }
|
||||
/// <summary>
|
||||
/// 自定义字段2
|
||||
/// </summary>
|
||||
[Column("userDef2")]
|
||||
public string UserDef2 { get; set; }
|
||||
/// <summary>
|
||||
/// 自定义字段3
|
||||
/// </summary>
|
||||
[Column("userDef3")]
|
||||
public string UserDef3 { get; set; }
|
||||
/// <summary>
|
||||
/// 站台
|
||||
/// </summary>
|
||||
[Column("station")]
|
||||
public string Station { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -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",
|
||||
|
||||
Reference in new issue
Block a user