From 7493a166d0d8711adb4a7c85c23b673e15bee52e Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期四, 09 九月 2021 17:02:15 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index eb49fec..b231324 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -491,7 +491,6 @@
{
try
{
-
ds = Sc_MouldRepairCheckBillList_s(sWhere);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -515,7 +514,18 @@
public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ return ds;
}
#endregion
@@ -1638,6 +1648,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
@@ -1651,7 +1662,7 @@
lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2);
foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
+ oItem.HMaker = msg4;
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3817";
oItem.HBillSubType = "3817";
@@ -2722,17 +2733,6 @@
[HttpGet]
public object DeltetSc_MouldMaintainBill(string HInterID)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
--
Gitblit v1.9.1