From 47b45a4ac3284936515a2edd3e50265de30993a0 Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期三, 04 六月 2025 14:50:23 +0800 Subject: [PATCH] 合并冲突 --- WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 263 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 180 insertions(+), 83 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs index a6522b0..125c904 100644 --- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs @@ -20,6 +20,7 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); #region 宸ュ簭 鏂囦欢涓婁紶 [Route("Gy_Process/Gy_Process_Excel")] @@ -28,6 +29,9 @@ { try { + string Ret = ""; + oSystemParameter.ShowBill(ref Ret); + //鑾峰彇鏂囦欢鍚嶇О var file = HttpContext.Current.Request.Files[0]; //鑾峰彇鏂囦欢鐗╃悊璺緞 @@ -114,6 +118,8 @@ if (!tb2.Columns.Contains("宸℃璐ㄦ鏂规鍚嶇О")) error += "娌℃湁鎵惧埌銆愬贰妫�璐ㄦ鏂规鍚嶇О銆戠殑鏍囬,"; + if (!tb2.Columns.Contains("宸ュ簭鍒嗙被")) + error += "娌℃湁鎵惧埌銆愬伐搴忓垎绫汇�戠殑鏍囬,"; if (error.Length > 0) @@ -129,6 +135,7 @@ { string HProcessName = ""; string HProcessNum = ""; + string HProcType = ""; string HORGNumber = ""; string HORGName = ""; string HDeptNum = ""; @@ -144,6 +151,7 @@ HProcessName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ュ簭鍚嶇О"].ToString()); HProcessNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ュ簭浠g爜"].ToString()); + HProcType = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸ュ簭鍒嗙被"].ToString()); HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠g爜"].ToString()); HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString()); HDeptNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["閮ㄩ棬浠g爜"].ToString()); @@ -182,83 +190,166 @@ } string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString(); - - //鏌ヨ閮ㄩ棬 - ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department"); - - if (ds.Tables[0].Rows.Count == 0) + if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,閮ㄩ棬:" + HDeptName + ",涓嶅瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; + if (HProcType == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,宸ュ簭鍒嗙被涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + //鏌ヨ閮ㄩ棬 + ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department"); + + if (ds.Tables[0].Rows.Count == 0) + { + tb2.Rows[i]["HDeptID"] = 0; + } + else + { + tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + } + + //鏌ヨ棣栦欢璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Fst + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + + if (ds.Tables[0].Rows.Count == 0) + { + tb2.Rows[i]["HQCSchemeID_Fst"] = 0; + } + else + { + tb2.Rows[i]["HQCSchemeID_Fst"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } + + //鏌ヨ宸ュ簭璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Proc + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + + if (ds.Tables[0].Rows.Count == 0) + { + tb2.Rows[i]["HQCSchemeID_Proc"] = 0; + } + else + { + tb2.Rows[i]["HQCSchemeID_Proc"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } + + //鏌ヨ宸℃璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Patrol + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + + if (ds.Tables[0].Rows.Count == 0) + { + tb2.Rows[i]["HQCSchemeID_Patrol"] = 0; + } + else + { + tb2.Rows[i]["HQCSchemeID_Patrol"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } + //鏌ヨ宸ヤ綔涓績 + ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HCentNum + "' and HUSEORGID=" + HORGid + "", "Gy_WorkCenter"); // + + if (ds.Tables[0].Rows.Count == 0) + { + tb2.Rows[i]["HWorkCenterID"] = 0; + } + else + { + tb2.Rows[i]["HWorkCenterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + } } else { - tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); - } + //鏌ヨ閮ㄩ棬 + ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department"); - //鏌ヨ棣栦欢璐ㄦ鏂规 - ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Fst + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,閮ㄩ棬:" + HDeptName + ",涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + } - if (ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,棣栦欢璐ㄦ鏂规:" + HQCSchemeName_Fst + ",涓嶅瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - tb2.Rows[i]["HQCSchemeID_Fst"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); - } - //鏌ヨ宸ュ簭璐ㄦ鏂规 - ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Proc + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + //鏌ヨ棣栦欢璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Fst + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); - if (ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸ュ簭璐ㄦ鏂规:" + HQCSchemeName_Proc + ",涓嶅瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - tb2.Rows[i]["HQCSchemeID_Proc"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); - } - //鏌ヨ宸℃璐ㄦ鏂规 - ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Patrol + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,棣栦欢璐ㄦ鏂规:" + HQCSchemeName_Fst + ",涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + tb2.Rows[i]["HQCSchemeID_Fst"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } - if (ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸℃璐ㄦ鏂规:" + HQCSchemeName_Patrol + ",涓嶅瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - tb2.Rows[i]["HQCSchemeID_Patrol"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); - } + //鏌ヨ宸ュ簭璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Proc + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); - //鏌ヨ宸ヤ綔涓績 - ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HCentNum + "' and HUSEORGID=" + HORGid + "", "Gy_WorkCenter"); // + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸ュ簭璐ㄦ鏂规:" + HQCSchemeName_Proc + ",涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + tb2.Rows[i]["HQCSchemeID_Proc"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } - if (ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸ヤ綔涓績:" + HCentName + ",涓嶅瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - tb2.Rows[i]["HWorkCenterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + //鏌ヨ宸℃璐ㄦ鏂规 + ds = oCN.RunProcReturn("select * from Gy_QCCheckProjectMain where HBillNo='" + HQCSchemeNum_Patrol + "' and HUSEORGID=" + HORGid + "", "Gy_QCCheckProjectMain"); + + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸℃璐ㄦ鏂规:" + HQCSchemeName_Patrol + ",涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + tb2.Rows[i]["HQCSchemeID_Patrol"] = ds.Tables[0].Rows[0]["HInterID"].ToString(); + } + //鏌ヨ宸ヤ綔涓績 + ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HCentNum + "' and HUSEORGID=" + HORGid + "", "Gy_WorkCenter"); // + + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸ヤ綔涓績:" + HCentName + ",涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + tb2.Rows[i]["HWorkCenterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString(); + } + + //宸ュ簭浠g爜 + if (HProcessNum == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绗�" + index + "琛�,宸ュ簭璧勬簮浠g爜涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } } //宸ュ簭鍚嶇О @@ -271,15 +362,7 @@ return objJsonResult; } - //宸ュ簭浠g爜 - if (HProcessNum == "") - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "绗�" + index + "琛�,宸ュ簭璧勬簮浠g爜涓嶈兘涓虹┖锛�"; - objJsonResult.data = null; - return objJsonResult; - } + } else { @@ -320,6 +403,9 @@ string user = sArray[1].ToString(); try { + string Ret = ""; + oSystemParameter.ShowBill(ref Ret); + if (!DBUtility.ClsPub.Security_Log("Gy_Porcess_Edit", 1, false, user)) { objJsonResult.code = "0"; @@ -354,6 +440,7 @@ string HQCSchemeID_Patrol = item["HQCSchemeID_Patrol"].ToString();//宸℃璐ㄦ鏂规ID string HProcessName = item["宸ュ簭鍚嶇О"].ToString(); string HProcessNum = item["宸ュ簭浠g爜"].ToString(); + string HProcType = item["宸ュ簭鍒嗙被"].ToString(); string sShortNumber; sShortNumber = DBUtility.ClsPub.GetShortNumber(HProcessNum);//鐭唬鐮� if (sShortNumber.Trim() == "") @@ -377,18 +464,25 @@ return objJsonResult; } - ds = oCN.RunProcReturn("select * from Gy_Process where HNumber='" + HProcessNum + "'", "Gy_Source"); + if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") + { + ds = oCN.RunProcReturn("select * from Gy_Process where HName='" + HProcessName + "'", "Gy_Process"); + } + else + { + ds = oCN.RunProcReturn("select * from Gy_Process where HNumber='" + HProcessNum + "'", "Gy_Source"); + } if (ds.Tables[0].Rows.Count == 0) { - string sql = "insert into Gy_Process(HName,HNumber,HDeptID,HUSEORGID,HCREATEORGID,HWorkCenterID,HShortNumber,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HEndFlag,HLevel,HHelpCode,HParentID,HStopflag,HRemark,HTypeFlow,HTypeCount)" + - $"values('{HProcessName}', '{HProcessNum}',{HDeptID}, {HOrgID}, {HOrgID}, {HWorkCenterID}, '{sShortNumber}',{HQCSchemeID_Fst},{HQCSchemeID_Proc},{HQCSchemeID_Patrol},{HEndFlag},{HLevel},'',0,0,'',0,0)"; + string sql = "insert into Gy_Process(HName,HNumber,HDeptID,HUSEORGID,HCREATEORGID,HWorkCenterID,HShortNumber,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HEndFlag,HLevel,HHelpCode,HParentID,HStopflag,HRemark,HTypeFlow,HTypeCount,HProcType)" + + $"values('{HProcessName}', '{HProcessNum}',{HDeptID}, {HOrgID}, {HOrgID}, {HWorkCenterID}, '{sShortNumber}',{HQCSchemeID_Fst},{HQCSchemeID_Proc},{HQCSchemeID_Patrol},{HEndFlag},{HLevel},'',0,0,'',0,0,'{HProcType}')"; oCN.RunProc(sql); } else { - oCN.RunProc(" update Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + " where HNumber='" + HProcessNum + "'"); + oCN.RunProc(" update Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "' where HNumber='" + HProcessNum + "'"); } i++; @@ -695,6 +789,7 @@ long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; + string HProcType = list[0].HProcType; string HShortNumber = list[0].HNumber; long HParentID = list[0].HParentID; string HHelpCode = list[0].HHelpCode; @@ -814,14 +909,14 @@ ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" + ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" + ",HUSEORGID,HCREATEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag" + - ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HPayMentType,HMakeTime,HMakeEmp,HStandardWages) " + + ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol,HPayMentType,HMakeTime,HMakeEmp,HStandardWages,HProcType) " + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() + "','" + HUseFlag.ToString() + "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) + ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" + "," + HUSEORGID + "," + HCREATEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + "," + HQCSchemeID_Fst + "," + HQCSchemeID_Proc + "," + HQCSchemeID_Patrol - + ",'" + HPayMentType + "',getdate(),'" + HMakeEmp + "'," + HStandardWages + ")", ref DBUtility.ClsPub.sExeReturnInfo); + + ",'" + HPayMentType + "',getdate(),'" + HMakeEmp + "'," + HStandardWages + ",'" + HProcType + "' )", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); @@ -933,7 +1028,9 @@ ",HStandardWages= " + HStandardWages + ",HModifyTime= getdate()" + ",HModifyEmp='" + HMakeEmp + "'" + - ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); + ",HProcCheckNote='" + HProcCheckNote + "' " + + ",HProcType = '" + HProcType + "' " + + " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); -- Gitblit v1.9.1