diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index a712fe6..a8f2855 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -33,9 +33,27 @@ public class XWMSPOHController : BaseController } [ActionDescription("Sys.Search")] - public ActionResult Search() + public ActionResult Search(string address, string billno, string supply, string materialcode) { - var data = OracleHelper.GetDataSet("select * from QREQ3.XWMSPOH where rownum <=30").Tables[0]; + var sql = @"select * from QREQ3.XWMSPOH where 1=1"; + if (!string.IsNullOrEmpty(address)) + { + sql += $" and POHFCY_0 = '{address}'"; + } + if (!string.IsNullOrEmpty(billno)) + { + sql += $" and POHNUM_0 like '%{billno}%'"; + } + if (!string.IsNullOrEmpty(supply)) + { + sql += $" and BPRNAM_0 like '%{supply}%'"; + } + if (!string.IsNullOrEmpty(materialcode)) + { + sql += $"and ITMREF_0 like '%{materialcode}%'"; + } + sql += " and rownum <=30"; + var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select (x => new { @@ -69,4 +87,10 @@ public class XWMSPOHController : BaseController } #endregion Search + [HttpPost] + [Public] + public ActionResult Create(List data) + { + return JsonMore(null); + } } diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml index 578710a..311ea34 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml @@ -1,93 +1,90 @@ - - - - - - -
- -
{{scope.row.POHFCY_0}}
-
-
- - @* *@ - - - - - - - - - - - - - - - - - - - - - - +@*
+ + +
+ +
{{scope.row.date}}
+
+
+ +
+ +
{{scope.row.name}}
+
+
+ +
+ + + + +
{{foodLabel(scope.row.food)}}
+
+
- +
+ + *@ + + + + + + 创建单据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @* *@ + + + + + + + + + + + + + + + + + +
+ +
{{scope.row.THISQTYUOM}}
+
+
+ +
+ +
{{scope.row.THISQTYSTU}}
+
+
+ +
+ + + + +
{{foodLabel(scope.row.STA_0)}}
+
+
+ + + + +
+
+ + diff --git a/HHWMS.Web/Models/XWMS/XWMSPOH.cs b/HHWMS.Web/Models/XWMS/XWMSPOH.cs index 0bfe8dc..f0f4b71 100644 --- a/HHWMS.Web/Models/XWMS/XWMSPOH.cs +++ b/HHWMS.Web/Models/XWMS/XWMSPOH.cs @@ -118,5 +118,16 @@ namespace HHWMS.Web.Models /// 默认质量状态 /// public string STA_0 { get; set; } + + /// + /// 本次收量(采购单位) + /// + public decimal THISQTYUOM { get; set; } + + /// + /// 本次收量(库存单位) + /// + public decimal THISQTYSTU { get; set; } + } }