From e6e805f9c46f41b50f4a556732f618ffdb7b4e69 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期二, 18 三月 2025 15:35:31 +0800 Subject: [PATCH] 生产领料单 --- BLL/bin/Release/DAL.dll | 0 WebAPI/WebAPI.csproj.user | 2 DAL/bin/Release/Model.dll | 0 Model/Model.csproj | 2 DAL/仓库管理/ClsKf_ProductReceiveMaterialBill.cs | 378 +++++++++++++++ WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 20 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0 DAL/bin/Release/DAL.pdb | 0 BLL/bin/Release/Model.dll | 0 BLL/bin/Release/BLL.dll | 0 BLL/bin/Release/DAL.pdb | 0 BLL/bin/Release/Model.pdb | 0 DAL/bin/Release/DAL.dll | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 DAL/bin/Release/Model.pdb | 0 Model/obj/Release/Model.dll | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 WebAPI/Controllers/仓存管理/生产领料/Kf_ProductReceiveMaterialBillController.cs | 945 +++++++++++++++++++++++++++++++++++++++ Model/obj/Release/Model.pdb | 0 BLL/bin/Release/BLL.pdb | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 Model/obj/Release/Model.csproj.AssemblyReference.cache | 0 Model/bin/Release/Model.pdb | 0 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0 Model/bin/Release/Model.dll | 0 Model/生产管理/生产领料/ClsKf_ProductReceiveMaterialBillMain.cs | 14 WebAPI/ListModels.cs | 15 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 DAL/DAL.csproj | 1 Model/生产管理/生产领料/ClsKf_ProductReceiveMaterialBillSub.cs | 24 + WebAPI/WebAPI.csproj | 1 31 files changed, 1,391 insertions(+), 11 deletions(-) diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll index 5522739..cba8992 100644 --- a/BLL/bin/Release/BLL.dll +++ b/BLL/bin/Release/BLL.dll Binary files differ diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb index d11594b..2ee4fae 100644 --- a/BLL/bin/Release/BLL.pdb +++ b/BLL/bin/Release/BLL.pdb Binary files differ diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll index dd4d108..7f4c1a4 100644 --- a/BLL/bin/Release/DAL.dll +++ b/BLL/bin/Release/DAL.dll Binary files differ diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb index 08e88c9..ab47acd 100644 --- a/BLL/bin/Release/DAL.pdb +++ b/BLL/bin/Release/DAL.pdb Binary files differ diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll index 57f51a6..a6a61e8 100644 --- a/BLL/bin/Release/Model.dll +++ b/BLL/bin/Release/Model.dll Binary files differ diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb index e32cd5d..8cb1505 100644 --- a/BLL/bin/Release/Model.pdb +++ b/BLL/bin/Release/Model.pdb Binary files differ diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj index 652edd6..9331963 100644 --- a/DAL/DAL.csproj +++ b/DAL/DAL.csproj @@ -80,6 +80,7 @@ <ItemGroup> <Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" /> <Compile Include="APS\ClsSc_ICMOChangeBill.cs" /> + <Compile Include="浠撳簱绠$悊\ClsKf_ProductReceiveMaterialBill.cs" /> <Compile Include="鐢熶骇绠$悊\ClsSc_ShiftsBeginInfoBill.cs" /> <Compile Include="ClsPay_AbsentBill.cs" /> <Compile Include="ClsPay_EarlyLateErrBill.cs" /> diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll index dd4d108..7f4c1a4 100644 --- a/DAL/bin/Release/DAL.dll +++ b/DAL/bin/Release/DAL.dll Binary files differ diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb index 08e88c9..ab47acd 100644 --- a/DAL/bin/Release/DAL.pdb +++ b/DAL/bin/Release/DAL.pdb Binary files differ diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll index 57f51a6..a6a61e8 100644 --- a/DAL/bin/Release/Model.dll +++ b/DAL/bin/Release/Model.dll Binary files differ diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb index e32cd5d..8cb1505 100644 --- a/DAL/bin/Release/Model.pdb +++ b/DAL/bin/Release/Model.pdb Binary files differ diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs" new file mode 100644 index 0000000..2798b32 --- /dev/null +++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs" @@ -0,0 +1,378 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace DAL +{ + public class ClsKf_ProductReceiveMaterialBill : DBUtility.ClsXt_BaseBill + { + public Model.ClsKf_ProductReceiveMaterialBillMain omodel = new Model.ClsKf_ProductReceiveMaterialBillMain(); + public List<Model.ClsKf_ProductReceiveMaterialBillSub> DetailColl = new List<Model.ClsKf_ProductReceiveMaterialBillSub>(); + + public ClsKf_ProductReceiveMaterialBill() + { + base.MvarItemKeySub = "Kf_ProductReceiveMaterialBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey= "Kf_ProductReceiveMaterialBillMain"; + base.MvarReportTitle="鐢熶骇棰嗘枡鍗�"; + base.BillType="1256"; + base.HBillSubType = "1256"; + + } + + #region 鍥哄畾浠g爜 + + ~ClsKf_ProductReceiveMaterialBill() + { + DetailColl = null; + } + + #endregion 鑷畾涔夋柟娉� + + + + + + //鍒犻櫎鍏宠仈 + public override void DeleteRelation(ref string sReturn, Int64 lngBillKey) + { + + } + + //鏂板鍏宠仈 + public override void AddNewRelation(ref string sReturn, Int64 lngBillKey) + { + + } + + + + //淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //淇濆瓨鍓嶆帶鍒�========================================= + string HBillNote = ""; + DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_ProductReceiveMaterialBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_ProductReceiveMaterialBill_BeforeSaveCtrl"); + if (ds == null) + { + sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒"; + return false; + } + if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0") + { + sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + return false; + } + //========================================================= + + + // + oCn.BeginTran(); + //鏇存柊涓昏〃 + oCn.RunProc("UpDate Kf_ProductReceiveMaterialBillMain set " + + " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��=============== + ",HDate='" + omodel.HDate + "'" + + ",HYear='" + omodel.HYear + "'" + + ",HPeriod='" + omodel.HPeriod + "'" + + ",HRemark='" + omodel.HRemark + "'" + + ",HUpDater='" + omodel.HUpDater + "'" + + ",HUpDateDate=getdate()" + + //======================================== + ",HDeptID=" + omodel.HDeptID + "" + + ",HEmpID=" + omodel.HEmpID + "" + + ",HKeeperID=" + omodel.HKeeperID + "" + + " where HInterID=" + lngBillKey + ); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + //鎻掑叆瀛愯〃 + foreach (Model.ClsKf_ProductReceiveMaterialBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Kf_ProductReceiveMaterialBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HUnitID,HQtyMust,HQty,HWHID,HSCWHID,HSPID,HSCSPID" + + ",HSPGroupID,HBatchNo,HPropertyID,HSecUnitID" + + ") " + + " values(" + + "" + omodel.HInterID.ToString() + "" + + "," + oSub.HEntryID.ToString() + "" + + ",'" + oSub.HCloseMan + "'" + + ",'" + oSub.HEntryCloseDate.ToShortDateString() + "'" + + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + "" + + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "" + + "," + oSub.HSourceEntryID.ToString() + "" + + ",'" + oSub.HSourceBillNo + "'" + + ",'" + oSub.HSourceBillType + "'" + + "," + oSub.HRelationQty.ToString() + "" + + "," + oSub.HRelationMoney.ToString() + + + "," + oSub.HMaterID.ToString() + "" + + "," + oSub.HUnitID.ToString() + "" + + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "" + + "," + oSub.HWHID.ToString() + "" + + "," + oSub.HSCWHID.ToString() + "" + + "," + oSub.HSPID.ToString() + + "," + oSub.HSCSPID.ToString() + "" + + "," + oSub.HSPGroupID.ToString() + "" + + ",'" + oSub.HBatchNo + "'" + + "," + oSub.HPropertyID.ToString() + "" + + "," + oSub.HSecUnitID.ToString() + "" + + ") "); + } + //鏇存柊璁㈠崟鍏宠仈鏁伴噺 + AddNewRelation(ref sReturn, omodel.HInterID); + //鎺у埗鍏宠仈鏁伴噺 + + //=========================淇濆瓨鍚庢帶鍒� + DataSet ds2 = oCn.RunProcReturn("h_p_Kf_ProductReceiveMaterialBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_YS_ReceiveBill_AfterSaveCtrl"); + if (ds2 == null) + { + sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒"; + oCn.RollBack(); + return false; + } + if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0") + { + sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]); + oCn.RollBack(); + return false; + } + //============================ + + // + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + while (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew)) + { + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + } + + //淇濆瓨鍓嶆帶鍒�========================================= + string HBillNote = ""; + DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_ProductReceiveMaterialBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_ProductReceiveMaterialBill_BeforeSaveCtrl"); + if (ds == null) + { + sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒"; + return false; + } + if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0") + { + sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + return false; + } + //========================================================= + + oCn.BeginTran(); + //涓昏〃 + oCn.RunProc("Insert Into Kf_ProductReceiveMaterialBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + + ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + + ",HEmpID,HDeptID,HKeeperID,HOrgID) " + + " values(" + + "'" + this.BillType + "'" + + ",'" + this.HBillSubType + "'" + + "," + omodel.HInterID.ToString() + "" + + ",'" + omodel.HBillNo + "'" + + ",'" + omodel.HDate + "'" + + "," + omodel.HMainSourceInterID + "" + + "," + omodel.HMainSourceEntryID + "" + + ",'" + omodel.HMainSourceBillNo + "'" + + ",'" + omodel.HMainSourceBillType + "'" + + ", " + omodel.HYear.ToString() + "" + + "," + omodel.HPeriod.ToString() + "" + + ",'" + omodel.HRemark + "'" + + ",'" + omodel.HMaker + "'" + + ",getdate()" + + "," + omodel.HEmpID + "" + + "," + omodel.HDeptID + "" + + "," + omodel.HKeeperID + "" + + "," + omodel.HOrgID + "" + + ") "); + //鎻掑叆瀛愯〃 + foreach (Model.ClsKf_ProductReceiveMaterialBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Kf_ProductReceiveMaterialBillSub " + + " (HInterID,HEntryID,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HUnitID,HQtyMust,HQty,HWHID,HSCWHID,HSPID,HSCSPID" + + ",HSPGroupID,HBatchNo,HPropertyID,HSecUnitID" + + ") " + + " values(" + + "" + omodel.HInterID.ToString() + "" + + "," + oSub.HEntryID.ToString() + "" + + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "" + + "," + oSub.HSourceEntryID.ToString() + "" + + ",'" + oSub.HSourceBillNo + "'" + + ",'" + oSub.HSourceBillType + "'" + + "," + oSub.HRelationQty.ToString() + "" + + "," + oSub.HRelationMoney.ToString() + + + "," + oSub.HMaterID.ToString() + "" + + "," + oSub.HUnitID.ToString() + "" + + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "" + + "," + oSub.HWHID.ToString() + "" + + "," + oSub.HSCWHID.ToString() + "" + + "," + oSub.HSPID.ToString() + + "," + oSub.HSCSPID.ToString() + "" + + "," + oSub.HSPGroupID.ToString() + "" + + ",'" + oSub.HBatchNo + "'" + + "," + oSub.HPropertyID.ToString() + "" + + "," + oSub.HSecUnitID.ToString() + "" + + ") "); + } + //鏇存柊璁㈠崟鍏宠仈鏁伴噺 + AddNewRelation(ref sReturn, omodel.HInterID); + //鎺у埗鍏宠仈鏁伴噺 + // + + //=========================淇濆瓨鍚庢帶鍒� + DataSet ds2 = oCn.RunProcReturn("h_p_Kf_ProductReceiveMaterialBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_ProductReceiveMaterialBill_AfterSaveCtrl"); + if (ds2 == null) + { + sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒"; + oCn.RollBack(); + return false; + } + if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0") + { + sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]); + oCn.RollBack(); + return false; + } + //============================ + + + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds ; + Ds = oCn.RunProcReturn("Select * from Kf_ProductReceiveMaterialBillMain Where HInterID=" + lngBillKey.ToString(), "Kf_ProductReceiveMaterialBillMain"); + if(Ds.Tables[0].Rows.Count==0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + //鍥哄畾璧嬪��=========================================== + omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]); + 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.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]); + omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]); + omodel.HKeeperID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HKeeperID"]); + // + + //寰幆 + DataSet DsSub ; + DsSub = oCn.RunProcReturn("Select * from Kf_ProductReceiveMaterialBillSub Where HInterID=" + lngBillKey.ToString(), "Kf_ProductReceiveMaterialBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsKf_ProductReceiveMaterialBillSub oSub = new Model.ClsKf_ProductReceiveMaterialBillSub(); + // 鍥哄畾璧嬪��=============================================== + 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.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]); + oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]); + oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]); + oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]); + oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]); + oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]); + oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]); + oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]); + + oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]); + oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]); + oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]); + oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]); + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + } +} diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache index c8e38ea..ccfe06d 100644 --- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache +++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache Binary files differ diff --git a/Model/Model.csproj b/Model/Model.csproj index 69d70da..a533e37 100644 --- a/Model/Model.csproj +++ b/Model/Model.csproj @@ -157,6 +157,8 @@ <Compile Include="鐢熶骇绠$悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" /> <Compile Include="鐢熶骇绠$悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillSub.cs" /> <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" /> + <Compile Include="鐢熶骇绠$悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillMain.cs" /> + <Compile Include="鐢熶骇绠$悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillSub.cs" /> <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" /> <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" /> <Compile Include="璁″垝绠$悊\ClsGy_SourceMouldBillMain.cs" /> diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll index 57f51a6..a6a61e8 100644 --- a/Model/bin/Release/Model.dll +++ b/Model/bin/Release/Model.dll Binary files differ diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb index e32cd5d..8cb1505 100644 --- a/Model/bin/Release/Model.pdb +++ b/Model/bin/Release/Model.pdb Binary files differ diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache index 0fd2606..7dfc973 100644 --- a/Model/obj/Release/Model.csproj.AssemblyReference.cache +++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache Binary files differ diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll index 57f51a6..a6a61e8 100644 --- a/Model/obj/Release/Model.dll +++ b/Model/obj/Release/Model.dll Binary files differ diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb index e32cd5d..8cb1505 100644 --- a/Model/obj/Release/Model.pdb +++ b/Model/obj/Release/Model.pdb Binary files differ diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillMain.cs" new file mode 100644 index 0000000..5fc244b --- /dev/null +++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillMain.cs" @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsKf_ProductReceiveMaterialBillMain : DBUtility.ClsXt_BaseBillMain + { + public Int64 HEmpID; //业务员 + public Int64 HDeptID; //部门 + public Int64 HKeeperID; //仓管员 + public Int64 HOrgID; + } +} diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillSub.cs" new file mode 100644 index 0000000..69421c9 --- /dev/null +++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/ClsKf_ProductReceiveMaterialBillSub.cs" @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsKf_ProductReceiveMaterialBillSub : DBUtility.ClsXt_BaseBillSub + { + public Int64 HMaterID; // int --物料ID + public Int64 HUnitID; // int --计量单位 + public double HQtyMust; // dec(18,8) --应领数量 + public double HQty; // dec(18,8) --实领数量 + public Int64 HWHID; // int --收料仓库 + public Int64 HSCWHID; // int --调出仓库ID + public Int64 HSPID; // int --仓位ID + public Int64 HSCSPID; // int --调出仓位ID + + + public Int64 HPropertyID; // int --辅助属性 + public Int64 HSecUnitID; // int --辅助计量单位 + public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出) + public string HBatchNo; // varchar(50) --批次 + } +} diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache index 76d55a8..415cb72 100644 --- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache +++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache Binary files differ diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillController.cs" new file mode 100644 index 0000000..cb9f2de --- /dev/null +++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillController.cs" @@ -0,0 +1,945 @@ +锘縰sing Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Net; +using System.Web.Http; +using System.Windows.Forms; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //鍑洪棬纭鍗旵ontroller + public class Kf_ProductReceiveMaterialBillController : ApiController + { + //鑾峰彇绯荤粺鍙傛暟 + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + public DAL.ClsKf_ProductReceiveMaterialBill BillOld = new DAL.ClsKf_ProductReceiveMaterialBill(); + public DAL.ClsKf_ProductReceiveMaterialBill BillNew0 = new DAL.ClsKf_ProductReceiveMaterialBill(); + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + #region 鐢熶骇棰嗘枡鍗曞垪琛� 鏌ヨ + /// <summary> + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Kf_ProductReceiveMaterialBill/list")] + [HttpGet] + public object getKf_ProductReceiveMaterialBill(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Kf_ProductReceiveMaterialBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Kf_ProductReceiveMaterialBillList_Query order by 鍗曟嵁鍙� desc", "h_v_Kf_ProductReceiveMaterialBillList_Query"); + } + else + { + string sql1 = "select * from h_v_Kf_ProductReceiveMaterialBillList_Query where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc"; + ds = oCN.RunProcReturn(sql, "h_v_Kf_ProductReceiveMaterialBillList_Query"); + } + + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇棰嗘枡鍗曚繚瀛� 鏂板/缂栬緫 + [Route("Kf_ProductReceiveMaterialBill/SaveKf_ProductReceiveMaterialBill")] + [HttpPost] + public object SaveXs_OutDoorBill([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 msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁 + string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡 + string msg4 = sArray[3].ToString(); //鐢ㄦ埛 + + DBUtility.ClsPub.CurUserName = msg4; + + string UserName = ""; + string s = ""; + ListModels oListModels = new ListModels(); + try + { + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Kf_ProductReceiveMaterialBill_Edit", 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + DAL.ClsKf_ProductReceiveMaterialBill oBill = new DAL.ClsKf_ProductReceiveMaterialBill(); + List<Model.ClsKf_ProductReceiveMaterialBillMain> lsmain = new List<Model.ClsKf_ProductReceiveMaterialBillMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Kf_ProductReceiveMaterialBillMain(msg2); + foreach (Model.ClsKf_ProductReceiveMaterialBillMain oItem in lsmain) + { + if (refSav == "Add") + { + //鍗曟嵁鍙锋槸鍚﹂噸澶� + if (BillNew0.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; + } + } + + oItem.HMaker = msg4; + oItem.HUpDater = msg4; + + if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + oBill.omodel = oItem; + } + + + //琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + //msg2 = msg2.Replace("'", "鈥�"); + List<Model.ClsKf_ProductReceiveMaterialBillSub> ls = new List<Model.ClsKf_ProductReceiveMaterialBillSub>(); + ls = oListModels.getObjectByJson_Kf_ProductReceiveMaterialBillSub(msg3); + int i = 0; + foreach (Model.ClsKf_ProductReceiveMaterialBillSub oItemSub in ls) + { + i++; + oItemSub.HEntryID = i; + + //oItemSub.HCloseMan = ""; //琛屽叧闂� + //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + //oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 + //oItemSub.HRemark = ""; //澶囨敞 + + //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮� + //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮� + //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿 + //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷 + //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺 + //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦 + oBill.DetailColl.Add(oItemSub); + + } + + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (refSav == "Add") + { + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + 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("Kf_ProductReceiveMaterialBill/cx")] + [HttpGet] + public object cx(long HInterID) + { + try + { + ds = oCN.RunProcReturn("select * from h_v_Kf_ProductReceiveMaterialBillList_Edit where hmainid=" + HInterID, "h_v_Kf_ProductReceiveMaterialBillList_Edit"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇棰嗘枡鍗� 鍒犻櫎 + /// <summary> + ///鍙傛暟锛歴tring HInterID銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Kf_ProductReceiveMaterialBill/delete")] + [HttpGet] + public object deleteKf_ProductReceiveMaterialBill(string HInterID, string user) + { + try + { + string s = ""; + + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Kf_ProductReceiveMaterialBill_Drop", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (HInterID == null || HInterID.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + if (BillOld.ShowBill(long.Parse(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; + } + + //鍒犻櫎鍓嶆帶鍒�========================================= + string sql1 = "exec h_p_Kf_ProductReceiveMaterialBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Kf_ProductReceiveMaterialBill_BeforeDelCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + objJsonResult.data = null; + return objJsonResult; + } + + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + return objJsonResult; + } + //================================================================================== + + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + oCN.BeginTran(); + + oCN.RunProc("delete from Kf_ProductReceiveMaterialBillMain where HInterID = " + HInterID); + oCN.RunProc("delete from Kf_ProductReceiveMaterialBillSub where HInterID= " + HInterID); + + //鍒犻櫎鍚庢帶鍒�================================================================================== + string sql2 = "exec h_p_Kf_ProductReceiveMaterialBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql2, "h_p_Kf_ProductReceiveMaterialBill_AfterDelCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + s = ds.Tables[0].Rows[0]["HRemark"].ToString(); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + //============================================================================================== + + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇棰嗘枡鍗� 瀹℃牳/鍙嶅鏍� + /// <summary> + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param> + /// <param name="CurUserName">瀹℃牳浜�</param> + /// <returns></returns> + [Route("Kf_ProductReceiveMaterialBill/AuditKf_ProductReceiveMaterialBill")] + [HttpGet] + public object AuditKf_ProductReceiveMaterialBill(int HInterID, int IsAudit, string CurUserName) + { + string ModRightNameCheck = "Kf_ProductReceiveMaterialBill_Check"; + DBUtility.ClsPub.CurUserName = CurUserName; + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + //HInterID鏁版嵁鍒ゆ柇 + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsKf_ProductReceiveMaterialBill oBill = new DAL.ClsKf_ProductReceiveMaterialBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + if (oBill.omodel.HCloseMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HDeleteMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (IsAudit == 0) //瀹℃牳鍒ゆ柇 + { + if (oBill.omodel.HChecker.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍稿垽鏂� + { + if (oBill.omodel.HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + + //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣� + if (IsAudit == 0) //瀹℃牳鎻愪氦 + { + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + string s = ""; + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + //瀹℃牳鍓嶆帶鍒�========================================= + string sql1 = "exec h_p_Kf_ProductReceiveMaterialBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Kf_ProductReceiveMaterialBill_BeforeCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + objJsonResult.data = null; + return objJsonResult; + } + + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + return objJsonResult; + } + //================================================================================== + + oCN.BeginTran(); + + //瀹℃牳鎻愪氦 + if (oBill.CheckBill(oCN,oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductReceiveMaterialBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍告彁浜� + { + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + string s = ""; + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + //鍙嶅鏍稿墠鎺у埗========================================= + string sql1 = "exec h_p_Kf_ProductReceiveMaterialBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Kf_ProductReceiveMaterialBill_BeforeUnCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�"; + objJsonResult.data = null; + return objJsonResult; + + } + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + return objJsonResult; + } + //=========================================================== + + oCN.BeginTran(); + + //鍙嶅鏍告彁浜bandonCheck + if (oBill.AbandonCheck(oCN,oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductReceiveMaterialBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇棰嗘枡鍗� 鍏抽棴/鍙嶅叧闂� + /// <summary> + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param> + /// <param name="CurUserName">鍏抽棴浜�</param> + /// <returns></returns> + [Route("Kf_ProductReceiveMaterialBill/CloseKf_ProductReceiveMaterialBill")] + [HttpGet] + public object CloseKf_ProductReceiveMaterialBill(int HInterID, int IsAudit, string CurUserName) + { + string ModRightNameCheck = "Kf_ProductReceiveMaterialBill_Close"; + DBUtility.ClsPub.CurUserName = CurUserName; + try + { + //妫�鏌ユ潈闄� + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + //HInterID鏁版嵁鍒ゆ柇 + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsKf_ProductReceiveMaterialBill oBill = new DAL.ClsKf_ProductReceiveMaterialBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + if (oBill.omodel.HDeleteMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + if (oBill.omodel.HCloseMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂垽鏂� + { + if (oBill.omodel.HCloseMan.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + + //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣� + if (IsAudit == 0) //鍏抽棴鎻愪氦 + { + //鍏抽棴鎻愪氦 + if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍏抽棴鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂彁浜� + { + //鍙嶅叧闂彁浜� + if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅叧闂垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇棰嗘枡鍗� 浣滃簾/鍙嶄綔搴� + /// <summary> + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param> + /// <param name="CurUserName">浣滃簾浜�</param> + /// <returns></returns> + [Route("Kf_ProductReceiveMaterialBill/DeleteKf_ProductReceiveMaterialBill")] + [HttpGet] + public object DeleteXs_OutDoorBill(int HInterID, int IsAudit, string CurUserName) + { + string ModRightNameCheck = "Kf_ProductReceiveMaterialBill_Delete"; + DBUtility.ClsPub.CurUserName = CurUserName; + try + { + //妫�鏌ユ潈闄� + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + //HInterID鏁版嵁鍒ゆ柇 + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsKf_ProductReceiveMaterialBill oBill = new DAL.ClsKf_ProductReceiveMaterialBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + if (oBill.omodel.HChecker.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (IsAudit == 0) //浣滃簾鍒ゆ柇 + { + if (oBill.omodel.HDeleteMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶄綔搴熷垽鏂� + { + if (oBill.omodel.HDeleteMan.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + + //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣� + if (IsAudit == 0) //浣滃簾鎻愪氦 + { + //浣滃簾鎻愪氦 + if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "浣滃簾鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂彁浜� + { + //鍙嶅叧闂彁浜� + if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶄綔搴熸垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } +} \ No newline at end of file diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index f263833..42ae97f 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -4365,6 +4365,21 @@ } #endregion + #region 鐢熶骇棰嗘枡鍗� + public List<Model.ClsKf_ProductReceiveMaterialBillMain> getObjectByJson_Kf_ProductReceiveMaterialBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_ProductReceiveMaterialBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_ProductReceiveMaterialBillMain>>(jsonString); + return list; + } + public List<Model.ClsKf_ProductReceiveMaterialBillSub> getObjectByJson_Kf_ProductReceiveMaterialBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsKf_ProductReceiveMaterialBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_ProductReceiveMaterialBillSub>>(jsonString); + return list; + } + #endregion + #region 搴旀敹閫�娆惧崟 /// <summary> /// 搴旀敹閫�娆惧崟涓昏〃json diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user index e87883b..ab385ce 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2025-03-17T02:11:14.6470706Z;True|2025-03-17T10:03:51.1716181+08:00;False|2025-03-17T10:02:54.2571011+08:00;True|2025-03-16T01:49:52.0549624+08:00;True|2025-03-16T01:15:26.5678889+08:00;True|2025-03-15T22:32:55.1624856+08:00;False|2025-03-15T22:32:12.1582831+08:00;True|2025-03-15T16:59:27.9224732+08:00;True|2025-03-15T15:02:57.9458086+08:00;False|2025-03-15T15:02:14.8644989+08:00;True|2025-03-14T16:28:39.3301163+08:00;True|2025-03-14T15:56:55.3276303+08:00;False|2025-03-14T15:56:21.1591704+08:00;True|2025-03-13T14:30:17.1293193+08:00;True|2025-03-13T09:44:50.4321668+08:00;False|2025-03-13T09:44:21.4219005+08:00;True|2025-03-12T13:14:18.0692769+08:00;True|2025-03-12T13:11:11.5286769+08:00;False|2025-03-12T13:10:47.5302738+08:00;True|2025-03-10T14:27:53.0504459+08:00;True|2025-03-10T13:10:05.6451533+08:00;True|2025-03-10T10:40:24.9926382+08:00;True|2025-03-10T09:42:59.8578407+08:00;True|2025-03-10T09:37:28.8298662+08:00;True|2025-03-10T09:28:48.1090869+08:00;True|2025-03-10T09:08:51.1700307+08:00;True|2025-03-10T08:44:58.8887514+08:00;True|2025-03-10T08:29:40.9075998+08:00;False|2025-03-10T08:29:16.5385466+08:00;True|2025-03-07T16:05:55.2698079+08:00;False|2025-03-07T16:05:14.9084493+08:00;True|2025-03-03T09:00:08.3573604+08:00;False|2025-03-03T08:59:34.0142263+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> + <History>True|2025-03-17T13:41:27.0789720Z;True|2025-03-17T17:00:19.5251130+08:00;True|2025-03-17T16:08:43.6307527+08:00;True|2025-03-17T10:11:14.6470706+08:00;True|2025-03-17T10:03:51.1716181+08:00;False|2025-03-17T10:02:54.2571011+08:00;True|2025-03-16T01:49:52.0549624+08:00;True|2025-03-16T01:15:26.5678889+08:00;True|2025-03-15T22:32:55.1624856+08:00;False|2025-03-15T22:32:12.1582831+08:00;True|2025-03-15T16:59:27.9224732+08:00;True|2025-03-15T15:02:57.9458086+08:00;False|2025-03-15T15:02:14.8644989+08:00;True|2025-03-14T16:28:39.3301163+08:00;True|2025-03-14T15:56:55.3276303+08:00;False|2025-03-14T15:56:21.1591704+08:00;True|2025-03-13T14:30:17.1293193+08:00;True|2025-03-13T09:44:50.4321668+08:00;False|2025-03-13T09:44:21.4219005+08:00;True|2025-03-12T13:14:18.0692769+08:00;True|2025-03-12T13:11:11.5286769+08:00;False|2025-03-12T13:10:47.5302738+08:00;True|2025-03-10T14:27:53.0504459+08:00;True|2025-03-10T13:10:05.6451533+08:00;True|2025-03-10T10:40:24.9926382+08:00;True|2025-03-10T09:42:59.8578407+08:00;True|2025-03-10T09:37:28.8298662+08:00;True|2025-03-10T09:28:48.1090869+08:00;True|2025-03-10T09:08:51.1700307+08:00;True|2025-03-10T08:44:58.8887514+08:00;True|2025-03-10T08:29:40.9075998+08:00;False|2025-03-10T08:29:16.5385466+08:00;True|2025-03-07T16:05:55.2698079+08:00;False|2025-03-07T16:05:14.9084493+08:00;True|2025-03-03T09:00:08.3573604+08:00;False|2025-03-03T08:59:34.0142263+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,19 +45,19 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>03/15/2025 16:59:11</publishTime> + <publishTime>03/17/2025 21:41:03</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>03/15/2025 16:59:11</publishTime> + <publishTime>03/17/2025 21:41:03</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>03/15/2025 16:59:09</publishTime> + <publishTime>03/17/2025 21:40:59</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>03/15/2025 16:59:09</publishTime> + <publishTime>03/17/2025 21:40:59</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>03/15/2025 16:59:04</publishTime> + <publishTime>03/17/2025 16:08:13</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>03/15/2025 16:59:04</publishTime> + <publishTime>03/17/2025 16:08:13</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -294,13 +294,13 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>03/17/2025 10:11:09</publishTime> + <publishTime>03/17/2025 21:41:17</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>03/17/2025 10:11:09</publishTime> + <publishTime>03/17/2025 21:41:17</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> - <publishTime>03/17/2025 10:11:14</publishTime> + <publishTime>03/17/2025 21:41:25</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 2fa82e3..8e8d206 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -453,6 +453,7 @@ <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" /> <Compile Include="Controllers\浜轰簨绠$悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\Kf_MoveStockBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" /> <Compile Include="Controllers\鍝佽川绠$悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" /> <Compile Include="Controllers\鍝佽川绠$悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillController.cs" /> <Compile Include="Controllers\鍝佽川绠$悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 9466ecd..7774d27 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -3,7 +3,7 @@ <PropertyGroup> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile> - <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> + <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index fa3f4c3..464faaf 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index 3bb089b..4418b39 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index fa3f4c3..464faaf 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index 3bb089b..4418b39 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ -- Gitblit v1.9.1