Browse Source

默认值改成海格,sql视图漏写的错误

master
LAPTOP-IN2T345U\86136 4 weeks ago
parent
commit
84b1c3c202
  1. 2
      SRM/NFine.Application/SRM/CAManageApp.cs
  2. 18
      SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml

2
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 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 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 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 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 LEFT JOIN ICSINVENTORY d ON c.InvCode=d.InvCode AND a.WorkPoint = d.WorkPoint
WHERE 1=1 AND a.DocNo = '{0}' "; WHERE 1=1 AND a.DocNo = '{0}' ";

18
SRM/NFine.Web/Areas/SRM/Views/CAAdd/Index.cshtml

@ -20,7 +20,16 @@
$("#MTIME").attr('value', currentDate); $("#MTIME").attr('value', currentDate);
InitControl();//加载供应商 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 != "") { if (DocNo != null && DocNo != "") {
$("#DocNo").val(DocNo); $("#DocNo").val(DocNo);
$("#SupplierCode").val([SupplierCode]).trigger("change"); $("#SupplierCode").val([SupplierCode]).trigger("change");
@ -35,6 +44,7 @@
} }
else { else {
$("#Tax").val("13"); $("#Tax").val("13");
var Tax = $("#Tax").val(); var Tax = $("#Tax").val();
var RoleEnCode = '@NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode' var RoleEnCode = '@NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode'
if (RoleEnCode == 'admin') { if (RoleEnCode == 'admin') {
@ -203,7 +213,7 @@
], ],
pager: "#gridPager", pager: "#gridPager",
sortname: 'DocNo,DocLineNo', sortname: 'DocNo,DocLineNo',
viewrecords: true, viewrecords: true,
multiselect: true, multiselect: true,
gridComplete: function () { gridComplete: function () {
@ -355,7 +365,7 @@
</td> </td>
<th class="formTitle">税率:</th> <th class="formTitle">税率:</th>
<td class="formValue"> <td class="formValue">
<input id="Tax" name="Tax" type="text" class="form-control required" placeholder="请输入税率" />
<input id="Tax" name="Tax" type="text" class="form-control required" placeholder="请输入税率" />
</td> </td>
<th class="formTitle"></th> <th class="formTitle"></th>
<td class="formValue"></td> <td class="formValue"></td>
@ -366,4 +376,4 @@
<table id="gridList"></table> <table id="gridList"></table>
<div id="gridPager"></div> <div id="gridPager"></div>
</div> </div>
</form>
</form>
Loading…
Cancel
Save