From 5bd84540af361d497f7b7fb33daf7733c396f6ac Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 21 七月 2021 19:56:13 +0800
Subject: [PATCH] 报工平台检验申请单
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 2fa0023..de9c845 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,109 @@
}
#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(string ScMaxWork,string HSourceBillType, string workcode,int HSourceID,int HICMOInterID,int HICMOEntryID,string HMaker)
+ {
+ ListModels oListModels = new ListModels();
+ try
+ {
+ string sHSourceType = HSourceBillType;
+ string BillType = "3711"; //鍗曟嵁绫诲瀷 (鐢熶骇姹囨姤鍗�)
+ //寰楀埌mainid
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.BeginTran();
+ //鏍规嵁鍗曞彿銆佽祫婧怚D銆佽鍗曚富ID銆佽鍗曞瓙ID銆佸埗鍗曚汉杩囨护浜ч噺姹囨姤鎶ユ鐢宠鎻愪氦鏁版嵁
+ string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set
+ HICMOReportInterID ='"+HInterID+"', HICMOReportBillNo='"+ ScMaxWork + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode+ "' and a.HSourceID='" + HSourceID + "' and HICMOInterID='" + HICMOInterID+ "' and a.HICMOEntryID='"+ HICMOEntryID + "' and a.HMaker='"+HMaker+"' and HRelationInterID='0'");
+ oCN.RunProc(sql);
+ oCN.Commit();
+ //鏍规嵁鐢熶骇璁㈠崟鍙锋煡璇㈢敓浜ц鍗曡〃锛屾嬁鍒扮粍缁囥�佽溅闂�
+ DataSet ds0 = oCN.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain where HBillNo='"+ workcode + "'", "Sc_ICMOBillMain");
+
+ //鏌ヨ浜ч噺姹囨姤涓存椂琛�
+ ds = oCN.RunProcReturn("select top1* from Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='"+ HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
+ if (ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //璋冪敤WebService鏈嶅姟
+ WebS.ClsSc_ICMOReportBillMain model = new WebS.ClsSc_ICMOReportBillMain();
+ model.HInterID = HInterID;
+ model.HBillNo = ScMaxWork;
+ model.HYear= DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ model.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ model.HRemark = "";
+ model.HMaker = HMaker;
+ model.HEmpID = 0;
+ model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
+ model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
+ model.HPRDORGID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HPRDORGID"]);
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
+ if (flag)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1