From d8de78b09da94b54f105bb4a74cf4701128e7bf8 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 22 四月 2024 17:26:23 +0800 Subject: [PATCH] 1.工程项目的编辑页面,增加 工程信息 页签; 页签里 增加字段 项目类别HProjectClassID,状态,建设单位HBuildComp,地点HBuildAddress,任务编号HWorkNo,受理日期HReDate,图纸编号HPicNo,任务下达HWorkTask,项目内容HProjectNote ; 2.仓储流程的测试并完善功能; 分步式调出单-》分布式调入单 直接调拨单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 ) --- WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs index 2027a30..8343c6f 100644 --- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs +++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs @@ -151,6 +151,7 @@ return objJsonResult; } } + UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "1114"; oItem.HBillSubType = "1114"; @@ -173,10 +174,10 @@ msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "鈥�"); - List<Model.ClsCg_PayableBillSub> ls = new List<Model.ClsCg_PayableBillSub>(); - ls = oListModels.getObjectByJson_Cg_PayableBillSub(msg3); + List<Model.ClsCg_PayableSub> ls = new List<Model.ClsCg_PayableSub>(); + ls = oListModels.getObjectByJson_Cg_PayableSub(msg3); int i = 0; - foreach (Model.ClsCg_PayableBillSub oItemSub in ls) + foreach (Model.ClsCg_PayableSub oItemSub in ls) { i++; oItemSub.HEntryID = i; @@ -194,6 +195,7 @@ bool bResult; if (refSav == "Add") { + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); } @@ -336,7 +338,7 @@ oCN.BeginTran(); oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID); - oCN.RunProc("delete from Cg_PayableBillSub where HInterID= " + HInterID); + oCN.RunProc("delete from Cg_PayableSub where HInterID= " + HInterID); ////鍒犻櫎鍚庢帶鍒�================================================================================== //string sql2 = "exec h_p_Xs_ReceivableBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; @@ -367,7 +369,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲鏀跺崟锛�"; + objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲浠樺崟锛�"; objJsonResult.data = null; return objJsonResult; } @@ -382,6 +384,8 @@ } } #endregion + + #region 搴斾粯鍗� 瀹℃牳/鍙嶅鏍� /// <summary> @@ -576,7 +580,7 @@ } catch (Exception e) { - oCN.RollBack(); + //oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; @@ -587,6 +591,7 @@ } #endregion + #region 搴斾粯鍗� 鍏抽棴/鍙嶅叧闂� /// <summary> /// </summary> -- Gitblit v1.9.1