diff --git a/SRM/NFine.Application/SRM/CAManageApp.cs b/SRM/NFine.Application/SRM/CAManageApp.cs index 077482c..b3bb683 100644 --- a/SRM/NFine.Application/SRM/CAManageApp.cs +++ b/SRM/NFine.Application/SRM/CAManageApp.cs @@ -451,7 +451,7 @@ d.UnitPrice AS price, FROM (SELECT id,EATTRIBUTE1, DocNo,DocLineNo,POCode,PORow,SUM(CAST(Qty AS DECIMAL(18,2))) AS Qty,WorkPoint FROM ICSCANewDetail GROUP BY DocNo,DocLineNo,POCode,PORow,WorkPoint,id,EATTRIBUTE1) a INNER JOIN ICSCANew b ON a.DocNo = b.DocNo AND a.WorkPoint = b.WorkPoint --LEFT JOIN Viewrd01 e ON e.cpoid=a.poCode AND e.ivouchrowno=a.porow and e.AutoID=a.EATTRIBUTE1 - LEFT JOIN " + Views + @" e ON a.EATTRIBUTE1=e.AutoID + LEFT JOIN Viewrd01 e ON a.EATTRIBUTE1=e.AutoID LEFT JOIN dbo.ICSPurchaseOrder c ON a.pocode=c.pocode AND a.porow=c.Sequence AND a.WorkPoint = c.WorkPoint LEFT JOIN ICSINVENTORY d ON c.InvCode=d.InvCode AND a.WorkPoint = d.WorkPoint WHERE 1=1 AND a.DocNo = '{0}' "; diff --git a/SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml b/SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml index 7812a5e..2f7cb47 100644 --- a/SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml +++ b/SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml @@ -20,7 +20,16 @@ $("#MTIME").attr('value', currentDate); InitControl();//加载供应商 - InitControl1(); + InitControl1();//加载站点 + // ===== 新增:设置站点默认值为【海格】 ===== + var defaultWorkPointName = "海格"; + // 匹配下拉框中text为"海格"的option + var $defaultOption = $("#sel_WorkPoint option:contains(" + defaultWorkPointName + ")"); + if ($defaultOption.length > 0) { + $("#sel_WorkPoint").val($defaultOption.val()).trigger("change"); + } + // ======================================== + if (DocNo != null && DocNo != "") { $("#DocNo").val(DocNo); $("#SupplierCode").val([SupplierCode]).trigger("change"); @@ -35,6 +44,7 @@ } else { $("#Tax").val("13"); + var Tax = $("#Tax").val(); var RoleEnCode = '@NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode' if (RoleEnCode == 'admin') { @@ -203,7 +213,7 @@ ], pager: "#gridPager", sortname: 'DocNo,DocLineNo', - + viewrecords: true, multiselect: true, gridComplete: function () { @@ -355,7 +365,7 @@