From 8973ed24937566fc3a6b583cfeb1909bac4e574a Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期五, 08 七月 2022 00:01:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/OtherOutBillController.cs | 2
WebAPI/Controllers/SellOutController.cs | 2
WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log | 3 +
WebAPI/Controllers/MoveStockBillController.cs | 2
WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log | 3 +
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 10 +++--
WebAPI/Vlog/webapi20220701.txt | 1
WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log | 3 +
WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log | 3 +
WebAPI/Controllers/OtherInStockController.cs | 2
WebAPI/Controllers/WebAPIController.cs | 55 +++++++++++++++++++++++++++
11 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index e16bd1e..e6a56cf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -803,6 +803,7 @@
int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
string HMouldNo = mainList[0].HMouldNo;
+ string HBarCode = mainList[0].HBarCode;
string HName = mainList[0].HName;
string HModel = mainList[0].HModel;
string HModel2 = mainList[0].HModel2;
@@ -883,16 +884,17 @@
",HSPGroupID=" + HSPGroupID.ToString() +
",HSPID=" + HSPID.ToString() +
",HDesignLife=" + HDesignLife.ToString() +
- ",HCaveQty="+ HCaveQty.ToString()+
+ ",HCaveQty=" + HCaveQty.ToString() +
",HUseLife=" + HUseLife.ToString() +
",HLeaveLife=" + HLeaveLife.ToString() +
",HProdQty=" + HProdQty.ToString() +
- ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
+ ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
",HMouldOWNER='" + HMouldOWNER + "'" +
- ",HNowSupID="+HNowSupID.ToString()+
- ",HNowSupTypeID="+HNowSupTypeID.ToString()+
+ ",HNowSupID=" + HNowSupID.ToString() +
+ ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
",HProdWeight=" + HProdWeight.ToString() +
+ ",HBarCode="+ HBarCode.ToString()+
" where HInterID=" + HInterID.ToString());
//淇敼瀛愰」鐩唬鐮�
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 676c811..1e612ef 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -618,7 +618,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index 80fc610..765f92e 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -358,7 +358,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index 53ca926..624909e 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -412,7 +412,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index 87b2a1c..33e2be2 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -578,7 +578,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6d285a5..f9892a7 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -3420,7 +3420,62 @@
}
+ #region PDA鍏朵粬鍏ュ簱鍒楄〃妯″潡
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ /// </summary>
+ /// <param name="HBillType"></param>
+ /// <param name="sHMaker"></param>
+ /// <param name="HOrgID"></param>
+ /// <returns></returns>
+ [Route("Web/GetOtherInBillMain_TempList_New")]
+ [HttpGet]
+ public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log b/WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log
new file mode 100644
index 0000000..cd974fb
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log
@@ -0,0 +1,3 @@
+------------------------2022/7/1 13:44:40------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log b/WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log
new file mode 100644
index 0000000..4ff9059
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log
@@ -0,0 +1,3 @@
+------------------------2022/7/1 13:44:41------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log b/WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log
new file mode 100644
index 0000000..4b1eb5c
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log
@@ -0,0 +1,3 @@
+------------------------2022/7/1 13:44:41------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-01'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log b/WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log
new file mode 100644
index 0000000..6792435
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log
@@ -0,0 +1,3 @@
+------------------------2022/7/1 13:44:44------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟'
+
diff --git a/WebAPI/Vlog/webapi20220701.txt b/WebAPI/Vlog/webapi20220701.txt
new file mode 100644
index 0000000..66ff91e
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220701.txt
@@ -0,0 +1 @@
+2022/7/1 13:44:41 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-01';钃濇捣瀹炰笟闆嗗洟
--
Gitblit v1.9.1