From f1c258211a7bcc79cb7b86e6007a27afebb24e21 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 18 十月 2021 16:23:31 +0800
Subject: [PATCH] 新增工资结算单（集体），工资结算各列表表体的金额能自动按照工时*数量*工价得出总价且能按照所选物料和工序自动填入工价,加入工序流转卡维护拆分功能权限
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index dd47554..b38fe11 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4213,7 +4213,7 @@
[Route("Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList")]
[HttpGet]
- public object GetMouldRepairInBillList(string sWhere,string user)
+ public object GetMouldRepairInBillList(string sWhere,string user, string Organization)
{
try
{
@@ -4227,7 +4227,7 @@
return objJsonResult;
}
- ds = Sc_MouldRepairInBillList(sWhere);
+ ds = Sc_MouldRepairInBillList(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4244,15 +4244,15 @@
}
}
- public static DataSet Sc_MouldRepairInBillList(string sWhere)
+ public static DataSet Sc_MouldRepairInBillList(string sWhere,string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairInBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldRepairInBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
}
--
Gitblit v1.9.1