From 7b013346174c6f645039ea7673a666a3228cf20b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 09 十二月 2022 13:36:29 +0800
Subject: [PATCH] 1
---
WebAPI/Models/Cls_InventoryAnalysisList.cs | 18 +++++++++---------
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 8 +++++++-
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 15 +++------------
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 3dfb55c..9f7c6c7 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -215,6 +215,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
//if (HWorkTimes <= 0)
//{
// objJsonResult.code = "0";
@@ -255,10 +256,13 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ var num = 0;
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
if ("Add".Equals(eventType))
{
+ num = 1;
if (!AllowbillNo(HBillNo))
{
oCN.RollBack();
@@ -290,6 +294,7 @@
}
else if ("Modify".Equals(eventType))
{
+ num = 2;
oCN.RunProc("UpDate Sc_StationOutBillMain set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
@@ -358,7 +363,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
@@ -394,6 +399,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index b9c63e6..fe36bcf 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -385,22 +385,13 @@
{
ds = MouldStockBillMainTemp(sWhere);
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
+
}
catch (Exception ex)
{
@@ -660,7 +651,7 @@
string userID = sArray[2].ToString();//userID
string sName = sArray[3].ToString();//鐩樼偣鏂规
//鏌ヨ鐩樼偣鏂规鍒涘缓鏃ユ湡
- DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");
+ DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");
string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();
diff --git a/WebAPI/Models/Cls_InventoryAnalysisList.cs b/WebAPI/Models/Cls_InventoryAnalysisList.cs
index 496302c..5cfc883 100644
--- a/WebAPI/Models/Cls_InventoryAnalysisList.cs
+++ b/WebAPI/Models/Cls_InventoryAnalysisList.cs
@@ -7,14 +7,14 @@
{
public class Cls_InventoryAnalysisList
{
- public long HItemID;
- public string HBarCode;
- public string HMouldNo;
- public string HStockCheck;
- public string HRealPotType;
- public string HRealPot;
- public string HBookPotType;
- public string HBookPot;
- public string HMakeDate;
+ public long HItemID { get; set; }
+ public string HBarCode{ get; set; }
+ public string HMouldNo{ get; set; }
+ public string HStockCheck{ get; set; }
+ public string HRealPotType{ get; set; }
+ public string HRealPot{ get; set; }
+ public string HBookPotType{ get; set; }
+ public string HBookPot{ get; set; }
+ public string HMakeDate{ get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1