diff --git a/WMS-BS/NFine.Application/WMS/ICSRCVIQCsApp.cs b/WMS-BS/NFine.Application/WMS/ICSRCVIQCsApp.cs index 8e7039f..c8e3620 100644 --- a/WMS-BS/NFine.Application/WMS/ICSRCVIQCsApp.cs +++ b/WMS-BS/NFine.Application/WMS/ICSRCVIQCsApp.cs @@ -660,5 +660,68 @@ namespace NFine.Application.WMS return msg; } + + + public DataTable GetInventoryInspection(ref Pagination jqgridparam, string InvCode) + { + string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; + DataTable dt = new DataTable(); + List parameter = new List(); + string sql = @"select c.ID,a.GroupCode,a.GroupName,c.InspectionID,b.ListCode, b.ListName,b.Unit,b.SetValueMax,b.SetValueMin,c.SetValue,c.Result +from ICSInventoryInspectionGroup a +left join ICSInventoryInspectionList b on a.ID=b.InvGroupID and a.WorkPoint=b.WorkPoint +left join ICSInspectionDetail c on b.ListCode=c.ListCode and b.ListName=c.ListName and b.WorkPoint=c.WorkPoint + where a.InvCode='{0}' and b.Enable='1' and a.WorkPoint='{1}' "; + sql = string.Format(sql, InvCode, WorkPoint); + return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam); + } + + public string SaveICSInspectionDetail(string ICSMTDOC, string InvCode) + { + string msg = ""; + try + { + string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; + string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName; + string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; + + string sql = string.Empty; + JArray res = (JArray)JsonConvert.DeserializeObject(ICSMTDOC); + foreach (var item in res) + { + JObject jo = (JObject)item; + if (jo["ID"].ToString()==""|| jo["ID"].ToString()==null) + { + sql += @" + INSERT INTO dbo.ICSInspectionDetail + ( ID ,InspectionID ,ListCode ,ListName , + Unit ,SetValueMax ,SetValueMin ,SetValue ,Result, MUSER ,MUSERName ,MTIME, WorkPoint,GroupCode,GroupName) + values(newid(),'{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}',getdate(),'{10}','{11}','{12}')"; + sql = string.Format(sql, jo["InspectionID"].ToString(), jo["ListCode"].ToString(), jo["ListName"].ToString(), jo["Unit"].ToString(), jo["SetValueMax"].ToString(), jo["SetValueMin"].ToString(), jo["SetValue"].ToString(), jo["Result"].ToString(), MUSER, MUSERNAME, WorkPoint, jo["GroupCode"].ToString(), jo["GroupName"].ToString()); + } + else + { + sql += @" update ICSInspectionDetail set InspectionID='{0}',ListCode='{1}',ListName='{2}', Unit='{3}' ,SetValueMax='{4}' ,SetValueMin='{5}' ,SetValue='{6}' ,Result='{7}', MUSER='{8}' ,MUSERName='{9}' ,MTIME=getdate(), WorkPoint='{10}', GroupCode='{11}', GroupName='{12}' where ID='{13}'"; + sql = string.Format(sql, jo["InspectionID"].ToString(), jo["ListCode"].ToString(), jo["ListName"].ToString(), jo["Unit"].ToString(), jo["SetValueMax"].ToString(), jo["SetValueMin"].ToString(), jo["SetValue"].ToString(), jo["Result"].ToString(), MUSER, MUSERNAME, WorkPoint, jo["GroupCode"].ToString(), jo["GroupName"].ToString(), jo["ID"].ToString()); + } + } + + if (SqlHelper.CmdExecuteNonQueryLi(sql) > 0) + { + + } + else + { + msg = "绑定失败"; + } + } + catch (Exception ex) + { + msg = ex.Message; + } + + return msg; + } + } } diff --git a/WMS-BS/NFine.Application/WMS/PrintApp.cs b/WMS-BS/NFine.Application/WMS/PrintApp.cs index c2cda95..3984011 100644 --- a/WMS-BS/NFine.Application/WMS/PrintApp.cs +++ b/WMS-BS/NFine.Application/WMS/PrintApp.cs @@ -74,12 +74,13 @@ order by cast(EATTRIBUTE1 as int)"; { try { + object MultipleLanguageSetting = GetMultipleLanguageSetting(); string content = ""; - string sql = string.Format(@"select CnValue from Sys_Language where Code='{0}'", Code); + string sql = string.Format(@"select {1} from Sys_Language where Code='{0}'", Code, MultipleLanguageSetting); DataTable dt = SqlHelper.GetDataTableBySql(sql); if (dt != null && dt.Rows.Count > 0) { - content = dt.Rows[0]["CnValue"].ToString().ToUpper(); + content = dt.Rows[0]["" + MultipleLanguageSetting + ""].ToString().ToUpper(); } else { @@ -92,5 +93,21 @@ order by cast(EATTRIBUTE1 as int)"; throw new Exception(ex.Message.ToString()); } } + + public object GetMultipleLanguageSetting() + { + try + { + string sql = string.Format(@"select top 1 b.F_Define1 + from Sys_SRM_Items a left join Sys_SRM_ItemsDetail b on a.F_Id=b.F_ItemId + where a.F_EnCode='LGG0001' and b.F_EnabledMark='1' order by b.F_ItemCode"); + object MultipleLanguageSetting = SqlHelper.ExecuteScalar(sql); + return MultipleLanguageSetting; + } + catch (Exception ex) + { + throw new Exception(ex.Message.ToString()); + } + } } } diff --git a/WMS-BS/NFine.Web/Areas/WMS/Controllers/ICSRCVIQCsController.cs b/WMS-BS/NFine.Web/Areas/WMS/Controllers/ICSRCVIQCsController.cs index 47e53a9..8f5e734 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Controllers/ICSRCVIQCsController.cs +++ b/WMS-BS/NFine.Web/Areas/WMS/Controllers/ICSRCVIQCsController.cs @@ -32,7 +32,11 @@ namespace NFine.Web.Areas.WMS.Controllers { return View(); } - + public ActionResult ICSInspectionDetail() + { + return View(); + } + //采购 [HttpGet] @@ -178,7 +182,33 @@ namespace NFine.Web.Areas.WMS.Controllers } } + [HttpGet] + public ActionResult GetInventoryInspection(Pagination pagination, string InvCode) + { + DataTable ListData = App.GetInventoryInspection(ref pagination, InvCode); + var JsonData = new + { + total = pagination.total, + page = pagination.page, + records = pagination.records, + rows = ListData, + }; + return Content(JsonData.ToJson()); + } - + [HttpPost] + [HandlerAjaxOnly] + public ActionResult SaveICSInspectionDetail(string ICSMTDOC, string InvCode) + { + string msg = App.SaveICSInspectionDetail(ICSMTDOC, InvCode); + if (!string.IsNullOrEmpty(msg)) + { + return Error(msg); + } + else + { + return Success("保存成功！"); + } + } } } \ No newline at end of file diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSInspectionDetail.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSInspectionDetail.cshtml new file mode 100644 index 0000000..6faff8c --- /dev/null +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSInspectionDetail.cshtml @@ -0,0 +1,115 @@ +@{ + ViewBag.Title = "Index"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + + +
+ +
+
+ @*
*@ +
+ + +
+ diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSRCVIQCs.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSRCVIQCs.cshtml index a242fa7..7e6c3c3 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSRCVIQCs.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/ICSRCVIQCs/ICSRCVIQCs.cshtml @@ -57,12 +57,15 @@ if (Type == '1') { var collast = { label: "主键", name: "ID", hidden: true, key: true }; cols.push(collast); + var collast = { label: 'ID', name: 'ID', hidden: true }; cols.push(collast); var collast = { label: '到货ID', name: 'DHID', hidden: true }; cols.push(collast); var collast = { label: '检验ID', name: 'JYID', hidden: true }; cols.push(collast); + var collast = { label: '操作', width: 120, align: 'left', formatter: btnLook }; + cols.push(collast); var collast = { label: '到货单号', name: 'DNCode', width: 120, align: 'left' }; cols.push(collast); var collast = { label: '送货单号', name: 'ASNCode', width: 120, align: 'left' }; @@ -137,6 +140,8 @@ cols.push(collast); var collast = { label: '检验ID', name: 'JYID', hidden: true }; cols.push(collast); + var collast = { label: '操作', width: 120, align: 'left', formatter: btnLook }; + cols.push(collast); var collast = { label: '委外到货单号', name: 'DNCode', width: 120, align: 'left' }; cols.push(collast); var collast = { label: '委外送货单号', name: 'OASNCode', width: 120, align: 'left' }; @@ -211,6 +216,8 @@ cols.push(collast); var collast = { label: '检验ID', name: 'JYID', hidden: true }; cols.push(collast); + var collast = { label: '操作', width: 120, align: 'left', formatter: btnLook }; + cols.push(collast); var collast = { label: '工单单号', name: 'DNCode', width: 120, align: 'left' }; cols.push(collast); var collast = { label: '条码', name: 'LotNo', width: 120, align: 'left' }; @@ -778,6 +785,28 @@ }); } + + function btnLook(cellvalue, options, rowObject) { + return cellvalue = "查看"; + } + function UpLoadClick(InvCode, JYID) { + debugger; + if (JYID=='') { + $.modalAlertNew("WMS00104"); + return; + } + $.modalOpen({ + id: "CheckInfo", + title: "查看信息", + url: "/WMS/ICSRCVIQCs/ICSInspectionDetail?InvCode=" + encodeURI(encodeURI(InvCode)) + "&JYID=" + encodeURI(encodeURI(JYID)) + "&" + Math.random(), + width: "1000px", + height: "400px", + callBack: function (iframeId) { + top.frames[iframeId].submitForm(); + } + }); + } + //退回 function btnSendBack() { debugger; diff --git a/WMS-BS/NFine.Web/NFine.Web.csproj b/WMS-BS/NFine.Web/NFine.Web.csproj index d8ccd6b..e98939c 100644 --- a/WMS-BS/NFine.Web/NFine.Web.csproj +++ b/WMS-BS/NFine.Web/NFine.Web.csproj @@ -586,6 +586,7 @@ +