From 7953aa09d09ed7889f8806f1e4fe2ccc18c1f548 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期二, 06 四月 2021 17:34:44 +0800
Subject: [PATCH] 工序计划单下推-保存逻辑编写
---
WebAPI/ListModels.cs | 16 ++++
WebAPI/Models/Sc_ProcessPlanViewModel.cs | 89 ++++++++++++++++++++++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 111 ++++++++++++++++++++++++++-
WebAPI/Properties/PublishProfiles/API.pubxml.user | 6
WebAPI/WebAPI.csproj | 1
5 files changed, 214 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index f8db5fe..2b9db17 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -215,15 +215,114 @@
try
{
- DAL.ClsSc_ProcessSendWork dal = new DAL.ClsSc_ProcessSendWork();
+ DAL.ClsSc_ProcessSendWork Sendwork = new DAL.ClsSc_ProcessSendWork();
List<Model.ClsSc_ProcessSendWorkMain> lsmain = new List<Model.ClsSc_ProcessSendWorkMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_SendWorkMain(msg2);
+ foreach ( Model.ClsSc_ProcessSendWorkMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HPlanBeginDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欒鍒掑紑宸ユ棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ Sendwork.omodel = oItem;
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- objJsonResult.data = 1;
- return objJsonResult;
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ 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();
+ 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;
+ //}
+ //if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ //oItemSub.HEntryID = i;
+ //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ //oItemSub.HRemark = "";
+ //oItemSub.HCloseMan = "";
+ //oItemSub.HCloseType = false;
+ //Sendwork.DetailColl.Add(oItemSub);
+
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Sendwork.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = Sendwork.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = Sendwork.ModifyBill(Sendwork.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)
{
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 6d1c053..338a558 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -139,5 +139,21 @@
List<Model.ClsKf_OtherOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_OtherOutBillMain>>(jsonString);
return list;
}
+
+
+ public List<Model.ClsSc_ProcessSendWorkMain> getObjectByJson_SendWorkMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_ProcessSendWorkMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessSendWorkMain>>(jsonString);
+ return list;
+ }
+
+
+ public List<WebAPI.Models.Sc_ProcessPlanViewModel> getObjectByJson_SendWorkSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.Sc_ProcessPlanViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.Sc_ProcessPlanViewModel>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Sc_ProcessPlanViewModel.cs b/WebAPI/Models/Sc_ProcessPlanViewModel.cs
new file mode 100644
index 0000000..23f5df8
--- /dev/null
+++ b/WebAPI/Models/Sc_ProcessPlanViewModel.cs
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Sc_ProcessPlanViewModel
+ {
+// [hmainid],
+//[鏃ユ湡],
+// [鍗曟嵁鍙穄,
+//[HMaterID],
+// [鐗╂枡浠ｇ爜],
+//[鐗╂枡鍚嶇О],
+//[瑙勬牸鍨嬪彿],
+//[鍗曚綅],
+//[hunitid],
+//[璁￠噺鍗曚綅浠ｇ爜],
+//[璁￠噺鍗曚綅],
+//[鐢熶骇鏁伴噺],
+//[璁″垝寮�宸ユ棩鏈焆,
+//[璁″垝瀹屽伐鏃ユ湡],
+//[鎽樿],
+//[琛ㄥご澶囨敞],
+//[鍐呴儴鍗曟嵁鍙穄,
+//[hicmointerid],
+//[浠诲姟鍗曞彿],
+//[鍒跺崟浜篯,
+//[鍒跺崟鏃ユ湡],
+//[瀹℃牳浜篯,
+//[瀹℃牳鏃ユ湡],
+//[淇敼浜篯,
+//[淇敼鏃ユ湡],
+//[鍏抽棴浜篯,
+//[鍏抽棴鏃ユ湡],
+// [鍏抽棴绫诲瀷],
+//[浣滃簾浜篯,
+// [浣滃簾鏃ユ湡],
+//[hsubid],
+// [宸ュ簭璁″垝鍗曞彿],
+// [宸ュ簭鍙穄,
+// [hprocid],
+//[宸ュ簭浠ｇ爜],
+// [宸ュ簭],
+//[鍔犲伐璇存槑],
+//[寮�宸ュ浐澶,
+// [寮�宸ュ浐鏁癩,
+// [HCenterID],
+// [宸ヤ綔涓績浠ｇ爜],
+// [宸ヤ綔涓績],
+//[HDeptID],
+//[鍔犲伐杞﹂棿浠ｇ爜],
+//[鍔犲伐杞﹂棿],
+// [HGroupID],
+//[鐝粍浠ｇ爜],
+//[鐝粍鍚嶇О],
+//[HWorkerID],
+//[鎿嶄綔鍛樹唬鐮乚,
+//[鎿嶄綔鍛榏,
+// [HSourceID],
+//[璧勬簮浠ｇ爜],
+//[鐢熶骇璧勬簮],
+//[璁″垝鏁伴噺],
+//[鍏宠仈鏁伴噺],
+//[鏃堕棿鍗曚綅],
+//[璁″垝鍔犲伐鏃堕棿],
+//[宸ュ簭璁″垝寮�宸ユ棩鏈焆,
+//[宸ュ簭璁″垝瀹屽伐鏃ユ湡],
+//[鍑嗗鏃堕棿],
+//[鎺掗槦鏃堕棿],
+//[杞Щ鏃堕棿],
+//[琛ㄤ綋澶囨敞],
+// [鎵规],
+//[婧愬崟涓诲唴鐮乚,
+//[婧愬崟瀛愬唴鐮乚,
+//[婧愬崟鍗曞彿],
+//[婧愬崟绫诲瀷],
+//[閿�鍞鍗曚富ID],
+//[閿�鍞鍗曞瓙ID],
+//[閿�鍞鍗曞彿],
+//[HBillType],
+// [鍗曟嵁绫诲瀷],
+//[HBillSubType],
+//[HQtyDecimal],
+// [HPriceDecimal]
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 6eda7d9..3a310f6 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/01/2021 08:46:56</publishTime>
+ <publishTime>04/06/2021 11:06:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/01/2021 08:46:56</publishTime>
+ <publishTime>04/06/2021 11:06:14</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/01/2021 15:08:43</publishTime>
+ <publishTime>04/06/2021 11:11:08</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index cf0c008..b838f4a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -345,6 +345,7 @@
<Compile Include="Models\M_ProcMul.cs" />
<Compile Include="Models\M_StationBillMail.cs" />
<Compile Include="Models\M_Process.cs" />
+ <Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
<Compile Include="Models\StationOutBillView.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
--
Gitblit v1.9.1