WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -67,6 +67,105 @@ } /// <summary> /// 返回模具列表 ///参数:string sql。 ///返回值:object。 /// </summary> [Route("Gy_Mould/list1")] [HttpGet] public object list1(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList"); } else { string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList"); } 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; } } /// <summary> /// 返回检具档案列表 ///参数:string sql。 ///返回值:object。 /// </summary> [Route("Gy_CheckToolsFileMainList/list2")] [HttpGet] public object list2(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList"); } else { string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList"); } 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; } } // } WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -556,6 +556,162 @@ #endregion #region sql语句 //public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere) //{ // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList"); //} #endregion /// <summary> /// 模具维修工单表列表 /// </summary> /// <returns></returns> [Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")] [HttpGet] public object GetMouldRepairWorkBillList(string sWhere) { try { ds = Sc_MouldRepairWorkBillList_s(sWhere); 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 = "1"; objJsonResult.count = 1; objJsonResult.Message = "返回记录成功!"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没有返回任何记录!" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #region sql语句 public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere) { return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList"); } #endregion /// <summary> /// 检具故障登记表列表 /// </summary> /// <returns></returns> [Route("Sc_CheckToolsConkBookBill/GetCheckToolsConkBookBillList")] [HttpGet] public object GetCheckToolsConkBookBillList(string sWhere) { try { ds = Sc_CheckToolsConkBookBillList_s(sWhere); 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 = "1"; objJsonResult.count = 1; objJsonResult.Message = "返回记录成功!"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没有返回任何记录!" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #region sql语句 public static DataSet Sc_CheckToolsConkBookBillList_s(string sWhere) { return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList ", "h_v_Sc_CheckToolsConkBookBillList"); } #endregion /// <summary> /// 检具点检记录表列表 /// </summary> /// <returns></returns> [Route("Sc_CheckToolsDotCheckBill/GetCheckToolsDotCheckBillList")] [HttpGet] public object GetCheckToolsDotCheckBillList(string sWhere) { try { ds = Sc_CheckToolsDotCheckBillList_s(sWhere); 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 = "1"; objJsonResult.count = 1; objJsonResult.Message = "返回记录成功!"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没有返回任何记录!" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #region sql语句 public static DataSet Sc_CheckToolsDotCheckBillList_s(string sWhere) { return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList ", "h_v_Sc_CheckToolsDotCheckBillList"); } #endregion //测试专用接口 [Route("LookingFor/Test")] [HttpGet] WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -196,6 +196,182 @@ } /// <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; //--工序计划单ID sendworksub.HICMOInterID = oItemSub.hicmointerid.Value; //--任务单ID 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; //--操作工ID 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 = "保存失败!lss集合小于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> 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> 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; } } } WebAPI/Models/Sc_ProcessPlanViewModel.cs
New file @@ -0,0 +1,89 @@ using 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] } } WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -33,6 +33,12 @@ <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll"> <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/18/2015 17:02:50</publishTime> </File> WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
New file @@ -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> WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
New file @@ -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> WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml
New file @@ -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> WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
New file @@ -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> WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
New file @@ -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> WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
New file @@ -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> WebAPI/WebAPI.csproj
@@ -346,6 +346,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\StationEntrustInBill.cs" /> <Compile Include="Models\StationOutBillView.cs" /> <Compile Include="Properties\Resources.Designer.cs"> 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>