From 716f1dd800d43e1d3699085f0ed89622c5ab6127 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 23 三月 2021 16:59:34 +0800
Subject: [PATCH] 新增工序、部门模块
---
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 332 ++++++++++++++++++++
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 73 ++++
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 73 ++++
WebAPI/Properties/PublishProfiles/JFAPI.pubxml | 17 +
WebAPI/Service/BaseSetService.cs | 391 ++++++++++++++++++++++++
WebAPI/Web.config | 4
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/LMESController.cs | 31 +
WebAPI/WebAPI.csproj | 4
9 files changed, 924 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
new file mode 100644
index 0000000..2dcd14c
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -0,0 +1,73 @@
+锘縰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 Gy_DepartmentController : 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("Gy_Department/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
+ }
+ 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/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
new file mode 100644
index 0000000..2cbe2cc
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -0,0 +1,73 @@
+锘縰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 Gy_ProcessController : 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("Gy_Process/list")]
+ [HttpGet]
+ public object getProcessList(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
+ }
+ 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 7bb1e83..c013002 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1101,7 +1101,38 @@
objJsonResult.data = e.ToString();
return objJsonResult;
}
+ }
+ /// <summary>
+ /// 杩斿洖宸ュ簭鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/getProcessList")]
+ [HttpGet]
+ public object getProcessList(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList "+ sWhere, "h_v_Gy_ProcessList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return GetObjectJson(ds);
}
//
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
new file mode 100644
index 0000000..7f14ac0
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml
@@ -0,0 +1,17 @@
+锘�<?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>True</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedPlatform>x86</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFAPI</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <SiteUrlToLaunchAfterPublish />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
new file mode 100644
index 0000000..1a424f8
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -0,0 +1,332 @@
+锘�<?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>
+ <_PublishTargetUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFAPI</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 14:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/18/2015 17:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 11:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>08/03/2014 20:33:56</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/15/2015 17:57:08</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 10:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 13:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 12:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 13:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 13:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 04:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 15:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 04:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 11:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>03/23/2021 16:26:42</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>03/23/2021 16:26:42</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>03/23/2021 14:35:51</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/17/2013 17:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 13:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 13:26:30</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>03/23/2021 14:16:30</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>03/23/2021 14:16:31</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>03/23/2021 16:26:47</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/BaseSetService.cs b/WebAPI/Service/BaseSetService.cs
new file mode 100644
index 0000000..abad575
--- /dev/null
+++ b/WebAPI/Service/BaseSetService.cs
@@ -0,0 +1,391 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Web;
+using WebAPI.Dapper;
+using WebAPI.Models;
+using WebAPI.WebS;
+
+namespace WebAPI.Service
+{
+ public class BaseSetService
+ {
+ /// <summary>
+ /// 鑾峰彇鍗曟嵁鍙�
+ /// </summary>
+ /// <returns></returns>
+ public static ApiResult<DocumentsView> GetInterBillNo(string billType)
+ {
+ var hInterId = DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo);
+ var hBillNo = DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ if (hInterId == 0 || string.IsNullOrEmpty(hBillNo))
+ return new ApiResult<DocumentsView> { code = -1, msg = "鑾峰彇澶辫触" };
+ DocumentsView documentsView = new DocumentsView()
+ {
+ HBillNo = hBillNo,
+ HInterID = hInterId
+ };
+ return new ApiResult<DocumentsView> { code = 1, msg = "鑾峰彇鎴愬姛", data = documentsView };
+ }
+ /// <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 };
+ }
+ /// <summary>
+ /// 娴佽浆鍗″洖杞︽柟娉�
+ /// </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 };
+ }
+ /// <summary>
+ /// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ /// </summary>
+ public static ApiResult<DataSet> GetSourceList(string sWhere)
+ {
+ var dataSet = GetSourceDb(sWhere);
+ 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 };
+ }
+ /// <summary>
+ /// 鑾峰彇鐢熶骇鐝粍鍒楄〃
+ /// </summary>
+ public static ApiResult<DataSet> GetGroupList(string sWhere)
+ {
+ var dataSet = GetGroupDb(sWhere);
+ 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 };
+ }
+ /// <summary>
+ /// 鑾峰彇宸ヤ綔涓績鍒楄〃
+ /// </summary>
+ public static ApiResult<DataSet> GetWorkCenterList(string sWhere)
+ {
+ var dataSet = GetGroupDb(sWhere);
+ 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 };
+ }
+ private static ConcurrentDictionary<string, string> dicLock = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();//骞跺彂閿�
+ /// <summary>
+ /// 杩涚珯鎺ユ敹鍗�
+ /// </summary>
+ public static ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
+ {
+ if (!dicLock.TryAdd(oMain.HICMOBillNo + "jz", ""))//闃叉骞跺彂
+ return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
+ try
+ {
+ if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
+ return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
+ var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
+ if (stationInList.Count > 0)
+ {
+ var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
+ var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//鑾峰彇杩涚珯鍗曟渶鏂拌繘绔欏伐搴�
+ if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
+ return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
+ if (stationOutList.Count == 0 && oMain.HProcID != stationInModel.HProcID)
+ return new ApiResult { code = -1, msg = "姝ゅ崟宸插叧鑱�" };
+ var stationOutModel = stationOutList.OrderByDescending(a => a.HDate).First();//鑾峰彇鍑虹珯鍗曟渶鏂板嚭绔欏伐搴�
+ if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
+ return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
+ if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
+ return new ApiResult { code = -1, msg = "姝ゅ崟宸插叧鑱�" };
+ if (stationOutList.Exists(a => a.HProcID == oMain.HProcID))
+ return new ApiResult { code = -1, msg = "璇ュ崟鎹凡瀹屾垚姝ゅ伐鑹�" };
+ }
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ string sErrMsg = string.Empty;
+ var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);//杩涚珯
+ if (!result)
+ {
+ return new ApiResult { code = -1, msg = sErrMsg };
+ }
+ return new ApiResult { code = 1, msg = "鎿嶄綔鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return new ApiResult { code = -1, msg = "璇锋眰閿欒" + ex.ToString() };
+ }
+ finally
+ {
+ dicLock.TryRemove(oMain.HICMOBillNo + "jz", out string key);
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇杩涚珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetStationInBillList(string sWhere)
+ {
+ var dataSet = GetStationInBill(sWhere);
+ 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 };
+ }
+ /// <summary>
+ /// 鑾峰彇鍑虹珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetStationOutBillList(string sWhere)
+ {
+ var dataSet = GetStationOutBill(sWhere);
+ 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 };
+ }
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetPorcessMainList(string sWhere)
+ {
+ var dataSet = GetProcessMain(sWhere);
+ 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 };
+ }
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″瓙琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetPorcessSubList(int hInterId)
+ {
+ var dataSet = GetProcessSubList(hInterId);
+ 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 };
+ }
+ /// <summary>
+ /// 鍑虹珯鎺ユ敹鍗�
+ /// </summary>
+ public static ApiResult SetStationOutBill(StationOutBillView omodel)
+ {
+ if (!dicLock.TryAdd(omodel.HICMOBillNo + "cz", omodel.HBillNo))//鍚屼竴鍗曞彿骞跺彂澶勭悊
+ return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
+ try
+ {
+ var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HProcExchBillNo);
+ if (stationInBillModel == null)
+ return new ApiResult { code = -1, msg = "璇ュ伐搴忚繘绔欏崟涓嶅瓨鍦�" };
+ var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HProcExchBillNo);
+ if (stationOutBillModel != null)
+ return new ApiResult { code = -1, msg = "璇ュ伐搴忓凡瀛樺湪鍑虹珯鍗�" };
+ omodel.HYear = DateTime.Now.Year;
+ var result = SetOutBill(omodel);
+ return result;
+ }
+ catch (Exception ex)
+ {
+ return new ApiResult { code = -1, msg = ex.ToString() };
+ }
+ finally
+ {
+ dicLock.TryRemove(omodel.HICMOBillNo + "cz", out string key);
+ }
+
+ }
+ /// <summary>
+ /// 鑾峰彇宸ュ簭璇︽儏
+ /// </summary>
+ /// <param name="hItemId"></param>
+ /// <returns></returns>
+ public static ApiResult<Models.M_Process> GetProcessDetail(int hItemId)
+ {
+ var processModel = ProcessDal.GetProcessDetail(hItemId);
+ if (processModel == null)
+ return new ApiResult<M_Process> { code = -1, msg = "鏌ヨ涓虹┖" };
+ processModel.DepartmentModel = ProcessDal.GetDepartmentModel(processModel.HDeptID);
+ processModel.ProcMulModel = ProcessDal.GetProcMulModel(processModel.HProcMulID);
+ return new ApiResult<M_Process> { code = 1, msg = "鏌ヨ鎴愬姛", data = processModel };
+ }
+ /// <summary>
+ /// 鑾峰彇宸ュ簭鍒楄〃
+ /// </summary>
+ /// <param name="hName"></param>
+ /// <param name="hLevel"></param>
+ /// <param name="hNumber"></param>
+ /// <param name="hBillSubType"></param>
+ /// <returns></returns>
+ public static ApiResult<List<Models.M_Process>> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit)
+ {
+ int pageCount = 0;
+ var list = ProcessDal.GetProcessList(hName, hLevel, hNumber, hBillSubType, page, limit, ref pageCount);
+ if (list?.Count == 0)
+ return new ApiResult<List<M_Process>> { code = -1, msg = "鏌ヨ涓虹┖" };
+ return new ApiResult<List<M_Process>> { code = 0, msg = "鏌ヨ鎴愬姛", data = list, count = pageCount };
+ }
+ /// <summary>
+ /// 鍒犻櫎涓�鏉″伐搴�
+ /// </summary>
+ /// <param name="hItemID"></param>
+ /// <returns></returns>
+ public static ApiResult DeleteProcess(int hItemID)
+ {
+ var result = ProcessDal.DeleteProcess(hItemID);
+ if (result > 0)
+ return new ApiResult { code = 1, msg = "鍒犻櫎鎴愬姛" };
+ return new ApiResult { code = -1, msg = "鍒犻櫎鏁版嵁涓嶅瓨鍦�" };
+ }
+ #region sql璇彞
+ public static DataSet GetStationOutBill(string strWhere)
+ {
+ var sql = "Select top 5000 * from h_v_MES_StationOutBillList Where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
+ return dataSet;
+ }
+ public static DataSet GetStationInBill(string strWhere)
+ {
+ var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ return dataSet;
+ }
+ public static DataSet GetProcessSubList(int hInterId)
+ {
+ var sql = "select a.HProcNo 娴佹按鍙�,a.HProcNumber as 宸ュ簭浠ｇ爜,b.HName 宸ュ簭鍚嶇О,c.HName 宸ヤ綔涓績,a.HQty 娴佽浆鍗℃暟閲� from Sc_ProcessExchangeBillSub a left join Gy_Process b on b.HItemID = a.HProcID left join Gy_WorkCenter c on c.HItemID = a.HCenterID where 1=1 and a.HInterID=" + hInterId;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillSub");
+ return dataSet;
+ }
+ public static DataSet GetProcessMain(string strWhere)
+ {
+ var sql = "select a.HBillNo 鍗曟嵁鍙�, a.HDate 鏃ユ湡, HInterID, a.HICMOBillNo 鐢熶骇璁㈠崟, b.HName 浜у搧鍚嶇О, b.HNumber 浜у搧浠ｇ爜, a.HPlanQty 娴佽浆鍗℃暟閲�, c.HName 鍗曚綅, a.HPlanBeginDate 璁″垝寮�宸ユ棩鏈�, a.HPlanEndDate 璁″垝瀹屽伐鏃ユ湡, a.HRemark 澶囨敞" +
+ " from Sc_ProcessExchangeBillMain a left join Gy_Material b on a.HMaterID = b.HItemID left join Gy_Unit c on c.HItemID = a.HUnitID where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillMain");
+ return dataSet;
+ }
+ public static DataSet GetBarCodeDb(string billBarCode)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessExchangeBillList");
+ return dataSet;
+ }
+ public static DataSet GetSourceDb(string sWhere)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇璧勬簮浠ｇ爜,HName 鐢熶骇璧勬簮 from Gy_Source where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ return dataSet;
+ }
+ public static DataSet GetGroupDb(string sWhere)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ return 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_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ return dataSet;
+ }
+ /// <summary>
+ /// 宸ヤ綔涓績
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static DataSet GetWorkCenterDb(string sWhere)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ return dataSet;
+ }
+ public static ApiResult SetOutBill(StationOutBillView omodel)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.BeginTran();
+ var sql = "Insert Into Sc_StationOutBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ ",HSupID,HQty,HPrice,HMoney,HProcNo" +
+ ") " +
+ " values('3791','3791'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
+ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
+ ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
+ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
+ "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HProcNo + ") ";
+ //var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql);
+ oCN.RunProc(sql);
+ oCN.Commit();
+ return new ApiResult { code = 1, msg = "鏂板鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + ex.ToString() };
+ }
+ }
+ public static ApiResult SetInBill(ClsSc_StationInBillMain omodel)
+ {
+ //SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ var nowTime = DateTime.Now;
+ omodel.HBillType = "3790";
+ omodel.HYear = nowTime.Year;
+ omodel.HBillSubType = "3790";
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HDate = nowTime;
+ omodel.HMakeDate = nowTime.ToString();
+ omodel.HStationInTime = nowTime;
+ omodel.HBarCodeMakeDate = nowTime;
+ omodel.HPeriod = 1;
+ var sqlBuilder = new StringBuilder();
+ sqlBuilder.Append("Insert Into Sc_StationInBillMain(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HYear,HPeriod,HRemark,HICMOInterID,HICMOBillNo");
+ sqlBuilder.Append(",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID");
+ sqlBuilder.Append(",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSupID,HQty,HPrice,HMoney,HProcId,HProcNo) values ");
+ sqlBuilder.Append("(@HBillType,@HBillSubType,@HInterID,@HBillNo,@HBillStatus,@HDate,@HMaker,@HMakeDate,@HYear,@HPeriod,@HRemark,@HICMOInterID,@HICMOBillNo");
+ sqlBuilder.Append(",@HProcPlanInterID,@HProcPlanEntryID,@HProcPlanBillNo,@HProcExchInterID,@HProcExchEntryID,@HProcExchBillNo,@HMaterID,@HProcID,@HICMOQty,@HPlanQty,@HStationInTime,@HSourceID");
+ sqlBuilder.Append(",@HGroupID,@HDeptID,@HEmpID,@HBarCode,@HAddr,@HBarCodeMaker,@HBarCodeMakeDate,@HSupID,@HQty,@HPrice,@HMoney,@HProcId,@HProcNo)");
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ //oCN.BeginTran();
+ var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sqlBuilder.ToString(), omodel);
+ //oCN.RunProc(sql);
+ //oCN.Commit();
+ return new ApiResult { code = 1, msg = "鏂板鎴愬姛" };
+ }
+ catch (Exception e)
+ {
+ //oCN.RollBack();
+ return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + e.ToString() };
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index fcdb48a..4e523ae 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -11,8 +11,8 @@
</configSections>
<connectionStrings>
- <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
- <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" />
+ <!--<add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Simoer;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />-->
+ <add name="YqnConn" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HX_LMESsys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
</connectionStrings>
<appSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c58b969..eba74ef 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -232,6 +232,7 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
+ <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -314,6 +315,8 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
@@ -341,6 +344,7 @@
</Compile>
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
+ <Compile Include="Service\BaseSetService.cs" />
<Compile Include="Service\YqnQbService.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 1c3208c..69cbe32 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>WEBAPI</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFAPI</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1