diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs new file mode 100644 index 0000000..48d051e --- /dev/null +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using HHWMS.Web.Models; +using MESTOWMSService; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; +using ServiceReference1; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers; + +[Area("xwms")] +[ActionDescription("采购订单")] +public class XWMSPOHController : BaseController +{ + private readonly IUnitWork _unitWork; + + public XWMSPOHController(IUnitWork unitWork) + { + _unitWork = unitWork; + } + + #region Search + + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + return PartialView("Index"); + } + + [ActionDescription("Sys.Search")] + public ActionResult Search() + { + var data = OracleHelper.GetDataSet("select * from QREQ3.XWMSPOH where rownum <=30").Tables[0]; + var list = data.AsEnumerable().Select + (x => new + { + POHFCY_0 = x.Field("POHFCY_0"), + ORDDAT_0 = x.Field("ORDDAT_0").ToShortDateString(), + BPSNUM_0 = x.Field("BPSNUM_0"), + BPRNAM_0 = x.Field("BPRNAM_0"), + POHNUM_0 = x.Field("POHNUM_0"), + POPLIN_0 = x.Field("POPLIN_0"), + PJT_0 = x.Field("PJT_0"), + PJTNAM_0 = x.Field("PJTNAM_0"), + ITMREF_0 = x.Field("ITMREF_0"), + POHITMDES1_0 = x.Field("POHITMDES1_0"), + ITMDES1_0 = x.Field("ITMDES1_0"), + ITMDES2_0 = x.Field("ITMDES2_0"), + ITMDES3_0 = x.Field("ITMDES3_0"), + YITMDES4_0 = x.Field("YITMDES4_0"), + QTYUOM_0 = x.Field("QTYUOM_0"), + UOM_0 = x.Field("UOM_0"), + QTYSTU_0 = x.Field("QTYSTU_0"), + STU_0 = x.Field("STU_0"), + NRCPQTYPUU_0 = x.Field("NRCPQTYPUU_0"), + NRCPQTYSTU_0 = x.Field("NRCPQTYSTU_0"), + UOMSTUCOE_0 = x.Field("UOMSTUCOE_0"), + STA_0 = x.Field("STA_0"), + } + ).ToList(); + return JsonMore(list); + } + + #endregion Search +} diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml new file mode 100644 index 0000000..05f9695 --- /dev/null +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml @@ -0,0 +1,117 @@ + + + + + + +
+ +
{{scope.row.POHFCY_0}}
+
+
+ + @* *@ + + + + + + + + + + + + + + + + + + + + +
+
+ + + diff --git a/HHWMS.Web/Models/XWMS/XWMSPOH.cs b/HHWMS.Web/Models/XWMS/XWMSPOH.cs new file mode 100644 index 0000000..0bfe8dc --- /dev/null +++ b/HHWMS.Web/Models/XWMS/XWMSPOH.cs @@ -0,0 +1,122 @@ +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 XWMSPOH : TopBasePoco + { + /// + /// 地点 + /// + public string POHFCY_0 { get; set; } + + /// + /// 订单日期 + /// + public DateOnly ORDDAT_0 { get; set; } + + /// + /// 供应商 + /// + public string BPSNUM_0 { get; set; } + + /// + /// 供应商名称 + /// + public string BPRNAM_0 { get; set; } + + /// + /// 订单号 + /// + public string POHNUM_0 { get; set; } + + /// + /// 行号 + /// + public Int64 POPLIN_0 { get; set; } + + /// + /// 项目号 + /// + public string PJT_0 { get; set; } + + /// + /// 项目名称 + /// + public string PJTNAM_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 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 NRCPQTYPUU_0 { get; set; } + + /// + /// 未收库存数量 + /// + public decimal NRCPQTYSTU_0 { get; set; } + + /// + /// 计量单位/存货单位系数 + /// + public decimal UOMSTUCOE_0 { get; set; } + + /// + /// 默认质量状态 + /// + public string STA_0 { get; set; } + } +} diff --git a/HHWMS.Web/Resposity/Helper/OracleHelper.cs b/HHWMS.Web/Resposity/Helper/OracleHelper.cs new file mode 100644 index 0000000..d66d021 --- /dev/null +++ b/HHWMS.Web/Resposity/Helper/OracleHelper.cs @@ -0,0 +1,68 @@ +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace HHWMS.Web +{ + public class OracleHelper + { + public static OracleCommand cmd = null; + public static OracleConnection conn = null; + + //user id=guest;password=guest123; data source=202.101.164.132:15555/SAGEX3; + public static string connstr = "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=202.101.164.132)(PORT=15555))(CONNECT_DATA=(SERVICE_NAME=SAGEX3)));User Id=guest;Password=guest123"; + + public static OracleConnection init() + { + try + { + conn = new OracleConnection(connstr); + if (conn.State != ConnectionState.Open) + { + conn.Open(); + } + } + catch (Exception e) + { + throw new Exception(e.Message.ToString()); + } + return conn; + } + + public static DataSet GetDataSet(string sqlstr) + { + DataSet set = new DataSet(); + try + { + init(); + OracleDataAdapter adp = new OracleDataAdapter(sqlstr, conn); + adp.Fill(set); + conn.Close(); + } + catch (Exception e) + { + throw new Exception(e.Message.ToString()); + } + return set; + } + + public static int ExecuteNonQuery(string cmdText) + { + int count; + try + { + init(); + cmd = new OracleCommand(cmdText, conn); + count = cmd.ExecuteNonQuery(); + conn.Close(); + } + catch (Exception ex) + { + throw new Exception(ex.Message.ToString()); + } + return count; + } + } +} diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 170fe01..e36fcd1 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -22,17 +22,18 @@ }, "Connections": [ - //{ - // "Key": "default", - // "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", - // "DBType": "mysql" - //} { "Key": "default", - "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", + "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", - "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - } + "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": "default", // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True", diff --git a/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs b/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs index bb2271b..27a0ae1 100644 --- a/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs +++ b/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs @@ -388,7 +388,7 @@ namespace WalkingTec.Mvvm.Mvc.Filters log.IP = context.HttpContext.GetRemoteIpAddress(); log.Remark = context.Exception?.ToString() ?? string.Empty; log.Request = requestMsg; - if (log.ModuleName.StartsWith("HHWMS")) + if (log.ModuleName.StartsWith("HHWMS") && !log.ActionUrl.Contains("xwms")) { dynamic reMsg = context.Result as dynamic; log.Result = Newtonsoft.Json.JsonConvert.SerializeObject(reMsg?.Value);