From 432050f1cece4e60a90951bb619ff759b8fbad80 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 26 一月 2024 16:50:07 +0800
Subject: [PATCH] 周总结页面查询数据
---
WebAPI/Controllers/项目管理/工作周计划/PM_WorkTaskWeekBillController.cs | 390 ++++++++++++++++++++++++++++++
Model/项目管理/ClsPM_WorkReportWeekBillMain.cs | 25 +
WebAPI/ListModels.cs | 11
DAL/DAL.csproj | 1
Model/Model.csproj | 2
Model/项目管理/ClsPM_WorkReportWeekBillSub.cs | 11
DAL/项目管理/ClsPM_WorkReportWeekBillMain.cs | 298 ++++++++++++++++++++++
7 files changed, 738 insertions(+), 0 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 160c908..be05d63 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -774,6 +774,7 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_CustomsSplitPackBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBill.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_ProjectCheckBill.cs" />
diff --git "a/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs" "b/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs"
new file mode 100644
index 0000000..23098f3
--- /dev/null
+++ "b/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs"
@@ -0,0 +1,298 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsPM_WorkReportWeekBillMain : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsPM_WorkReportWeekBillMain omodel = new Model.ClsPM_WorkReportWeekBillMain();
+ public List<Model.ClsPM_WorkReportWeekBillSub> DetailColl = new List<Model.ClsPM_WorkReportWeekBillSub>();
+
+ public ClsPM_WorkReportWeekBillMain()
+ {
+ base.MvarItemKeySub = "PM_WorkReportWeekBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "PM_WorkReportWeekBillMain";
+ base.MvarReportTitle="宸ヤ綔鍛ㄦ�荤粨";
+ base.BillType="4757";
+ base.HBillSubType = "4757";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+ #region 鏃犲弬鏋勯�犲嚱鏁�
+ ~ClsPM_WorkReportWeekBillMain()
+ {
+ DetailColl = null;
+ }
+ #endregion
+ #endregion
+
+ #region 淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "update PM_WorkReportWeekBillMain set " +
+ " HBillNo = '" + omodel.HBillNo +
+ "', HDate = '" + omodel.HDate +
+ "', HYear = " + omodel.HYear +
+ ", HPeriod = " + omodel.HPeriod +
+ ", HRemark = '" + omodel.HRemark +
+ "', HUpDater = '" + omodel.HUpDater +
+ "', HUpDateDate = getdate()" +
+ //===============================================================
+ ", HOrgID = " + omodel.HOrgID +
+ ", HYear = " + omodel.HYear +
+ ", HWeek = " + omodel.HWeek +
+ ", HBeginDate = '" + omodel.HBeginDate +
+ "', HEndDate = '" + omodel.HEndDate +
+ "', HPlanEmpID = " + omodel.HReportEmpID +
+ " where HInterID = " + omodel.HInterID;
+
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ ////鎻掑叆瀛愯〃
+ //omodel.HInterID = lngBillKey;
+ //foreach (Model.ClsPM_WorkTaskWeekBillSub oSub in DetailColl)
+ //{
+ // string subSql = "insert into PM_WorkTaskWeekBillSub" +
+ // "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // ",HWeekDay,HSno,HProjectID,HProjectStageID,HTaskNote,HPlanTimes) " +
+ // " values(" +
+ // "" + omodel.HInterID.ToString() +
+ // "," + oSub.HEntryID.ToString() +
+ // ",'" + oSub.HCloseMan +
+ // "','" + oSub.HEntryCloseDate +
+ // "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ // ",'" + oSub.HRemark +
+ // "'," + oSub.HSourceInterID +
+ // "," + oSub.HSourceEntryID +
+ // ",'" + oSub.HSourceBillNo +
+ // "','" + oSub.HSourceBillType +
+ // "'," + oSub.HRelationQty +
+ // "," + oSub.HRelationMoney +
+ // "," + oSub.HWeekDay +
+ // "," + oSub.HSno +
+ // "," + oSub.HProjectID +
+ // "," + oSub.HProjectStageID +
+ // ",'" + oSub.HTaskNote +
+ // "'," + oSub.HPlanTimes +
+ // ")";
+ // oCn.RunProc(subSql);
+ //}
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ DataSet ds;
+
+
+ oCn.BeginTran();
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID = " + omodel.HInterID, "PM_WorkReportWeekBillMain");
+ if(ds!=null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //鎻掑叆涓昏〃
+ string mainSql = "insert into PM_WorkReportWeekBillMain" +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
+ ",HOrgID,HWeek,HBeginDate,HEndDate,HReportEmpID,HPlanTimes,HUseTimes,HRelUseTimes,HDelayTasks,HFineTasks,HFinishRate,HWorkReport,HNextPlan,HWorkGain ) " +
+ "values(" +
+ "" + omodel.HYear.ToString() +
+ "," + omodel.HPeriod.ToString() +
+ ",'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID +
+ ",'" + omodel.HDate +
+ "','" + omodel.HBillNo +
+ "','" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "','" + omodel.HMakeDate +
+ "'," + omodel.HOrgID +
+ "," + omodel.HWeek +
+ ",'" + omodel.HBeginDate +
+ "','" + omodel.HEndDate +
+ "'," + omodel.HReportEmpID +
+ "," + omodel.HPlanTimes +
+ "," + omodel.HUseTimes +
+ "," + omodel.HRelUseTimes +
+ "," + omodel.HDelayTasks +
+ "," + omodel.HFineTasks +
+ ",'" + omodel.HFinishRate+
+ "','" + omodel.HWorkReport+
+ "','" + omodel.HNextPlan+
+ "','" + omodel.HWorkGain+
+ "')";
+
+ oCn.RunProc(mainSql);
+
+ ////鎻掑叆瀛愯〃
+ //foreach (Model.ClsPM_WorkTaskWeekBillSub oSub in DetailColl)
+ //{
+ // string subSql = "insert into PM_WorkTaskWeekBillSub" +
+ // "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // ",HWeekDay,HSno,HProjectID,HProjectStageID,HTaskNote,HPlanTimes) " +
+ // " values(" +
+ // "" + omodel.HInterID.ToString() +
+ // "," + oSub.HEntryID.ToString() +
+ // ",'" + oSub.HCloseMan +
+ // "','" + oSub.HEntryCloseDate +
+ // "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) +
+ // ",'" + oSub.HRemark +
+ // "'," + oSub.HSourceInterID +
+ // "," + oSub.HSourceEntryID +
+ // ",'" + oSub.HSourceBillNo +
+ // "','" + oSub.HSourceBillType +
+ // "'," + oSub.HRelationQty +
+ // "," + oSub.HRelationMoney +
+ // "," + oSub.HWeekDay +
+ // "," + oSub.HSno +
+ // "," + oSub.HProjectID +
+ // "," + oSub.HProjectStageID +
+ // ",'" + oSub.HTaskNote +
+ // "'," + oSub.HPlanTimes +
+ // ")";
+ // oCn.RunProc(subSql);
+ //}
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏄剧ず鍗曟嵁
+ //public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ //{
+ // try
+ // {
+ // //鏌ヨ涓昏〃
+ // DataSet Ds ;
+ // Ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain Where HInterID = " + lngBillKey.ToString(), "PM_WorkReportWeekBillMain");
+ // if(Ds.Tables[0].Rows.Count==0)
+ // {
+ // sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ // return false;
+ // }
+
+ // //鍥哄畾璧嬪��===========================================
+ // omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ // omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ // omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ // omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ // omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ // omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ // omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ // omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ // omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ // omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ // omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ // omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ // omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ // omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ // omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ // omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ // omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ // omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ // omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ // omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ // omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ // omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ // omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ // omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ // omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ // //========================================================
+
+ // omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ // omodel.HWeek = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWeek"]);
+ // omodel.HBeginDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBeginDate"]);
+ // omodel.HEndDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HEndDate"]);
+ // omodel.HPlanEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPlanEmpID"]);
+
+ // //
+
+ // //寰幆
+ // DataSet DsSub ;
+ // DsSub = oCn.RunProcReturn("select * from PM_WorkTaskWeekBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "PM_WorkTaskWeekBillSub");
+ // DetailColl.Clear();//娓呯┖
+ // for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ // {
+ // Model.ClsPM_WorkTaskWeekBillSub oSub = new Model.ClsPM_WorkTaskWeekBillSub();
+ // // 鍥哄畾璧嬪��===============================================
+ // oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ // oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ // oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ // oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ // oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ // oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ // oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ // oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ // oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ // oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ // oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ // oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ // //===================================================
+ // oSub.HWeekDay = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWeekDay"]);
+ // oSub.HSno = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSno"]);
+ // oSub.HProjectID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProjectID"]);
+ // oSub.HProjectStageID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProjectStageID"]);
+ // oSub.HTaskNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTaskNote"]);
+ // oSub.HPlanTimes = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPlanTimes"]);
+
+ // DetailColl.Add(oSub);
+ // }
+ // sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ // return true;
+ // }
+ // catch (Exception e)
+ // {
+ // sReturn = e.Message;
+ // throw (e);
+ // }
+ //}
+ #endregion
+
+ }
+
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 8af6423..ab02a04 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -968,6 +968,8 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBillMain.cs" />
diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs"
new file mode 100644
index 0000000..6a34841
--- /dev/null
+++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillMain.cs"
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsPM_WorkReportWeekBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HOrgID; //int 组织
+ public Int64 HYear; //int 年份
+ public Int64 HWeek; //int 周
+ public string HBeginDate; //datetime 开始日期
+ public string HEndDate; //datetime 结束日期
+ public Int64 HReportEmpID; //int 总结人
+ public decimal HPlanTimes; // money --计划工时
+ public decimal HUseTimes; // money --消耗工时
+ public decimal HRelUseTimes; // money --有效工时
+ public decimal HDelayTasks; // money --延期任务
+ public decimal HFineTasks; // money --超前任务
+ public decimal HFinishRate; // money --达成率
+ public string HWorkReport; //varchar(1000) --工作总结
+ public string HNextPlan; //varchar(1000) --主导项目的下一步计划
+ public string HWorkGain; //varchar(1000) --工作心得
+ }
+}
diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillSub.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillSub.cs"
new file mode 100644
index 0000000..0222659
--- /dev/null
+++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkReportWeekBillSub.cs"
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsPM_WorkReportWeekBillSub : DBUtility.ClsXt_BaseBillMain
+ {
+
+ }
+}
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillController.cs"
index f2b849f..50485a6 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillController.cs"
@@ -20,6 +20,8 @@
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public DAL.ClsPM_WorkTaskWeekBill BillNew0 = new DAL.ClsPM_WorkTaskWeekBill(); //宸ヤ綔鍛ㄨ鍒掑搴斿崟鎹被
public DAL.ClsPM_WorkTaskWeekBill BillOld0 = new DAL.ClsPM_WorkTaskWeekBill(); //宸ヤ綔鍛ㄨ鍒掑搴斿崟鎹被
+ public DAL.ClsPM_WorkReportWeekBillMain BillNew = new DAL.ClsPM_WorkReportWeekBillMain(); //宸ヤ綔鍛ㄦ�荤粨瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsPM_WorkReportWeekBillMain BillOld = new DAL.ClsPM_WorkReportWeekBillMain(); //宸ヤ綔鍛ㄦ�荤粨瀵瑰簲鍗曟嵁绫�
#region 宸ヤ綔鍛ㄨ鍒� 瀛愯〃2-寰呮帓璁″垝 鏁版嵁鑾峰彇
@@ -880,5 +882,393 @@
}
}
#endregion
+
+ #region 宸ヤ綔鍛ㄦ�荤粨 閫夋嫨鎬荤粨浜哄甫鍑哄伐鏃�
+ [Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainList")]
+ [HttpGet]
+ public object PM_WorkReportWeekBillMainList(string HOrgID,string user,string HYear,string HWeek,string HBeginDate,string HEndDate)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ string sql = "exec h_p_PM_WorkReportWeekBillMain "+ HOrgID+","+ user+","+ HYear+","+ HWeek+",'"+ HBeginDate + "','"+ HEndDate + "'";
+ ds = oCn.RunProcReturn(sql, "h_p_PM_WorkReportWeekBillMain");
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈幏鍙栧埌鐩稿叧鏁版嵁锛�";
+ objJsonResult.data = null;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #region 宸ヤ綔鍛ㄦ�荤粨淇濆瓨/缂栬緫
+ /// <summary>
+ /// 淇濆瓨鐢熶骇棰嗘枡鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("PM_WorkTaskWeekBill/SavePM_WorkReportWeekBillMain")]
+ [HttpPost]
+ public object SavePM_WorkReportWeekBillMain([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();
+ string refSav = sArray[1].ToString(); //鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Add", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsPM_WorkReportWeekBillMain oBill = new DAL.ClsPM_WorkReportWeekBillMain();
+ List<Model.ClsPM_WorkReportWeekBillMain> lsmain = new List<Model.ClsPM_WorkReportWeekBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_PM_WorkReportWeekBillMain(msg2);
+ foreach (Model.ClsPM_WorkReportWeekBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4757";
+ oItem.HBillSubType = "4757";
+
+ //oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヤ綔鍛ㄦ�荤粨 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain")]
+ [HttpGet]
+ public object CheckSc_ICMOReportBill(string HInterID, int IsAudit, string user)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID=" + HInterID, "PM_WorkReportWeekBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCn.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ #region 宸ヤ綔鍛ㄦ�荤粨 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("PM_WorkTaskWeekBill/ClosePM_WorkReportWeekBillMain")]
+ [HttpGet]
+ public object ClosePM_WorkReportWeekBillMain(string HInterID, int IsAudit, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ var ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID=" + HInterID, "PM_WorkReportWeekBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCn.Commit();
+
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index e518643..b39b6f6 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -969,6 +969,17 @@
List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString);
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板鍛ㄦ�荤粨琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsPM_WorkReportWeekBillMain> getObjectByJson_PM_WorkReportWeekBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsPM_WorkReportWeekBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkReportWeekBillMain>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄤ富琛ㄧ殑json
--
Gitblit v1.9.1