From f212d34d050fcb7d368661ac3b90c956f1602ec9 Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期三, 07 四月 2021 17:36:44 +0800 Subject: [PATCH] 下推保存实现 --- WebAPI/Models/Sc_ProcessPlanViewModel.cs | 154 +++++++++++++++--------------- WebAPI/Controllers/Sc_ProcessMangementController.cs | 94 +++++++++++++----- WebAPI/Properties/PublishProfiles/API.pubxml.user | 6 3 files changed, 145 insertions(+), 109 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 2b9db17..a59fcc4 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -251,31 +251,50 @@ List<WebAPI.Models.Sc_ProcessPlanViewModel> ls = new List<WebAPI.Models.Sc_ProcessPlanViewModel>(); ls = oListModels.getObjectByJson_SendWorkSub(msg3); int i = 0; - Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub(); + List<Model.ClsSc_ProcessSendWorkSub> lss = new List<Model.ClsSc_ProcessSendWorkSub>(); foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls) { - - //foreach (var item in collection) - //{ - //} - //i++; - //if (oItemSub.HQty <= 0) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�"; - // objJsonResult.data = 1; - // return objJsonResult; - //} - //if (oItemSub.HQty > oItemSub.HRelationQty) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉鑳藉ぇ浜庢湭鍏宠仈鏁伴噺锛�"; - // objJsonResult.data = 1; - // return objJsonResult; - //} + i++; + Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub(); + sendworksub.HProcID = oItemSub.hprocid.Value;//--宸ュ簭ID + sendworksub.HProcPlanBillNo = oItemSub.宸ュ簭璁″垝鍗曞彿; //--宸ュ簭璁″垝鍗曞彿 + sendworksub.HProcPlanEntryID = oItemSub.hsubid.Value; //--宸ュ簭璁″垝鍗曞瓙ID + sendworksub.HProcPlanInterID = oItemSub.hmainid.Value; //--宸ュ簭璁″垝鍗旾D + sendworksub.HICMOInterID = oItemSub.hicmointerid.Value; //--浠诲姟鍗旾D + sendworksub.HICMOBillNo = oItemSub.浠诲姟鍗曞彿; //--浠诲姟鍗曞彿 + sendworksub.HSeOrderBillNo = oItemSub.閿�鍞鍗曞彿; //--閿�鍞鍗曞彿 + sendworksub.HSeOrderEntryID = oItemSub.閿�鍞鍗曞瓙ID.Value; //--閿�鍞瓙ID + sendworksub.HSeOrderInterID = oItemSub.閿�鍞鍗曚富ID.Value; //--閿�鍞鍗曚富ID + sendworksub.HPlanTimes = (float)oItemSub.璁″垝鍔犲伐鏃堕棿; //--璁″垝宸ユ椂 + sendworksub.HPlanEndDate = oItemSub.璁″垝瀹屽伐鏃ユ湡.Value; //--璁″垝瀹屽伐鏃ユ湡 + sendworksub.HPlanBeginDate = oItemSub.璁″垝寮�宸ユ棩鏈�.Value; //--璁″垝寮�宸ユ棩鏈� + sendworksub.HQty = (double)oItemSub.璁″垝鏁伴噺; //--娲惧伐鏁伴噺 + sendworksub.HWorkerNumber = oItemSub.鎿嶄綔鍛樹唬鐮�; //--鎿嶄綔宸ヤ唬鐮� + sendworksub.HWorkerID = oItemSub.HWorkerID.Value; //--鎿嶄綔宸D + sendworksub.HGroupNumber = oItemSub.鐝粍浠g爜; //鐝粍浠g爜 + sendworksub.HGroupID = oItemSub.HGroupID.Value; //--鐝粍ID + sendworksub.HSourceNumber = oItemSub.鐢熶骇璧勬簮; //--鐢熶骇璧勬簮浠g爜 + //--鐢熶骇璧勬簮ID + sendworksub.HProcNumber = oItemSub.宸ュ簭浠g爜; //--宸ュ簭浠g爜 + sendworksub.HRemark = oItemSub.琛ㄤ綋澶囨敞; //--澶囨敞 + + if (oItemSub.璁″垝鏁伴噺 <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + if (Convert.ToInt32( sendworksub.HQty) > Convert.ToInt32( oItemSub.璁″垝鏁伴噺)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾淳宸ユ暟閲忎笉鑳藉ぇ浜庤鍒掑崟鏁伴噺锛�"; + objJsonResult.data = 1; + return objJsonResult; + } //if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "") //{ // objJsonResult.code = "0"; @@ -285,14 +304,31 @@ // return objJsonResult; //} - //oItemSub.HEntryID = i; - //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); - //oItemSub.HRemark = ""; - //oItemSub.HCloseMan = ""; - //oItemSub.HCloseType = false; - //Sendwork.DetailColl.Add(oItemSub); + sendworksub.HEntryID = i; + sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + sendworksub.HRemark = ""; + sendworksub.HCloseMan = ""; + sendworksub.HCloseType = false; + sendworksub.HSourceBillType = oItemSub.HBillType; + lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲� + - + } + if (lss.Count > 0) + { + //鐒跺悗鍐嶅惊鐜繚瀛樺埌娲惧伐鍗曞瓙琛ㄧ殑闆嗗悎閲� + foreach (Model.ClsSc_ProcessSendWorkSub Itemsendwork in lss) + { + Sendwork.DetailColl.Add(Itemsendwork); + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0"; + objJsonResult.data = 1; + return objJsonResult; } //淇濆瓨 //淇濆瓨瀹屾瘯鍚庡鐞� diff --git a/WebAPI/Models/Sc_ProcessPlanViewModel.cs b/WebAPI/Models/Sc_ProcessPlanViewModel.cs index 23f5df8..c9612b7 100644 --- a/WebAPI/Models/Sc_ProcessPlanViewModel.cs +++ b/WebAPI/Models/Sc_ProcessPlanViewModel.cs @@ -7,83 +7,83 @@ { public class Sc_ProcessPlanViewModel { -// [hmainid], -//[鏃ユ湡], -// [鍗曟嵁鍙穄, -//[HMaterID], -// [鐗╂枡浠g爜], -//[鐗╂枡鍚嶇О], -//[瑙勬牸鍨嬪彿], -//[鍗曚綅], -//[hunitid], -//[璁¢噺鍗曚綅浠g爜], -//[璁¢噺鍗曚綅], -//[鐢熶骇鏁伴噺], -//[璁″垝寮�宸ユ棩鏈焆, -//[璁″垝瀹屽伐鏃ユ湡], -//[鎽樿], -//[琛ㄥご澶囨敞], -//[鍐呴儴鍗曟嵁鍙穄, -//[hicmointerid], -//[浠诲姟鍗曞彿], -//[鍒跺崟浜篯, -//[鍒跺崟鏃ユ湡], -//[瀹℃牳浜篯, -//[瀹℃牳鏃ユ湡], -//[淇敼浜篯, -//[淇敼鏃ユ湡], -//[鍏抽棴浜篯, -//[鍏抽棴鏃ユ湡], -// [鍏抽棴绫诲瀷], -//[浣滃簾浜篯, -// [浣滃簾鏃ユ湡], -//[hsubid], -// [宸ュ簭璁″垝鍗曞彿], -// [宸ュ簭鍙穄, -// [hprocid], -//[宸ュ簭浠g爜], -// [宸ュ簭], -//[鍔犲伐璇存槑], -//[寮�宸ュ浐澶, -// [寮�宸ュ浐鏁癩, -// [HCenterID], -// [宸ヤ綔涓績浠g爜], -// [宸ヤ綔涓績], -//[HDeptID], -//[鍔犲伐杞﹂棿浠g爜], -//[鍔犲伐杞﹂棿], -// [HGroupID], -//[鐝粍浠g爜], -//[鐝粍鍚嶇О], -//[HWorkerID], -//[鎿嶄綔鍛樹唬鐮乚, -//[鎿嶄綔鍛榏, -// [HSourceID], -//[璧勬簮浠g爜], -//[鐢熶骇璧勬簮], -//[璁″垝鏁伴噺], -//[鍏宠仈鏁伴噺], -//[鏃堕棿鍗曚綅], -//[璁″垝鍔犲伐鏃堕棿], -//[宸ュ簭璁″垝寮�宸ユ棩鏈焆, -//[宸ュ簭璁″垝瀹屽伐鏃ユ湡], -//[鍑嗗鏃堕棿], -//[鎺掗槦鏃堕棿], -//[杞Щ鏃堕棿], -//[琛ㄤ綋澶囨敞], -// [鎵规], -//[婧愬崟涓诲唴鐮乚, -//[婧愬崟瀛愬唴鐮乚, -//[婧愬崟鍗曞彿], -//[婧愬崟绫诲瀷], -//[閿�鍞鍗曚富ID], -//[閿�鍞鍗曞瓙ID], -//[閿�鍞鍗曞彿], -//[HBillType], -// [鍗曟嵁绫诲瀷], -//[HBillSubType], -//[HQtyDecimal], -// [HPriceDecimal] + public Int64? hmainid; // [hmainid], + public DateTime? 鏃ユ湡; //[鏃ユ湡], + public string 鍗曟嵁鍙�; // [鍗曟嵁鍙穄, + public Int64? HMaterID;//[HMaterID], + public string 鐗╂枡浠g爜; // [鐗╂枡浠g爜], + public string 鐗╂枡鍚嶇О;//[鐗╂枡鍚嶇О], + public string 瑙勬牸鍨嬪彿;//[瑙勬牸鍨嬪彿], + public string 鍗曚綅;//[鍗曚綅], + public Int64? hunitid;//[hunitid], + public string 璁¢噺鍗曚綅浠g爜;//[璁¢噺鍗曚綅浠g爜], + public string 璁¢噺鍗曚綅;//[璁¢噺鍗曚綅], + public decimal 鐢熶骇鏁伴噺;//[鐢熶骇鏁伴噺], + public DateTime? 璁″垝寮�宸ユ棩鏈�;//[璁″垝寮�宸ユ棩鏈焆, + public DateTime? 璁″垝瀹屽伐鏃ユ湡;//[璁″垝瀹屽伐鏃ユ湡], + public string 鎽樿;//[鎽樿], + public string 琛ㄥご澶囨敞;//[琛ㄥご澶囨敞], + public string 鍐呴儴鍗曟嵁鍙�;//[鍐呴儴鍗曟嵁鍙穄, + public Int64? hicmointerid;//[hicmointerid], + public string 浠诲姟鍗曞彿;//[浠诲姟鍗曞彿], + public string 鍒跺崟浜�;//[鍒跺崟浜篯, + public DateTime? 鍒跺崟鏃ユ湡;//[鍒跺崟鏃ユ湡], + public string 瀹℃牳浜�;//[瀹℃牳浜篯, + public DateTime? 瀹℃牳鏃ユ湡;//[瀹℃牳鏃ユ湡], + public string 淇敼浜�;//[淇敼浜篯, + public DateTime? 淇敼鏃ユ湡;//[淇敼鏃ユ湡], + public string 鍏抽棴浜�;//[鍏抽棴浜篯, + public DateTime? 鍏抽棴鏃ユ湡;//[鍏抽棴鏃ユ湡], + public bool 鍏抽棴绫诲瀷;// [鍏抽棴绫诲瀷], + public string 浣滃簾浜�;//[浣滃簾浜篯, + public DateTime? 浣滃簾鏃ユ湡;// [浣滃簾鏃ユ湡], + public Int64? hsubid;//[hsubid], + public string 宸ュ簭璁″垝鍗曞彿;// [宸ュ簭璁″垝鍗曞彿], + public Int64? 宸ュ簭鍙�;// [宸ュ簭鍙穄, + public Int64? hprocid;// [hprocid], + public string 宸ュ簭浠g爜;//[宸ュ簭浠g爜], + public string 宸ュ簭;// [宸ュ簭], + public string 鍔犲伐璇存槑;//[鍔犲伐璇存槑], + public decimal 寮�宸ュ浐澶�;//[寮�宸ュ浐澶, + public decimal 寮�宸ュ浐鏁�;// [寮�宸ュ浐鏁癩, + public Int64? HCenterID;// [HCenterID], + public string 宸ヤ綔涓績浠g爜;// [宸ヤ綔涓績浠g爜], + public string 宸ヤ綔涓績;// [宸ヤ綔涓績], + public Int64? HDeptID;//[HDeptID], + public string 鍔犲伐杞﹂棿浠g爜;//[鍔犲伐杞﹂棿浠g爜], + public string 鍔犲伐杞﹂棿;//[鍔犲伐杞﹂棿], + public Int64? HGroupID;// [HGroupID], + public string 鐝粍浠g爜;//[鐝粍浠g爜], + public string 鐝粍鍚嶇О;//[鐝粍鍚嶇О], + public Int64? HWorkerID;//[HWorkerID], + public string 鎿嶄綔鍛樹唬鐮�;//[鎿嶄綔鍛樹唬鐮乚, + public string 鎿嶄綔鍛�;//[鎿嶄綔鍛榏, + public Int64? HSourceID;// [HSourceID], + public string 璧勬簮浠g爜;//[璧勬簮浠g爜], + public string 鐢熶骇璧勬簮;//[鐢熶骇璧勬簮], + public decimal 璁″垝鏁伴噺;//[璁″垝鏁伴噺], + public decimal 鍏宠仈鏁伴噺;//[鍏宠仈鏁伴噺], + public string 鏃堕棿鍗曚綅;//[鏃堕棿鍗曚綅], + public decimal 璁″垝鍔犲伐鏃堕棿;//[璁″垝鍔犲伐鏃堕棿], + public DateTime? 宸ュ簭璁″垝寮�宸ユ棩鏈�;//[宸ュ簭璁″垝寮�宸ユ棩鏈焆, + public DateTime? 宸ュ簭璁″垝瀹屽伐鏃ユ湡;//[宸ュ簭璁″垝瀹屽伐鏃ユ湡], + public decimal 鍑嗗鏃堕棿;//[鍑嗗鏃堕棿], + public decimal 鎺掗槦鏃堕棿;//[鎺掗槦鏃堕棿], + public decimal 杞Щ鏃堕棿;//[杞Щ鏃堕棿], + public string 琛ㄤ綋澶囨敞;//[琛ㄤ綋澶囨敞], + public string 鎵规;// [鎵规], + public Int64? 婧愬崟涓诲唴鐮�;//[婧愬崟涓诲唴鐮乚, + public Int64? 婧愬崟瀛愬唴鐮�;//[婧愬崟瀛愬唴鐮乚, + public string 婧愬崟鍗曞彿;//[婧愬崟鍗曞彿], + public string 婧愬崟绫诲瀷;//[婧愬崟绫诲瀷], + public Int64? 閿�鍞鍗曚富ID;//[閿�鍞鍗曚富ID], + public Int64? 閿�鍞鍗曞瓙ID;//[閿�鍞鍗曞瓙ID], + public string 閿�鍞鍗曞彿;//[閿�鍞鍗曞彿], + public string HBillType;//[HBillType], + public string 鍗曟嵁绫诲瀷;// [鍗曟嵁绫诲瀷], + public string HBillSubType;//[HBillSubType], + public Int64? HQtyDecimal;//[HQtyDecimal], + public Int64? HPriceDecimal;// [HPriceDecimal] } } \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 3a310f6..c3aa62e 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -157,10 +157,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/06/2021 11:06:14</publishTime> + <publishTime>04/07/2021 17:34:23</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/06/2021 11:06:14</publishTime> + <publishTime>04/07/2021 17:34:23</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -334,7 +334,7 @@ <publishTime>03/26/2021 14:35:48</publishTime> </File> <File Include="Web.config"> - <publishTime>04/06/2021 11:11:08</publishTime> + <publishTime>04/07/2021 17:34:29</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file -- Gitblit v1.9.1