From 97267e65bbdef1192a075401a18beea13f7676ea Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 29 七月 2024 12:22:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 218 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 168 insertions(+), 50 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index c938585..42b323e 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -631,7 +631,7 @@
#region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
[Route("Sc_QualityReportBill/set_SaveBill")]
[HttpGet]
- public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBadReasonHQty)
+ public object set_SaveBill(long HInterID,string HBillNo, string HChecker)
{
try
{
@@ -658,8 +658,18 @@
return objJsonResult;
}
//=========================================================
- //淇濆瓨
- oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID+",'"+ HBadReasonHQty +"'");
+ //淇濆瓨 鎵归噺淇濆瓨鍏堢湅瀛愯〃鏄惁鏈夋暟鎹�,鏈夋暟鎹氨杩� 瀛樺叆涓昏〃 鏄庣粏琛� 娌℃湁灏卞瓨鍌ㄤ富瀛愭槑缁嗚〃
+ string sql = "select * from Sc_QualityReportBillSub where HInterID = '" + HInterID + "'";
+ ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub");
+ if (ds.Tables[0].Rows.Count>0)
+ {
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + "");
+ }
+ else
+ {
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + "");
+ }
+
//鍒ゆ柇鏄惁鍏佽淇濆瓨锛屼笉鍏佽鍒欏洖婊�
ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
@@ -773,56 +783,53 @@
int i = 0;
foreach (Model.ClsSc_QualityReportBillSub oSub in ls)
{
-
-
- oSub.HMakeDate = DateTime.Now;
- int qty = Convert.ToInt32(oSub.HQty);
- for (int j = 0; j < qty; j++)
- {
- i++;
- oSub.HEntryID = i;
- string subSql = "Insert into Sc_QualityReportBillSub " +
- " (HInterID,HEntryID,HBillNo_bak,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
- ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
- ",HBarCode,HReportType" +
- ",HAddr,HMaker,HMakeDate" +
- ") values(" +
- "" + oSub.HInterID.ToString() + "" +
- "," + oSub.HEntryID.ToString() + "" +
- ",'" + oSub.HBillNo_bak + "'" +
- ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "" +
- "," + oSub.HSourceEntryID.ToString() + "" +
- ",'" + oSub.HSourceBillNo + "'" +
- ",'" + oSub.HSourceBillType + "'" +
- "," + oSub.HRelationQty.ToString() + "" +
- "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "" +
- "," + oSub.HUnitID.ToString() + "" +
- ",'" + 1 +
- "','" + oSub.HResult + "'" +
- "," + oSub.HEmpID.ToString() + "" +
- "," + oSub.HSourceID.ToString() + "" +
- "," + oSub.HBadReasonID.ToString() + "" +
+ i++;
+ oSub.HMakeDate = DateTime.Now;
+ oSub.HEntryID = i;
+ string subSql = "Insert into Sc_QualityReportBillSub " +
+ " (HInterID,HEntryID,HBillNo_bak,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
+ ",HBarCode,HReportType" +
+ ",HAddr,HMaker,HMakeDate" +
+ ") values(" +
+ "" + oSub.HInterID.ToString() + "" +
+ "," + oSub.HEntryID.ToString() + "" +
+ ",'" + oSub.HBillNo_bak + "'" +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "" +
+ "," + oSub.HSourceEntryID.ToString() + "" +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty.ToString() + "" +
+ "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HICMOInterID.ToString() + "" +
- "," + oSub.HICMOEntryID.ToString() + "" +
- ",'" + oSub.HICMOBillNo + "'" +
- "," + oSub.HProcExchInterID + "" +
- "," + oSub.HProcExchEntryID + "" +
- ",'" + oSub.HProcExchBillNo + "'" +
- ",'" + oSub.HBarCode + "'" +
+ "," + oSub.HMaterID.ToString() + "" +
+ "," + oSub.HUnitID.ToString() + "" +
+ ",'" + oSub.HQty.ToString() +
+ "','" + oSub.HResult + "'" +
+ "," + oSub.HEmpID.ToString() + "" +
+ "," + oSub.HSourceID.ToString() + "" +
+ "," + oSub.HBadReasonID.ToString() + "" +
+ ",'" + oSub.HBadReasonNumber.ToString() + "'" +
+ ",'" + oSub.HGroupID.ToString() + "'" +
- ",'" + 3 +
- "','" + oSub.HAddr + "'" +
- ",'" + msg4 + "'" +
- ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
- ") ";
- oCN.RunProc(subSql);
- }
+ "," + oSub.HICMOInterID.ToString() + "" +
+ "," + oSub.HICMOEntryID.ToString() + "" +
+ ",'" + oSub.HICMOBillNo + "'" +
+ "," + oSub.HProcExchInterID + "" +
+ "," + oSub.HProcExchEntryID + "" +
+ ",'" + oSub.HProcExchBillNo + "'" +
+ ",'" + oSub.HBadReasonNumber.ToString() + "'" +
+
+ ",'" + 1 +
+ "','" + oSub.HAddr + "'" +
+ ",'" + msg4 + "'" +
+ ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
+ ") ";
+ oCN.RunProc(subSql);
}
objJsonResult.code = "0";
@@ -1818,6 +1825,117 @@
}
#endregion
+ #region 鐗╂枡鐢熶骇鑹巼缁熻(鏂帿灏�) 鏌ヨ
+
+ [Route("Sc_QualityReportBill/getSc_HMaterYieldStatistics")]
+ [HttpGet]
+ public object getSc_HMaterYieldStatistics(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_HMater_Yield_Statistics_Query order by 鍗曟嵁鍙� desc", "h_v_Sc_HMater_Yield_Statistics_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_HMater_Yield_Statistics_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_HMater_Yield_Statistics_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浠诲姟鍗曢�氳繃鐜�(鏂帿灏�) 鏌ヨ
+
+ [Route("Sc_QualityReportBill/getSc_HICMMaterStatistics")]
+ [HttpGet]
+ public object getSc_HICMMaterStatistics(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_HICMMater_Statistics_Query order by 鍗曟嵁鍙� desc", "h_v_Sc_HICMMater_Statistics_Query");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_HICMMater_Statistics_Query where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_HICMMater_Statistics_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1