From 76db5c8151205847c56d07ebc4806eb0f0c4990d Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期二, 20 七月 2021 01:16:09 +0800 Subject: [PATCH] 报工平台、开工、停工、完工提交保存 --- WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 9 WebAPI/Models/ClsSc_ICMOReportBillSub.cs | 35 +++++ WebAPI/ListModels.cs | 8 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 137 ++++++++++--------- WebAPI/DLL/ClsSc_MESEndWorkBill.cs | 9 WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs | 9 WebAPI/DLL/ClsSc_MESStopWorkBill.cs | 7 WebAPI/DLL/ClsSc_ICMOReportBill.cs | 16 +- WebAPI/WebAPI.csproj | 2 WebAPI/Models/ClsSc_ICMOReportBillMain.cs | 19 ++ WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs | 6 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 145 +++++++++++++++++++- 12 files changed, 302 insertions(+), 100 deletions(-) diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs index 2fa0023..cc01042 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) { @@ -417,8 +417,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.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 +427,105 @@ 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 + ""); + return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp"); + } + #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(); + + string UserName = ""; + + 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); + foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain) + { + + //oItem.HMaker = ""; + UserName = oItem.HMaker; //鍒跺崟浜� + oItem.HBillType = "3711"; + oItem.HBillSubType = "3711"; + oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級 + oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + 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; + } + //瀛愯〃浣撴暟鎹� + + List<Models.ClsSc_ICMOReportBillSub> ls = new List<Models.ClsSc_ICMOReportBillSub>(); + ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg2); + int i = 0; + foreach (Models.ClsSc_ICMOReportBillSub oItemSub in ls) + { + + i++; + oItemSub.HEntryID = i; + + oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 + oBill.DetailColl.Add(oItemSub); + + } + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (oBill.omodel.HInterID == 0) + { + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + } + 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 @@ -515,7 +612,41 @@ } #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 } } diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs index 7dbf923..bf583a6 100644 --- a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs @@ -153,12 +153,12 @@ try { DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill(); - List<Model.ClsSc_ICMOReportBillMain> lsmain = new List<Model.ClsSc_ICMOReportBillMain>(); + List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2); - foreach (Model.ClsSc_ICMOReportBillMain oItem in lsmain) + foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain) { if (refSav == "Add") { @@ -212,6 +212,7 @@ UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "3711"; oItem.HBillSubType = "3711"; + oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級 //oItem.HBillNo = ""; //鍗曟嵁鍙� //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡 //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙� @@ -246,10 +247,10 @@ msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "鈥�"); - List<Model.ClsSc_ICMOReportBillSub> ls = new List<Model.ClsSc_ICMOReportBillSub>(); + List<Models.ClsSc_ICMOReportBillSub> ls = new List<Models.ClsSc_ICMOReportBillSub>(); ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg3); int i = 0; - foreach (Model.ClsSc_ICMOReportBillSub oItemSub in ls) + foreach (Models.ClsSc_ICMOReportBillSub oItemSub in ls) { i++; diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs index 57ff176..d42b486 100644 --- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs +++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs @@ -8,9 +8,9 @@ { public class ClsSc_ICMOReportBill:DBUtility.ClsXt_BaseBill { - public Model.ClsSc_ICMOReportBillMain omodel = new Model.ClsSc_ICMOReportBillMain(); - public Model.ClsSc_ICMOReportBillSub oSub = new Model.ClsSc_ICMOReportBillSub(); - public List<Model.ClsSc_ICMOReportBillSub> DetailColl = new List<Model.ClsSc_ICMOReportBillSub>(); + public Models.ClsSc_ICMOReportBillMain omodel = new Models.ClsSc_ICMOReportBillMain(); + public Models.ClsSc_ICMOReportBillSub oSub = new Models.ClsSc_ICMOReportBillSub(); + public List<Models.ClsSc_ICMOReportBillSub> DetailColl = new List<Models.ClsSc_ICMOReportBillSub>(); public ClsSc_ICMOReportBill() { @@ -64,7 +64,7 @@ DeleteBillSub(lngBillKey); //鎻掑叆瀛愯〃 omodel.HInterID = lngBillKey; - foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl) + foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ICMOReportBillSub " + " (HInterID,HEntryID,HMaterID,HMaterNumber" + @@ -156,7 +156,7 @@ "','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'"+ ") "); //鎻掑叆瀛愯〃 - foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl) + foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ICMOReportBillSub " + " (HInterID,HEntryID,HMaterID,HMaterNumber" + @@ -254,7 +254,7 @@ DetailColl.Clear();//娓呯┖ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) { - Model.ClsSc_ICMOReportBillSub oSub = new Model.ClsSc_ICMOReportBillSub(); + Models.ClsSc_ICMOReportBillSub oSub = new Models.ClsSc_ICMOReportBillSub(); // 鍥哄畾璧嬪��=============================================== oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); @@ -329,7 +329,7 @@ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + ") "); //鎻掑叆瀛愯〃 - foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl) + foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ICMOReportBillSub " + " (HInterID,HEntryID,HMaterID" + @@ -405,7 +405,7 @@ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HCheckType + "'" + ") "); //鎻掑叆瀛愯〃 - foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl) + foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ICMOReportBillSub " + " (HInterID,HEntryID,HMaterID" + diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs index 84737bf..7ae97e2 100644 --- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs +++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs @@ -156,24 +156,27 @@ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� oCn.BeginTran(); //涓昏〃 + oCn.RunProc("Insert Into Sc_MESBeginWorkBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + ",HYear,HPeriod,HRemark" + ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" + ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HBeginWorkTime,HSourceID" + - ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + ",HSourceInterID_Main,HSourceEntryID_Main,HSourceBillNo_Main,HSourceBillType_Main" + + ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" + + ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" + ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" + "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() + - ",'" + omodel.HMainSourceInterID.ToString() + "'," + omodel.HMainSourceEntryID.ToString() + "," + omodel.HMainSourceBillNo.ToString() + "," + omodel.HMainSourceBillType.ToString() + + ",'" + omodel.HMainSourceInterID.ToString() + "'," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "'" + + ",'" + omodel.HMainSourceInterID.ToString() + "'," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "'" + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + ") "); //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�) - oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork " + omodel.HInterID + "", "h_p_JIT_MESBeginWorkBill_BeginWork"); + oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='寮�宸�'", "h_p_JIT_MESBeginWorkBill_BeginWork"); sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; oCn.Commit(); return true; diff --git a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs index df4f15a..48b7999 100644 --- a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs +++ b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs @@ -177,12 +177,13 @@ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + - "," + omodel.HSourceInterID_Main.ToString() + "," + omodel.HSourceEntryID_Main.ToString() + "," + omodel.HSourceBillNo_Main.ToString() + ",'" + omodel.HSourceBillType_Main + "'" + - "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + "," + omodel.HMainSourceBillNo.ToString() + ",'" + omodel.HMainSourceBillType + "'" + + "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" + + "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" + "," + omodel.HQty.ToString() + "," + omodel.HBadCount.ToString() + "," + omodel.HWasterQty.ToString() + "," + omodel.HWasterQty2.ToString() + "," + omodel.HSelfBadCount.ToString() + "," + omodel.HPieceQty.ToString() + ") "); - - + + //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 瀹屽伐鐘舵��(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪瀹屽伐鐘舵�侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄畬宸ョ姸鎬�) + oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='瀹屽伐'", "h_p_JIT_MESBeginWorkBill_BeginWork"); sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; oCn.Commit(); return true; diff --git a/WebAPI/DLL/ClsSc_MESStopWorkBill.cs b/WebAPI/DLL/ClsSc_MESStopWorkBill.cs index 9e06f75..9176fc7 100644 --- a/WebAPI/DLL/ClsSc_MESStopWorkBill.cs +++ b/WebAPI/DLL/ClsSc_MESStopWorkBill.cs @@ -172,11 +172,12 @@ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate(),'" + omodel.HStopEndWorkTime.ToShortDateString() + "'," + omodel.HSourceID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HStopReason + "','" + omodel.HReportType + "','" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + - "," + omodel.HSourceInterID_Main.ToString() + "," + omodel.HSourceEntryID_Main.ToString() + "," + omodel.HSourceBillNo_Main.ToString() + ",'" + omodel.HSourceBillType_Main + "'" + - "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + "," + omodel.HMainSourceBillNo.ToString() + ",'" + omodel.HMainSourceBillType + "'" + + "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" + + "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" + ") "); //鎻掑叆瀛愯〃 - + //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 鍋滃伐鐘舵��(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪鍋滃伐鐘舵�侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄仠宸ョ姸鎬�) + oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='鍋滃伐'", "h_p_JIT_MESBeginWorkBill_BeginWork"); sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; oCn.Commit(); return true; diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index d765f8e..69a413a 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -997,10 +997,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_ICMOReportBillMain> getObjectByJson_Gy_ICMOReportBillMain(string jsonString) + public List<Models.ClsSc_ICMOReportBillMain> getObjectByJson_Gy_ICMOReportBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillMain>>(jsonString); + List<Models.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOReportBillMain>>(jsonString); return list; } @@ -1010,10 +1010,10 @@ /// </summary> /// <param name="jsonString"></param> /// <returns></returns> - public List<Model.ClsSc_ICMOReportBillSub> getObjectByJson_Gy_ICMOReportBillSub(string jsonString) + public List<Models.ClsSc_ICMOReportBillSub> getObjectByJson_Gy_ICMOReportBillSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; - List<Model.ClsSc_ICMOReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillSub>>(jsonString); + List<Models.ClsSc_ICMOReportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ICMOReportBillSub>>(jsonString); return list; } diff --git a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs new file mode 100644 index 0000000..306ef40 --- /dev/null +++ b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WebAPI.Models +{ + public class ClsSc_ICMOReportBillMain:DBUtility.ClsXt_BaseBillMain + { + public Int64 HEmpID; + public string HEmpNumber; + public Int64 HDeptID; + public string HDeptNumber; + public Int64 HGroupID; + public string HCheckType; + public Int64 HPrintQty; + public string HWorkShift; + + } +} diff --git a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs new file mode 100644 index 0000000..c9c468c --- /dev/null +++ b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WebAPI.Models +{ + public class ClsSc_ICMOReportBillSub:DBUtility.ClsXt_BaseBillSub + { + public Int64 HMaterID; + public string HMaterNumber; + public Int64 HUnitID; + public string HUnitNumber; + public double HQtyMust; + public double HQty; //数量 + public Int64 HWorkerID; + public string HWorkerNumber; + public Int64 HSourceID; + public Single HTimes; // + public string HRemark; + public double HBadCount; + public double HWasterQty; + public string HCloseMan; + public DateTime HEntryCloseDate; + public bool HCloseType; + // + public Int64 HICMOInterID; + public string HICMOBillNo; + public Int64 HSeOrderInterID; + public Int64 HSeOrderEntryID; + public string HSeOrderBillNo; + public string HSplitNO; + public string HBarCode; + public Int64 HBadQty; + } +} diff --git a/WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs b/WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs index 9f20bb2..b147f68 100644 --- a/WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs +++ b/WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs @@ -30,5 +30,11 @@ public String HAddr; public String HBarCodeMaker; public DateTime HBarCodeMakeDate; + + //public int HSourceInterID_Main; + //public int HSourceEntryID_Main; + //public string HSourceBillNo_Main; + //public string HSourceBillType_Main; + } } diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index e9f2669..457c2b0 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,11 +5,11 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-07-13T08:17:25.8407435Z;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> + <History>True|2021-07-19T16:29:27.1098794Z;True|2021-07-19T23:30:41.8355500+08:00;True|2021-07-19T22:17:01.7443804+08:00;True|2021-07-19T21:32:45.1169910+08:00;True|2021-07-19T21:25:24.2179852+08:00;True|2021-07-19T21:23:36.5861870+08:00;True|2021-07-19T19:58:01.7439489+08:00;True|2021-07-19T19:48:18.2964195+08:00;True|2021-07-19T14:21:10.2103543+08:00;True|2021-07-19T10:09:16.0181150+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -18,19 +18,19 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>06/30/2021 16:33:18</publishTime> + <publishTime>07/02/2021 16:55:02</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -48,22 +48,22 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>06/17/2021 23:18:55</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>07/12/2021 16:12:20</publishTime> + <publishTime>07/12/2021 18:14:19</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/21/2020 10:51:50</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -129,7 +129,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -162,10 +162,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>07/16/2021 16:50:37</publishTime> + <publishTime>07/20/2021 00:29:20</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>07/16/2021 16:50:37</publishTime> + <publishTime>07/20/2021 00:29:20</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -177,163 +177,166 @@ <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>06/30/2021 16:33:18</publishTime> + <publishTime>07/02/2021 16:55:02</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>06/17/2021 23:18:55</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/21/2020 10:51:50</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Global.asax"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="Index.html"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:15</publishTime> </File> <File Include="packages.config"> - <publishTime>01/21/2021 13:19:40</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/web.config"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/25/2021 14:18:16</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/18/2021 00:00:13</publishTime> + </File> + <File Include="Web References/WebS/Reference.map"> + <publishTime>07/18/2021 00:00:13</publishTime> </File> <File Include="Web.config"> - <publishTime>07/16/2021 16:50:44</publishTime> + <publishTime>07/20/2021 00:29:26</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index f5ae349..067a860 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -427,6 +427,8 @@ <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" /> <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> + <Compile Include="Models\ClsSc_ICMOReportBillMain.cs" /> + <Compile Include="Models\ClsSc_ICMOReportBillSub.cs" /> <Compile Include="Models\ClsSc_MESBeginWorkBillMain.cs" /> <Compile Include="Models\ClsSc_MESBeginWorkBillSub.cs" /> <Compile Include="Models\ClsSc_MESEndWorkBillMain.cs" /> -- Gitblit v1.9.1