From 77cbbb3b98082382c164d6f1bdc814e253157cde Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 21 七月 2021 09:18:56 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 104 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 2fa0023..9d7818d 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -268,12 +268,12 @@
#region 鎶ュ伐骞冲彴寮�宸ュ崟寮圭獥鏌ユ壘鏁版嵁
[Route("Sc_MESBeginWorkBill/GetMESBeginWorkFrom")]
[HttpGet]
- public object GetMESBeginWorkFrom(string HSourceInterID,string HSourceEntryID,string HSourceBillNo,string HSourceBillType)
+ public object GetMESBeginWorkFrom(string HSourceInterID, string HSourceEntryID, string HSourceBillNo, string HSourceBillType)
{
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID="+ HSourceEntryID + ",@HSourceBillNo='"+ HSourceBillNo + "',@HSourceBillType='"+ HSourceBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetInfoByICMOStatusInterID @HSourceInterID=" + HSourceInterID + ",@HSourceEntryID=" + HSourceEntryID + ",@HSourceBillNo='" + HSourceBillNo + "',@HSourceBillType='" + HSourceBillType + "'", "h_p_JIT_GetInfoByICMOStatusInterID");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -390,6 +390,40 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴楠岃瘉鍗曟嵁鐘舵��
+ [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
+ [HttpGet]
+ public object GetMESBeginWorkBillStaus(string sWhere)
+ {
+ try
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
+ objJsonResult.data = null;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+ objJsonResult.data = null;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ex.Message;
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
#region 鎶ュ伐骞冲彴鎶ユ鐢宠鍒楄〃(浜ч噺姹囨姤鍒楄〃)
[Route("Sc_MESBeginWorkBill/GetMESProductReportBillList")]
@@ -417,8 +451,8 @@
}
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
- {
- string sql = string.Format(@"select a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
+ {
+ string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
@@ -427,8 +461,8 @@
left join Gy_Material m on a.HMaterID=m.hitemid
left join Gy_Source s on a.HSourceID=s.HItemID
left join Gy_Group g on a.HGroupID=g.HItemID
- left join Gy_Employee e on a.HWorkManID=e.HItemID "+sWhere+"");
- return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
+ left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
}
#endregion
@@ -515,7 +549,70 @@
}
#endregion
-
+ #region 鎶ュ伐骞冲彴浜ч噺姹囨姤鍒犻櫎
+ [Route("Sc_MESBeginWorkBill/DeltetMESProductReportBill")]
+ [HttpGet]
+ public object DeleteGetLineBindBillList(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ //鏇存柊鍒囨崲鐘舵�佸��
+ string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
+ oCN.RunProc(sql);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎璧勬簮鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
+ [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
+ [HttpGet]
+ public object SaveGetMESProductReportBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
+ List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1