From bbfd850de8f11c49a3d3c7241397c3c99b3e68f8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 09 四月 2021 08:27:42 +0800
Subject: [PATCH] 委外工序-保存方法-合并
---
WebAPI/ListModels.cs | 7 +
WebAPI/Controllers/Sc_ProcessMangementController.cs | 117 +++++++++++++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 124 ++++++++++----------
WebAPI/Service/LuBaoSevice.cs | 56 +++++++++
WebAPI/WebAPI.csproj | 2
WebAPI/Models/Sc_ProcessReportViewModel.cs | 36 ++++++
6 files changed, 280 insertions(+), 62 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index a59fcc4..b2b315a 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -7,6 +7,8 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.Service;
+
namespace WebAPI.Controllers
{
public class Sc_ProcessMangementController : ApiController
@@ -442,6 +444,121 @@
return GetObjectJson(ds);
}
+ /// <summary>
+ /// PDA宸ュ簭姹囨姤鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveProcessReport")]
+ [HttpPost]
+ public object SaveProcessReport([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
+ List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
+ ls = oListModels.getObjectByJson_Report(msg1);
+ int i = 0;
+ Model.ClsSc_ProcessReportMain ReportMain = new Model.ClsSc_ProcessReportMain();
+ Model.ClsSc_ProcessReportSub ReportSub = new Model.ClsSc_ProcessReportSub();
+ foreach (Models.Sc_ProcessReportViewModel ItemView in ls)
+ {
+ i++;
+ //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3714";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate=DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear=DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HInterID = ItemView.HInterID;
+ ReportMain.HMaker = ItemView.HEmp;
+ ReportMain.HCloseType = false;
+ ReportMain.HPlanQty = (double)ItemView.HQty;
+ //淇濆瓨鍒版眹鎶ュ崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HEmpID = (long)ItemView.HEmpID;
+ ReportSub.HICMOBillNo = ItemView.HICMOBillNo;
+ ReportSub.HICMOInterID = (long)ItemView.HICMOInterID;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3712";
+ ReportSub.HQty = (double)ItemView.HQty;
+ //淇濆瓨鍒版眹鎶ュ崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (ReportModel.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = ReportModel.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = ReportModel.ModifyBill(ReportModel.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>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/getHbarCodeDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
+ {
+ var model = LuBaoSevice.GetHbarCodeDetail(sBillBarCode);
+ return model;
+ }
+
+ /// <summary>
+ ///宸ュ簭鍙疯幏寰椾俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/getProcDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo)
+ {
+ var model = LuBaoSevice.GetProcDetail(sBillNo, sProcNo);
+ return model;
+ }
+
//
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 338a558..12ece20 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -155,5 +155,12 @@
List<WebAPI.Models.Sc_ProcessPlanViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.Sc_ProcessPlanViewModel>>(jsonString);
return list;
}
+
+ public List<WebAPI.Models.Sc_ProcessReportViewModel> getObjectByJson_Report(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.Sc_ProcessReportViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.Sc_ProcessReportViewModel>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Sc_ProcessReportViewModel.cs b/WebAPI/Models/Sc_ProcessReportViewModel.cs
new file mode 100644
index 0000000..abf3f06
--- /dev/null
+++ b/WebAPI/Models/Sc_ProcessReportViewModel.cs
@@ -0,0 +1,36 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Sc_ProcessReportViewModel
+ {
+
+ public string HBarCode; //鏉″舰鐮佺紪鐮�
+ public string HSendWorkBillNo; //娲惧伐鍗曟嵁鍙�
+ public string HBillNo;//姹囨姤鍗曟嵁鍙�
+ public Int64 HInterID; //涓婚敭id
+ public string HProcNo; //宸ュ簭鍙�
+ public string HProcName; //宸ュ簭鍚嶇О
+ public Int64 HProcID; //宸ュ簭id
+ public string HProc;//
+ public string HMaterModel;//瑙勬牸鍨嬪彿
+ public Int64? HEmpID; //鍒涘缓浜篿d
+ public decimal HQty; //鏁伴噺
+ public string HSource; //鐢熶骇璧勬簮
+ public Int64? HSourceID; //鐢熶骇璧勬簮id
+ public string HGroup; //鐝粍
+ public Int64? HGroupID;//鐝粍id
+ public string HICMOBillNo;//浠诲姟鍗曞彿
+ public DateTime? HReportTime; //鍒涘缓鏃堕棿
+ public Int64? HMaterID;//浜у搧id
+ public string HMaterName;//浜у搧鍚嶇О
+ public decimal HICMOQty;//
+ public Int64? HICMOInterID;//浠诲姟鍗昳d
+ public Int64? HDeptID;//閮ㄩ棬id
+ public string HEmp;//鍒涘缓浜�
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 9c17191..eb094ce 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -19,19 +19,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -49,7 +49,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -58,13 +58,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -130,7 +130,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -184,160 +184,160 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Index.html">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/21/2021 13:19:40</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web.config">
<publishTime>04/08/2021 15:31:28</publishTime>
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
new file mode 100644
index 0000000..98c4fd1
--- /dev/null
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -0,0 +1,56 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using WebAPI.Models;
+
+namespace WebAPI.Service
+{
+ public class LuBaoSevice
+ {
+
+ /// <summary>
+ /// 鎵爜鏂规硶
+ /// </summary>
+ public static ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
+ {
+ if (string.IsNullOrEmpty(sBillBarCode))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜涓嶈兘涓虹┖" };
+ sBillBarCode = sBillBarCode.CompareTo("#") > 0 ? sBillBarCode.Split(Convert.ToChar("#"))[0] : sBillBarCode;
+ var dataSet = GetBarCodeDb(sBillBarCode);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ淳宸ュ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet GetBarCodeDb(string billBarCode)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessSendWorkList");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// PDA姹囨姤鍗曞洖杞︽柟娉�
+ /// </summary>
+ public static ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo)
+ {
+ if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜鍜屾祦杞崱涓嶈兘涓虹┖" };
+ var dataSet = GetProcDb(sBillNo, sProcNo);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet GetProcDb(string sBillNo, string sProcNo)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_Sc_ProcessSendWorkList");
+ return dataSet;
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 13ca4d5..f5ee9d5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -347,6 +347,7 @@
<Compile Include="Models\M_StationBillMail.cs" />
<Compile Include="Models\M_Process.cs" />
<Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
+ <Compile Include="Models\Sc_ProcessReportViewModel.cs" />
<Compile Include="Models\StationEntrustInBill.cs" />
<Compile Include="Models\StationOutBillView.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -359,6 +360,7 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
--
Gitblit v1.9.1