From 9f401236ba4364e1fc9ee2ff94b95c91d797b92f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 08 四月 2021 09:10:35 +0800
Subject: [PATCH] 新增模具基础资料API方法
---
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml | 16
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 6
WebAPI/Models/Sc_ProcessPlanViewModel.cs | 89 +++++
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml | 16
WebAPI/Controllers/LMESController.cs | 179 ----------
WebAPI/Controllers/WebAPIController.cs | 105 ++++++
WebAPI/ListModels.cs | 16
WebAPI/WebServer.cs | 28 +
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 75 ++++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 448 ++++++++++++++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 6
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user | 6
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 16
WebAPI/WebAPI.csproj | 3
14 files changed, 831 insertions(+), 178 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
new file mode 100644
index 0000000..8bc1ceb
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -0,0 +1,75 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //濮斿宸ュ簭鍙戝嚭鍗旵ontroller
+ public class Cj_StationEntrustInBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭鍙戝嚭鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationEntrustInBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList " + sWhere, "h_v_MES_StationEntrustInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
+ }
+ 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;
+ }
+ }
+
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 9691168..0321edb 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1105,183 +1105,6 @@
}
- /// <summary>
- /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("LEMS/MES_Sc_ProcessReportList_Json")]
- [HttpGet]
- public object MES_Sc_ProcessReportList_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessReportMain ", "Sc_ProcessReportMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessReportMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessReportMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
- /// <summary>
- /// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("LEMS/MES_Sc_ProcessPlanMain_Json")]
- [HttpGet]
- public object MES_Sc_ProcessPlanMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessPlanMain ", "Sc_ProcessPlanMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessPlanMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessPlanMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
- /// <summary>
- /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("LEMS/MES_Sc_ProcessSendWorkMain_Json")]
- [HttpGet]
- public object MES_Sc_ProcessSendWorkMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_ProcessSendWorkMain ", "Sc_ProcessSendWorkMain");
- }
- else
- {
- string sql1 = "select * from Sc_ProcessSendWorkMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_ProcessSendWorkMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
- /// <summary>
- /// 杩斿洖濮斿宸ュ崟鍒楄〃
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("LEMS/MES_WW_EntrustWorkOrderBillMain_Json")]
- [HttpGet]
- public object MES_WW_EntrustWorkOrderBillMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
- }
- else
- {
- string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
-
- /// <summary>
- /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("LEMS/MES_Sc_StationOutBillMain_Json")]
- [HttpGet]
- public object MES_Sc_StationOutBillMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
- }
- else
- {
- string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
-
- //
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
new file mode 100644
index 0000000..a59fcc4
--- /dev/null
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -0,0 +1,448 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Sc_ProcessMangementController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+
+ ///<summary>
+ ///灏佽鐘舵�佺爜鍙婅繑鍥炰俊鎭殑鍏敤鏂规硶銆�
+ ///鍙傛暟锛欴ataSet銆�
+ ///杩斿洖鍊硷細json銆�
+ ///</summary>
+ public object GetObjectJson(DataSet ds)
+ {
+ try
+ {
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///<summary>
+ ///缁熶竴姝ｇ‘淇℃伅鏂规硶銆�
+ ///鍙傛暟锛歴tring銆�
+ ///杩斿洖鍊硷細object銆�
+ ///</summary>
+ public object CustomCorrect(DataSet ds)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+
+ ///<summary>
+ ///鑷畾涔夐敊璇俊鎭柟娉曘��
+ ///鍙傛暟锛歴tring銆�
+ ///杩斿洖鍊硷細object銆�
+ ///</summary>
+ public object CustomError(string msg)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_Sc_ProcessReportList_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessReportList_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessReportList ", "h_v_Sc_ProcessReportList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessPlanMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessPlanList ", "h_v_Sc_ProcessPlanList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_ProcessPlanList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json")]
+ [HttpGet]
+ public object MES_Sc_ProcessSendWorkMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessSendWorkList ", "h_v_Sc_ProcessSendWorkList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_ProcessSendWorkList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessSendWorkList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 淇濆瓨娲惧伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveProcessSendWork")]
+ [HttpPost]
+ public object SaveProcessSendWork([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();
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ 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;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ 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;
+ List<Model.ClsSc_ProcessSendWorkSub> lss = new List<Model.ClsSc_ProcessSendWorkSub>();
+ foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls)
+ {
+
+ 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.鐝粍浠ｇ爜; //鐝粍浠ｇ爜
+ sendworksub.HGroupID = oItemSub.HGroupID.Value; //--鐝粍ID
+ sendworksub.HSourceNumber = oItemSub.鐢熶骇璧勬簮; //--鐢熶骇璧勬簮浠ｇ爜
+ //--鐢熶骇璧勬簮ID
+ sendworksub.HProcNumber = oItemSub.宸ュ簭浠ｇ爜; //--宸ュ簭浠ｇ爜
+ 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";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ 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;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ 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)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ崟鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustWorkOrderBillMain_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustWorkOrderBillMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ }
+ else
+ {
+ string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")]
+ [HttpGet]
+ public object MES_Sc_StationOutBillMain_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
+ }
+ else
+ {
+ string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 8e6f6a2..a50a8aa 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -704,6 +704,111 @@
return objjson;
}
}
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMaterialList_Json")]
+ [HttpGet]
+ public object GetMaterialList_Json(string Material)
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Material != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
+ }
+ try
+ {
+ ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍗曚綅鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetUnitList_Json")]
+ [HttpGet]
+ public object GetUnitList_Json(string Unit)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Unit != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Unit + "%' or HName like '%" + Unit + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_Unit where HStopflag=0 Order by HItemID ", "Gy_Unit");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_Unit where HStopflag=0 and HEndFlag=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_Unit");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鑾峰彇瀹㈡埛鍒楄〃
/// </summary>
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..c9612b7
--- /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
+ {
+ public Int64? hmainid; // [hmainid],
+ public DateTime? 鏃ユ湡; //[鏃ユ湡],
+ public string 鍗曟嵁鍙�; // [鍗曟嵁鍙穄,
+ public Int64? HMaterID;//[HMaterID],
+ public string 鐗╂枡浠ｇ爜; // [鐗╂枡浠ｇ爜],
+ public string 鐗╂枡鍚嶇О;//[鐗╂枡鍚嶇О],
+ public string 瑙勬牸鍨嬪彿;//[瑙勬牸鍨嬪彿],
+ public string 鍗曚綅;//[鍗曚綅],
+ public Int64? hunitid;//[hunitid],
+ public string 璁￠噺鍗曚綅浠ｇ爜;//[璁￠噺鍗曚綅浠ｇ爜],
+ 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 宸ュ簭浠ｇ爜;//[宸ュ簭浠ｇ爜],
+ public string 宸ュ簭;// [宸ュ簭],
+ public string 鍔犲伐璇存槑;//[鍔犲伐璇存槑],
+ public decimal 寮�宸ュ浐澶�;//[寮�宸ュ浐澶,
+ public decimal 寮�宸ュ浐鏁�;// [寮�宸ュ浐鏁癩,
+ public Int64? HCenterID;// [HCenterID],
+ public string 宸ヤ綔涓績浠ｇ爜;// [宸ヤ綔涓績浠ｇ爜],
+ public string 宸ヤ綔涓績;// [宸ヤ綔涓績],
+ public Int64? HDeptID;//[HDeptID],
+ public string 鍔犲伐杞﹂棿浠ｇ爜;//[鍔犲伐杞﹂棿浠ｇ爜],
+ public string 鍔犲伐杞﹂棿;//[鍔犲伐杞﹂棿],
+ public Int64? HGroupID;// [HGroupID],
+ public string 鐝粍浠ｇ爜;//[鐝粍浠ｇ爜],
+ public string 鐝粍鍚嶇О;//[鐝粍鍚嶇О],
+ public Int64? HWorkerID;//[HWorkerID],
+ public string 鎿嶄綔鍛樹唬鐮�;//[鎿嶄綔鍛樹唬鐮乚,
+ public string 鎿嶄綔鍛�;//[鎿嶄綔鍛榏,
+ public Int64? HSourceID;// [HSourceID],
+ public string 璧勬簮浠ｇ爜;//[璧勬簮浠ｇ爜],
+ 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/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b1a5a6e..b838f4a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -326,6 +326,8 @@
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
@@ -343,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>
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 743d1af..c51f650 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -53,6 +53,34 @@
//DAL.ClsIF_Department_View dal = new DAL.ClsIF_Department_View();
//return dal.GetList(sWhere);
}
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetMaterialList(string sWhere, ref string sErr)
+ {
+ BLL.ClsIF_Material_View bll = new BLL.ClsIF_Material_View();
+ return bll.GetList(sWhere, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ //ClsGy_Unit_View
+ /// <summary>
+ /// 鑾峰彇鍗曚綅鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetUnitList(string sWhere, ref string sErr)
+ {
+
+ DAL.ClsGy_Unit_View dal = new DAL.ClsGy_Unit_View();
+ return dal.GetList(sWhere);
+ }
+
+
/// <summary>
/// 鑱屽憳鍒楄〃
/// </summary>
--
Gitblit v1.9.1