From 8152d4ed3fcc77c7d66430dcca7581c4e01ed128 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 24 八月 2023 09:27:46 +0800
Subject: [PATCH] 返修台管理功能
---
WebAPI/Controllers/品质管理/产线返修平台/Sc_SourceLineRepairBillController.cs | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
index 4e7fe36..82151c6 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBillController.cs"
@@ -19,7 +19,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DAL.ClsSc_ICMOBillQualityStatus_Tmp BillOld = new DAL.ClsSc_ICMOBillQualityStatus_Tmp();
+ public DAL.ClsSc_SourceLineRepairBill BillOld = new DAL.ClsSc_SourceLineRepairBill();
string user_LongShan = "";
string HName_LongShan = "";
@@ -29,9 +29,9 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Sc_ICMOBillQualityStatus_Tmp/AddICMOBillQualityStatus_Tmp")]
+ [Route("Sc_SourceLineRepairBillSub/AddSourceLineRepairBill")]
[HttpPost]
- public object AddICMOBillQualityStatus_Tmp([FromBody] JObject sMainSub)
+ public object AddSourceLineRepairBill([FromBody] JObject sMainSub)
{
try
{
@@ -40,8 +40,9 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
- int HSaveType = int.Parse(sArray[1].ToString()); //淇濆瓨绫诲瀷 1:涓嶈壇鍝佷繚瀛� 2:鎶ュ簾淇濆瓨
- string user = sArray[2].ToString(); //鎿嶄綔鐢ㄦ埛鐨勭敤鎴峰悕
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string user = sArray[3].ToString(); //鎿嶄綔鐢ㄦ埛鐨勭敤鎴峰悕
string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
////鍒ゆ柇鏄惁鏈夋柊澧炴潈闄�
@@ -55,18 +56,18 @@
//}
msg2 = "[" + msg2.ToString() + "]";
- List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg2);
+ List<Model.ClsSc_SourceLineRepairBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillMain>>(msg2);
BillOld.omodel = mainList[0];
- if (HSaveType == 1)
- {
- BillOld.omodel.HSaveType = "涓嶈壇鍝佷繚瀛�";
- }
- else if (HSaveType == 2)
- {
- BillOld.omodel.HSaveType = "鎶ュ簾鍝佷繚瀛�";
- }
- if (!BillOld.AddBill1(ref DBUtility.ClsPub.sExeReturnInfo))
+ msg3 = "[" + msg3.ToString() + "]";
+ List<Model.ClsSc_SourceLineRepairBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub>>(msg3);
+ BillOld.DetailColl = subList;
+
+ //msg4 = "[" + msg4.ToString() + "]";
+ List<Model.ClsSc_SourceLineRepairBillSub_Mater> subMaterList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub_Mater>> (msg4);
+ BillOld.DetailMaterColl = subMaterList;
+
+ if (!BillOld.AddBill(ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -92,8 +93,8 @@
}
#endregion
- #region 浜х嚎璐ㄦ骞冲彴 鑾峰彇琛ㄥご淇℃伅
- [Route("Sc_ICMOBillQualityStatus_Tmp/getMainInfo")]
+ #region 浜х嚎杩斾慨骞冲彴 鑾峰彇琛ㄥご淇℃伅
+ [Route("Sc_SourceLineRepairBill/getMainInfo")]
[HttpGet]
public object getMainInfo(string Czybm, string user)
{
@@ -149,10 +150,10 @@
}
#endregion
- #region 浜х嚎璐ㄦ骞冲彴 鑾峰彇瀛愯〃淇℃伅
- [Route("Sc_ICMOBillQualityStatus_Tmp/getSubInfo")]
+ #region 浜х嚎杩斾慨骞冲彴 鑾峰彇瀛愯〃1淇℃伅
+ [Route("Sc_SourceLineRepairBill/getSubInfo")]
[HttpGet]
- public object getSubInfo(string HSplitNo, string user)
+ public object getSubInfo(Int64 HSourceInterID, Int64 HSourceEntryID, string HDate, string user)
{
try
{
@@ -167,13 +168,14 @@
// return objJsonResult;
//}
- string sql = @"select
- a.HInterID, a.HDate 鏃ユ湡, a.HMaterID, b.HName 浜у搧鍚嶇О, a.HBarCode 鏉″舰鐮�, a.HBadReasonID, c.HName 涓嶈壇鍘熷洜, a.HResult 鍒ゆ柇缁撴灉
- from Sc_ICMOBillQualityStatus_Tmp AS a
- LEFT OUTER JOIN Gy_Material AS b on a.HMaterID = b.HItemID
- LEFT OUTER JOIN Gy_BadReason AS c on a.HBadReasonID = c.HItemID
- where a.HSplitNo = '" + HSplitNo + "' order by a.HDate desc, a.HInterID desc" ;
- ds = oCN.RunProcReturn(sql, "h_p_Sc_ICMOBillQualityStatus_Tmp_Init");
+ string sql = @"select b.HInterID, b.HEntryID, a.HDate 鏃ユ湡, c.HName 浜у搧鍚嶇О, a.HBarCode SN鐮�, d.HName 涓嶈壇鍘熷洜, b.HRepairResult 缁翠慨缁撴灉
+ from Sc_SourceLineRepairBillMain AS a
+ inner join Sc_SourceLineRepairBillSub AS b on a.HInterID = b.HInterID
+ LEFT OUTER JOIN Gy_Material AS c on a.HMaterID = c.HItemID
+ LEFT OUTER JOIN Gy_BadReason AS d on b.HBadReasonID = d.HItemID
+ where b.HSourceInterID = " + HSourceInterID + "and HSourceEntryID = " + HSourceEntryID + " and CONVERT(varchar(100),a.HDate, 23) = '" + HDate + "' " +
+ "order by a.HDate desc, b.HInterID desc, b.HEntryID desc";
+ ds = oCN.RunProcReturn(sql, "Sc_SourceLineRepairBill");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -201,10 +203,10 @@
}
#endregion
- #region 浜х嚎璐ㄦ骞冲彴 瀛愯〃鍒犻櫎
- [Route("Sc_ICMOBillQualityStatus_Tmp/deleteSubInfo")]
+ #region 浜х嚎杩斾慨骞冲彴 瀛愯〃1鍒犻櫎
+ [Route("Sc_SourceLineRepairBill/deleteSubInfo")]
[HttpGet]
- public object deleteSubInfo(int HInterID, string user)
+ public object deleteSubInfo(int HInterID, int HEntryID, string user)
{
try
{
@@ -218,7 +220,11 @@
// return objJsonResult;
//}
- string sql = @"delete from Sc_ICMOBillQualityStatus_Tmp where HInterID = " + HInterID ;
+ string sql = "delete from Sc_SourceLineRepairBillMain where HInterID = " + HInterID;
+ oCN.RunProc(sql);
+ sql = "delete from Sc_SourceLineRepairBillSub where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
+ oCN.RunProc(sql);
+ sql = "delete from Sc_SourceLineRepairBillSub_Mater where HInterID = " + HInterID;
oCN.RunProc(sql);
objJsonResult.code = "1";
@@ -238,10 +244,10 @@
}
#endregion
- #region 浜х嚎璐ㄦ骞冲彴 鑾峰彇涓嶈壇鐜囧崰姣斿垎鏋愬浘鏁版嵁
- [Route("Sc_ICMOBillQualityStatus_Tmp/getBadReasonRateInfo")]
+ #region 浜х嚎杩斾慨骞冲彴 鑾峰彇涓嶈壇鐜囧崰姣斿垎鏋愬浘鏁版嵁
+ [Route("Sc_SourceLineRepairBill/getBadReasonRateInfo")]
[HttpGet]
- public object getBadReasonRateInfo(int HICMOInterID, int HICMOEntryID)
+ public object getBadReasonRateInfo(int HSourceInterID, int HSourceEntryID)
{
try
{
@@ -256,15 +262,11 @@
// return objJsonResult;
//}
- string sql = @"select
- a.HBadReasonID
- ,b.HName HBadReasonName
- , COUNT(a.HBadReasonID) HBadReasonQty
- from Sc_ICMOBillQualityStatus_Tmp AS a
- LEFT OUTER JOIN Gy_BadReason as b on a.HBadReasonID = b.HItemID " +
- "where a.HICMOInterID = " + HICMOInterID + " and a.HICMOEntryID = " + HICMOEntryID +
- " and ISNULL(a.HBadReasonID,0)<> 0" +
- " group by a.HBadReasonID,b.HName order by COUNT(a.HBadReasonID) desc";
+ string sql = @"select a.HBadReasonID, b.HName HBadReasonName, count(a.HBadReasonID) HBadReasonQty
+ from Sc_SourceLineRepairBillSub AS a
+ LEFT OUTER JOIN Gy_BadReason AS b on a.HBadReasonID = b.HItemID
+ where a.HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and ISNULL(a.HBadReasonID,0)<>0 " +
+ "group by a.HBadReasonID,b.HName order by COUNT(a.HBadReasonID) desc";
ds = oCN.RunProcReturn(sql, "getBadReasonRateInfo");
@@ -294,8 +296,8 @@
}
#endregion
- #region 浜х嚎璐ㄦ骞冲彴 鏍规嵁鏉″舰鐮佽幏鍙栦俊鎭�
- [Route("Sc_ICMOBillQualityStatus_Tmp/getBarCodeInfo")]
+ #region 浜х嚎杩斾慨骞冲彴 鏍规嵁鏉″舰鐮佽幏鍙栦俊鎭�
+ [Route("Sc_SourceLineRepairBill/getBarCodeInfo")]
[HttpGet]
public object getBarCodeInfo(string HBarCode)
{
@@ -320,7 +322,13 @@
return objJsonResult;
}
- string sql = "select * from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'";
+ string sql = @"select a.*, b.HNumber HMaterNumber, b.HName HMaterName
+ from Gy_BarCodeBill AS a
+ LEFT OUTER JOIN Gy_Material AS b on a.HMaterID = b.HItemID
+ where HBarCode = '" + HBarCode + "'";
+
+
+
ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
if(ds == null || ds.Tables[0].Rows.Count == 0)
--
Gitblit v1.9.1