From fcca000072a8cfae98c1cb3dadce0512b19083cc Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 28 六月 2022 20:09:13 +0800
Subject: [PATCH] ERP订单查询，订单下达、订单关闭功能开发
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/Logs/2022-06-28.TXT | 71 +++
.vs/VueWebApi/v16/.suo | 0
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 2
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 364 ++++++++++++++++++
VueWebApi/Logs/2022-06-27.TXT | 0
VueWebApi/VueWebApi.csproj | 3
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/VueWebApi.csproj.user | 2
VueWebApi/Controllers/ProductionManagementController.cs | 137 ++++++
VueWebApi/DLL/DAL/MaterialManagerDAL.cs | 4
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 2
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ProductModelBLL.cs | 45 +
VueWebApi/Controllers/MaterialManagerController.cs | 2
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 2
VueWebApi/DLL/DAL/ProductModelDAL.cs | 279 ++++++++++++-
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 6
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 42 ++
VueWebApi/bin/VueWebApi.xml | 77 +++
/dev/null | 0
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductModelController.cs | 104 ++++
26 files changed, 1,071 insertions(+), 76 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index a95ad7b..9a4707a 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/MaterialManagerController.cs b/VueWebApi/Controllers/MaterialManagerController.cs
index c81e07a..5e37cb3 100644
--- a/VueWebApi/Controllers/MaterialManagerController.cs
+++ b/VueWebApi/Controllers/MaterialManagerController.cs
@@ -141,7 +141,7 @@
string storageid = obj["id"].ToString(); //搴撲綅id(涓婚敭)
string storagecode = obj["storagecode"].ToString(); //搴撲綅缂栫爜
string storagename = obj["storagename"].ToString(); //搴撲綅鍚嶇О
- string description = obj["description"].ToString(); //浠撲綅鎻忚堪
+ string description = obj["description"].ToString(); //搴撲綅鎻忚堪
string stockcode = obj["stockcode"].ToString(); //鎵�灞炰粨搴撶紪鐮�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index 55b428e..37fd2b7 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -157,9 +157,9 @@
}
#endregion
- #region[瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨媇
+ #region[瀛樿揣绫诲瀷鏌ユ壘鐗╂枡绫诲瀷]
/// <summary>
- /// 瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨�
+ /// 瀛樿揣绫诲瀷鏌ユ壘鐗╂枡绫诲瀷
/// </summary>
/// <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
/// <returns></returns>
@@ -176,6 +176,20 @@
mes.code = "300";
mes.Message = e.Message;
}
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鍗曚綅涓嬫媺鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 鍗曚綅涓嬫媺鍒楄〃鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "UomSelect")]
+ [HttpGet]
+ public HttpResponseMessage UomSelect()
+ {
+ mes = ProductModelBLL.UomSelect();
return TJson.toJson(mes);
}
#endregion
@@ -282,6 +296,19 @@
+ #region[宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "RouteSelect")]
+ [HttpGet]
+ public HttpResponseMessage RouteSelect()
+ {
+ mes = ProductModelBLL.RouteSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
#region[宸ヨ壓璺嚎鏌ヨ]
/// <summary>
@@ -468,6 +495,12 @@
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鎻愪氦]
+ /// <summary>
+ /// 宸ュ簭鍏宠仈缂洪櫡鎻愪氦
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
[Route(template: "SaveStepAssociationDefect")]
[HttpPost]
public HttpResponseMessage SaveStepAssociationDefect(string stepcode, List<ObjectData> json)
@@ -548,9 +581,24 @@
}
#endregion
- #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎]
/// <summary>
- /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚�
+ /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "StepSelectEqp")]
+ [HttpGet]
+ public HttpResponseMessage StepSelectEqp(string stepcode)
+ {
+ mes = ProductModelBLL.StepSelectEqp(stepcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚圿
+ /// <summary>
+ /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚�
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -560,14 +608,14 @@
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
- [Route(template: "StepSelectEqp")]
+ [Route(template: "StepSelectEqpList")]
[HttpGet]
- public HttpResponseMessage StepSelectEqp(string partcode, string routecode, string stepcode, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.StepSelectEqp(partcode, routecode, stepcode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.StepSelectEqpList(partcode, routecode, stepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -577,12 +625,9 @@
/// 鑺傛媿宸ヤ环鏌ヨ
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
- /// <param name="partname">浜у搧鍚嶇О</param>
- /// <param name="partspec">浜у搧瑙勬牸</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="eqpcode">璁惧缂栫爜</param>
- /// <param name="eqpname">璁惧鍚嶇О</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -590,11 +635,46 @@
/// <returns></returns>
[Route(template: "BeatRateSearch")]
[HttpGet]
- public HttpResponseMessage BeatRateSearch(string partcode = null, string partname = null, string partspec = null, string routecode = null, string stepcode = null, string eqpcode = null, string eqpname = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage BeatRateSearch(string partcode = null, string routecode = null, string stepcode = null, string eqpcode = null,int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.BeatRateSearch(partcode, partname, partspec, routecode, stepcode, eqpcode, eqpname, startNum, endNum, prop, order);
+ mes = ProductModelBLL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鎻愪氦]
+ /// <summary>
+ /// 鑺傛媿宸ヤ环鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveBeatRate")]
+ [HttpPost]
+ public HttpResponseMessage SaveBeatRate([FromBody] JObject obj)
+ {
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string routecode = obj["routecode"].ToString(); //宸ヨ壓璺嚎缂栫爜
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string wkshopcode = obj["wkshopcode"].ToString(); //鐢熶骇杞﹂棿缂栫爜
+ string eqp_value = obj["eqp_value"].ToString(); //璁惧鑺傛媿
+ string stand_value = obj["stand_value"].ToString(); //鐢熶骇鑺傛媿
+ string cavity_qty = obj["cavity_qty"].ToString(); //鍨嬭厰鏁�
+ string unprice = obj["unprice"].ToString(); //璁′欢鍗曚环
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductModelBLL.SaveBeatRate(partcode, routecode, stepcode, eqpcode, wkshopcode, eqp_value, stand_value, cavity_qty, unprice, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鍒犻櫎]
+ [Route(template: "DeleteBeatRate")]
+ [HttpPost]
+ public HttpResponseMessage DeleteBeatRate(string partcode,string routecode,string stepcode,string eqpcode)
+ {
+ mes = ProductModelBLL.DeleteBeatRate(partcode, routecode, stepcode, eqpcode);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
new file mode 100644
index 0000000..8b9f946
--- /dev/null
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -0,0 +1,137 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using VueWebApi.DLL.BLL;
+using VueWebApi.Tools;
+
+namespace VueWebApi.Controllers
+{
+ [RoutePrefix(prefix: "api/BasicSetting")]
+ [ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ public class ProductionManagementController : ApiController
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisHelper redis = new RedisHelper();
+
+
+
+ #region[ERP璁㈠崟鏌ヨ]
+ /// <summary>
+ /// ERP璁㈠崟鏌ヨ
+ /// </summary>
+ /// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
+ /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="paydate">浜や粯鏃堕棿</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "ErpOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null,string paydate=null,string creatuser=null,string createdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string paydatestartdate = ""; //浜や粯寮�濮嬫椂闂�
+ string paydateenddate = ""; //浜や粯缁撴潫鏃堕棿
+ string createstartdate = ""; //鎿嶄綔寮�濮嬫椂闂�
+ string createenddate = ""; //鎿嶄綔缁撴潫鏃堕棿
+ if (paydate != "" && paydate != null)
+ {
+ paydatestartdate = paydate.Split('~')[0].ToString();
+ paydateenddate = paydate.Split('~')[1].ToString();
+ }
+ if (createdate != "" && createdate != null)
+ {
+ createstartdate = paydate.Split('~')[0].ToString();
+ createenddate = paydate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, creatuser, createstartdate, createenddate, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟涓嬭揪]
+ /// <summary>
+ /// ERP璁㈠崟涓嬭揪
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MarkSaveErpOrder")]
+ [HttpPost]
+ public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
+ {
+ string erporderstus = obj["erporderstus"].ToString(); //璁㈠崟鐘舵�佺爜
+ string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string erpqty = obj["erpqty"].ToString(); //璁㈠崟鏁伴噺
+ string markqty = obj["markqty"].ToString(); //涓嬪崟鏁伴噺
+ string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
+ string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderstus, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty,username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟鍏抽棴]
+ /// <summary>
+ /// ERP璁㈠崟鍏抽棴
+ /// </summary>
+ /// <param name="erpordercode">璁㈠崟鍙�</param>
+ /// <returns></returns>
+ [Route(template: "ClosedErpOrder")]
+ [HttpPost]
+ public HttpResponseMessage ClosedErpOrder(string erpordercode)
+ {
+ //var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ var username = "Admin";
+ mes = ProductionManagementBLL.ClosedErpOrder(erpordercode, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[MES宸ュ崟鏌ヨ]
+ /// <summary>
+ /// MES宸ュ崟鏌ヨ
+ /// </summary>
+ /// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
+ /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="creatuser">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index a599697..e73f65c 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -69,6 +69,13 @@
}
#endregion
+ #region[鍗曚綅涓嬫媺鍒楄〃鏌ヨ]
+ public static ToMessage UomSelect()
+ {
+ return ProductModelDAL.UomSelect();
+ }
+ #endregion
+
#region[瀛樿揣妗ｆ鏌ヨ]
public static ToMessage InventoryFileSelect(string partcode, string partname, string partspec, string stocktypecode, string materialtypecode, string storehousecode, int startNum, int endNum, string prop, string order)
{
@@ -106,7 +113,12 @@
-
+ #region[宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛]
+ public static ToMessage RouteSelect()
+ {
+ return ProductModelDAL.RouteSearch();
+ }
+ #endregion
#region[宸ヨ壓璺嚎鏌ヨ]
public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
@@ -212,17 +224,38 @@
}
#endregion
- #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
- public static ToMessage StepSelectEqp(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎]
+ public static ToMessage StepSelectEqp(string stepcode)
{
- return ProductModelDAL.StepSelectEqp(partcode, routecode, stepcode, startNum, endNum, prop, order);
+ return ProductModelDAL.StepSelectEqp(stepcode);
+ }
+ #endregion
+
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
+ public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
+ {
+ return ProductModelDAL.StepSelectEqpList(partcode, routecode, stepcode, startNum, endNum, prop, order);
}
#endregion
#region[鑺傛媿宸ヤ环鏌ヨ]
- public static ToMessage BeatRateSearch(string partcode, string partname, string partspec, string routecode, string stepcode, string eqpcode, string eqpname, int startNum, int endNum, string prop, string order)
+ public static ToMessage BeatRateSearch(string partcode,string routecode, string stepcode, string eqpcode,int startNum, int endNum, string prop, string order)
{
- return ProductModelDAL.BeatRateSearch(partcode, partname, partspec, routecode, stepcode, eqpcode, eqpname, startNum, endNum, prop, order);
+ return ProductModelDAL.BeatRateSearch(partcode,routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鎻愪氦]
+ public static ToMessage SaveBeatRate(string partcode, string routecode, string stepcode, string eqpcode, string wkshopcode, string eqp_value, string stand_value, string cavity_qty, string unprice, string username)
+ {
+ return ProductModelDAL.SaveBeatRate(partcode, routecode, stepcode, eqpcode, wkshopcode, eqp_value, stand_value, cavity_qty, unprice, username);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鍒犻櫎]
+ public static ToMessage DeleteBeatRate(string partcode, string routecode, string stepcode, string eqpcode)
+ {
+ return ProductModelDAL.SaveBeatRate(partcode,routecode,stepcode,eqpcode);
}
#endregion
}
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
new file mode 100644
index 0000000..ddc9fe7
--- /dev/null
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using VueWebApi.DLL.DAL;
+using VueWebApi.Tools;
+
+namespace VueWebApi.DLL.BLL
+{
+ public class ProductionManagementBLL
+ {
+ #region[ERP璁㈠崟鏌ヨ]
+ public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string creatuser, string createstartdate, string createenddate, int endNum, string prop, string order)
+ {
+ return ProductionManagementDAL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, creatuser, createstartdate, createenddate, endNum, prop, order);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟涓嬭揪]
+ public static ToMessage MarkSaveErpOrder(string erporderstus, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
+ {
+ return ProductionManagementDAL.MarkSaveErpOrder(erporderstus, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ }
+ #endregion
+
+ #region[ERP璁㈠崟鍏抽棴]
+ public static ToMessage ClosedErpOrder(string erpordercode, string username)
+ {
+ return ProductionManagementDAL.ClosedErpOrder(erpordercode,username);
+ }
+ #endregion
+
+
+
+ #region[MES宸ュ崟鏌ヨ]
+ public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ {
+ return ProductionManagementDAL.ErpOrderSearch(mesorderstus, mesordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
index 4f11bcc..61c8a7c 100644
--- a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
@@ -258,7 +258,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.code,A.name,A.description,A.stock_code,B.name as stock_name,A.lm_user,A.lm_date
+ var sql = @"select A.id,A.code,A.name,A.description,A.stock_code,B.name as stock_name,A.lm_user,A.lm_date
from T_Sec_Loca A
left join T_Sec_Stck B on A.stock_code=B.code
where A.is_delete<>'1' " + search;
@@ -288,7 +288,7 @@
if (operType == "Add")
{
var sql = @"insert into T_Sec_Loca(code,name,description,stock_code,lm_user,lm_date)
- values(@storagecode,@storagename,@description,@username,@CreateDate)";
+ values(@storagecode,@storagename,@description,@stockcode,@username,@CreateDate)";
dynamicParams.Add("@storagecode", storagecode);
dynamicParams.Add("@storagename", storagename);
dynamicParams.Add("@description", description);
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 1ec9a72..05b65c2 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -27,7 +27,7 @@
try
{
//鑾峰彇璁惧绫诲瀷鏁版嵁
- sql = @"select code,name from T_Dict where dict_group='CHLX' ";
+ sql = @"select code,name from T_Dict where dict_type='CHLX' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -74,7 +74,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id,A.code,A.name,A.dict_code as stockcode,B.name as stockname,A.lm_user,A.lm_date
from TMateriel_Type A
- left join T_Dict B on A.dict_code=B.code and B.dict_group='CHLX'
+ left join T_Dict B on A.dict_code=B.code and B.dict_type='CHLX'
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -373,6 +373,30 @@
}
#endregion
+ #region[鍗曚綅涓嬫媺鍒楄〃鏌ヨ]
+ public static ToMessage UomSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇宸ヨ壓璺嚎鏁版嵁
+ sql = @"select code,name from TUom where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
#region[瀛樿揣妗ｆ鏌ヨ]
public static ToMessage InventoryFileSelect(string partcode, string partname, string partspec, string stocktypecode, string materialtypecode, string storehousecode, int startNum, int endNum, string prop, string order)
{
@@ -416,7 +440,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
+ var sql = @"select A.id,A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,A.lm_user,
A.lm_date,A.proute_id
from TMateriel_Info A
@@ -450,8 +474,8 @@
{
if (operType == "Add")
{
- var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,materialtypecode,stck_code,proute_id,maxqty,minqty,lm_user,lm_date)
- values(@stocktypecode,@materialtypecode,@materialtypename,@username,@CreateDate)";
+ var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date)
+ values(@materialcode,@materialname,@materialspec,@uomcode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
dynamicParams.Add("@materialcode", materialcode);
dynamicParams.Add("@materialname", materialname);
dynamicParams.Add("@materialspec", materialspec);
@@ -480,8 +504,8 @@
}
if (operType == "Update")
{
- var sql = @"update TMateriel_Type set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,materialtypecode=@materialtypecode,stck_code=@warehousecode,
- maxqty=@maxstockqty,minqty=@minstockqty lm_user=@username,lm_date=@CreateDate where id=@materialid";
+ var sql = @"update TMateriel_Type set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
+ maxqty=@maxstockqty,minqty=@minstockqty,lm_user=@username,lm_date=@CreateDate where id=@materialid";
dynamicParams.Add("@materialid", materialid);
dynamicParams.Add("@materialname", materialname);
dynamicParams.Add("@materialspec", materialspec);
@@ -635,8 +659,8 @@
for (int i = 0; i < data.Rows.Count; i++)
{
MaterialRout rout = new MaterialRout();
- rout.code = data.Rows[i]["CODE"].ToString();
- rout.name = data.Rows[i]["NAME"].ToString();
+ rout.code = data.Rows[i]["ROUTECODE"].ToString();
+ rout.name = data.Rows[i]["ROUTENAME"].ToString();
rout.flag = data.Rows[i]["FLAG"].ToString();
//鏍规嵁宸ヨ壓璺嚎缂栫爜鑾峰彇鍏宠仈鐨勫伐搴忎俊鎭�
@@ -911,7 +935,7 @@
mes.Message = "宸ヨ壓璺嚎宸茶宸ュ崟寮曠敤锛屼笉鍏佽鍒犻櫎!";
mes.data = null;
}
- else
+ else
{
//鍒ゆ柇褰撳墠宸ヨ壓璺嚎鏄惁鏈夎缃妭鎷嶅伐浠�(鏈夎缃紝鎻愮ず鍏堝垹闄よ妭鎷嶅伐浠疯缃�)
sql = @"select * from TPrteEqp_Stad where route_code=@routecode";
@@ -924,7 +948,7 @@
mes.Message = "宸ヨ壓璺嚎宸茶缃妭鎷嶅伐浠凤紝璇峰厛鍒犻櫎璁剧疆!";
mes.data = null;
}
- else
+ else
{
//鍒犻櫎宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
sql = @"delete TFlw_Rtdt where rout_code=@routecode";
@@ -966,6 +990,30 @@
+
+ #region[宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛]
+ public static ToMessage RouteSearch()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇宸ヨ壓璺嚎鏁版嵁
+ sql = @"select code,name from TFlw_Rout where is_delete<>'1' ";
+ var data = DapperHelper.selecttable(sql);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
#region[宸ュ簭鏌ヨ]
public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
@@ -1248,7 +1296,7 @@
for (int j = 0; j < data0.Rows.Count; j++)
{
StepEqpCn cn = new StepEqpCn();
- cn.code= data0.Rows[j]["CODE"].ToString();//璁惧缂栫爜
+ cn.code = data0.Rows[j]["CODE"].ToString();//璁惧缂栫爜
cn.name = data0.Rows[j]["NAME"].ToString();//璁惧鍚嶇О
cn.type = data0.Rows[j]["TYPE"].ToString();//宸ヤ綔绔欑被鍨�(E:璁惧 W:澶栧崗渚涙柟)
cn.flag = data0.Rows[j]["FLAG"].ToString();//鍏宠仈鏍囪瘑
@@ -1516,7 +1564,7 @@
sql = @"select B.stepcode as code,B.stepname as name
from TFlw_Rtdt A
inner join TStep B on A.step_code=B.stepcode
- where A.rout_code=@routecode and B.is_delete<>'1' and A.is_delete<>'1';";
+ where A.rout_code=@routecode and B.is_delete<>'1' and A.is_delete<>'1'";
dynamicParams.Add("@routecode", routecode);
var data = DapperHelper.select<ObjectData>(sql, dynamicParams);
mes.code = "200";
@@ -1534,8 +1582,36 @@
}
#endregion
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎]
+ public static ToMessage StepSelectEqp(string stepcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //閫氳繃浜у搧缂栫爜鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾夸俊鎭�
+ sql = @"select B.code,B.name from TFlw_Rteqp A
+ left join TEqpInfo B on A.eqp_code=B.code
+ where A.step_code=@stepcode and A.style='E' and A.is_delete<>'1' and B.is_delete<>'1'";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.select<ObjectData>(sql, dynamicParams);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
#region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
- public static ToMessage StepSelectEqp(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1576,7 +1652,7 @@
#endregion
#region[鑺傛媿宸ヤ环鏌ヨ]
- public static ToMessage BeatRateSearch(string partcode, string partname, string partspec, string routecode, string stepcode, string eqpcode, string eqpname, int startNum, int endNum, string prop, string order)
+ public static ToMessage BeatRateSearch(string partcode, string routecode, string stepcode, string eqpcode, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -1584,38 +1660,23 @@
{
if (partcode != "" && partcode != null)
{
- search += "and partcode like '%'+@partcode+'%' ";
+ search += "and A.materiel_code=@partcode ";
dynamicParams.Add("@stepcode", partcode);
- }
- if (partname != "" && partname != null)
- {
- search += "and stepname like '%'+@partname+'%' ";
- dynamicParams.Add("@partname", partname);
- }
- if (partspec != "" && partspec != null)
- {
- search += "and stepname like '%'+@partspec+'%' ";
- dynamicParams.Add("@partspec", partspec);
}
if (routecode != "" && routecode != null)
{
- search += "and enable=@routecode ";
+ search += "and A.route_code=@routecode ";
dynamicParams.Add("@routecode", routecode);
}
if (stepcode != "" && stepcode != null)
{
- search += "and flwtype=@stepcode ";
+ search += "and A.step_code=@stepcode ";
dynamicParams.Add("@stepcode", stepcode);
}
if (eqpcode != "" && eqpcode != null)
{
- search += "and stepname like '%'+@eqpcode+'%' ";
+ search += "and A.eqp_code=@eqpcode";
dynamicParams.Add("@eqpcode", eqpcode);
- }
- if (eqpname != "" && eqpname != null)
- {
- search += "and stepname like '%'+@eqpname+'%' ";
- dynamicParams.Add("@eqpname", eqpname);
}
if (search == "")
{
@@ -1623,9 +1684,16 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
- from TStep
- where is_delete<>'1' " + search;
+ var sql = @"select A.materiel_code as partcode,B.partname,B.partspec,A.route_code,C.name as route_name,
+ D.stepcode,D.stepname,A.eqp_code,E.name as eqp_name,E.wksp_code,F.org_name as wksp_name,
+ A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
+ from TPrteEqp_Stad A
+ left join TMateriel_Info B on A.materiel_code=B.partcode
+ left join TFlw_Rout C on A.route_code=C.code
+ left join TStep D on A.step_code=D.stepcode
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TOrganization F on E.wksp_code=F.org_code
+ where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and E.is_delete<>'1' and F.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1643,8 +1711,143 @@
}
#endregion
- #region[鑺傛媿宸ヤ环鏂板缂栬緫]
+ #region[鑺傛媿宸ヤ环鎻愪氦]
+ public static ToMessage SaveBeatRate(string partcode, string routecode, string stepcode, string eqpcode, string wkshopcode, string eqp_value, string stand_value, string cavity_qty, string unprice, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //褰撳墠宸ュ簭鏄惁鍏宠仈宸ヨ壓璺嚎
+ sql = @"select * from TPrteEqp_Stad
+ where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
+ dynamicParams.Add("@partcode", partcode);
+ dynamicParams.Add("@routecode", routecode);
+ dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0) //琚缃叧鑱旇繃灏变慨鏀�
+ {
+ sql = @"update TPrteEqp_Stad set stand_value=@stand_value,eqp_value=@eqp_value,cavity_qty=@cavity_qty,unprice=@unprice,lm_user=@username,lm_date=@userdate
+ where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode ";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ partcode = partcode,
+ routecode = routecode,
+ stepcode = stepcode,
+ eqpcode = eqpcode,
+ stand_value = stand_value,
+ eqp_value = eqp_value,
+ cavity_qty = cavity_qty,
+ unprice = unprice,
+ username = username,
+ userdate = DateTime.Now.ToString()
+ }
+ });
+ }
+ else
+ {
+ sql = @"insert into TPrteEqp_Stad(materiel_code,eqp_code,stand_value,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,step_code)
+ values(@partcode,@eqpcode,@stand_value,@routecode,@unprice,@eqp_value,@cavity_qty,@wkspcode,@username,@userdate,@stepcode)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ partcode = partcode,
+ eqpcode = eqpcode,
+ stand_value = stand_value,
+ routecode = routecode,
+ unprice = unprice,
+ eqp_value = eqp_value,
+ cavity_qty = cavity_qty,
+ wkspcode = wkshopcode,
+ username = username,
+ userdate = DateTime.Now.ToString(),
+ stepcode = stepcode
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+ #region[鑺傛媿宸ヤ环鍒犻櫎]
+ public static ToMessage SaveBeatRate(string partcode, string routecode, string stepcode, string eqpcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+
+ //鍒犻櫎鑺傛媿宸ヤ环琛�
+ sql = @"delete TPrteEqp_Stad where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ partcode = partcode,
+ routecode = routecode,
+ stepcode = stepcode,
+ eqpcode = eqpcode
+ }
+ });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍒犻櫎澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
#endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
new file mode 100644
index 0000000..5986321
--- /dev/null
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -0,0 +1,364 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using VueWebApi.Tools;
+
+namespace VueWebApi.DLL.DAL
+{
+ public class ProductionManagementDAL
+ {
+ public static DataTable dt; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static bool res; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+ public static string strProcName = ""; //瀹氫箟鍏ㄥ眬sql鍙橀噺
+ public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
+ public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
+
+
+ #region[ERP璁㈠崟鏌ヨ]
+ public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string creatuser, string createstartdate, string createenddate, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (erporderstus != "" && erporderstus != null)
+ {
+ search += "and A.status=@erporderstus ";
+ dynamicParams.Add("@erporderstus", erporderstus);
+ }
+ if (erpordercode != "" && erpordercode != null)
+ {
+ search += "and A.wo like '%'+@erpordercode+'%' ";
+ dynamicParams.Add("@erpordercode", erpordercode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and A.materiel_code like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and B.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and B.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (paydatestartdate != "" && paydatestartdate != null)
+ {
+ search += "and A.paydate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate);
+ dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
+ }
+ if (createstartdate != "" && createstartdate != null)
+ {
+ search += "and A.createdate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@createstartdate", createstartdate);
+ dynamicParams.Add("@createenddate", createenddate + " 23:59:59");
+ }
+ if (creatuser != "" && creatuser != null)
+ {
+ search += "and A.createuser like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
+ A.stck_code,D.name as stck_name,A.paydate,A.createuser,A.createdate
+ from TKimp_Ewo A
+ left join TMateriel_Info B on A.materiel_code=B.partcode
+ left join TOrganization C on A.wkshp_code=C.org_code
+ left join T_Sec_Stck D on A.stck_code=D.code " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[ERP璁㈠崟涓嬭揪]
+ public static ToMessage MarkSaveErpOrder(string erporderstus, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ list.Clear();
+ //鑾峰彇鎷嗗崟鏁伴噺:鍚戜笅鍙栨暣
+ decimal cdqty = Math.Floor(decimal.Parse(markqty) / decimal.Parse(ordernum));
+ //瀹氫箟绱涓嬪崟鏁伴噺
+ decimal sumqty = 0;
+ //瀹氫箟鏈�鏂扮敓鎴愮殑宸ュ崟鍙�
+ string wo = "";
+ //瀹氫箟宸ュ崟娴佹按鍙�
+ int num = 0;
+ //寰幆涓嬪崟鍗曟暟(鐢熸垚瀵瑰簲鍑犲紶MES宸ュ崟)
+ for (int i = 1; i <= Convert.ToInt32(ordernum); i++)
+ {
+ sumqty += cdqty;
+ //鑾峰彇鏈�澶у崟鎹彿
+ if (i == 1) //棣栧崟鑾峰彇宸ュ崟鍙�
+ {
+ sql = @"select isnull(max(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code))),0)+1 as worknumb from TK_Wrk_Man where m_po=@erpordercode";
+ dynamicParams.Add("@erpordercode", erpordercode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
+ wo = erpordercode + "_" + num;
+ }
+ else
+ {
+ num = num + 1;
+ wo = erpordercode + "_" + num;
+ }
+ if (i == Convert.ToInt32(ordernum)) //鏈�鍚庝竴鍗曟椂
+ {
+ sql = @"insert into TK_Wrk_Man(wo_code,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code = wo,
+ status = erporderstus,
+ wkshp_code = wkshopcode,
+ plan_qty = cdqty + (decimal.Parse(markqty) - sumqty), //鏈崟涓嬪崟鏁伴噺=鍒囧垎鏁伴噺+(涓嬪崟鏁伴噺-绱鍒囧垎涓嬪崟鏁伴噺)
+ stck_code = warehousecode,
+ materiel_code = partcode,
+ m_po = erpordercode,
+ username = username,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
+ }
+ else
+ {
+
+ sql = @"insert into TK_Wrk_Man(wo_code,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code = wo,
+ status = erporderstus,
+ wkshp_code = wkshopcode,
+ plan_qty = cdqty,
+ stck_code = warehousecode,
+ materiel_code = partcode,
+ m_po = erpordercode,
+ username = username,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ }
+ if (decimal.Parse(erpqty) == decimal.Parse(markqty) + decimal.Parse(relse_qty)) //濡傛灉ERP璁㈠崟=涓嬪崟鏁伴噺+宸蹭笅鍗曟暟閲�,鍒欐洿鏂癊RP璁㈠崟琛ㄧ姸鎬佷负CREATED:宸插垱寤�
+ {
+ sql = @"update TKimp_Ewo set status='CREATED',relse_qty=relse_qty+@sumqty where wo=@wo";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = erpordercode,
+ sumqty = sumqty
+ }
+ });
+ }
+ else //鏇存柊ERP璁㈠崟琛ㄧ姸鎬佷负CREATING:鍒涘缓涓�
+ {
+ sql = @"update TKimp_Ewo set status='CREATING',relse_qty=relse_qty+@sumqty where wo=@wo";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = erpordercode,
+ sumqty = sumqty
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[ERP璁㈠崟鍏抽棴]
+ public static ToMessage ClosedErpOrder(string erpordercode, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TK_Wrk_Man where m_po=@erpordercode";
+ dynamicParams.Add("@erpordercode", erpordercode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠璁㈠崟鏈変笅杈剧殑MES宸ュ崟,涓嶅厑璁稿叧闂�,璇峰厛鍒犻櫎鎴栧叧闂浉鍏冲伐鍗�!";
+ mes.data = null;
+ }
+ else
+ {
+ //鍏抽棴璁㈠崟
+ sql = @"update TKimp_Ewo set status='CLOSED' where wo=@wo";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = erpordercode
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "璁㈠崟鍏抽棴鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璁㈠崟鍏抽棴澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[MES宸ュ崟鏌ヨ]
+ public static ToMessage ErpOrderSearch(string mesorderstus, string mesordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mesorderstus != "" && mesorderstus != null)
+ {
+ search += "and A.status=@mesorderstus ";
+ dynamicParams.Add("@mesorderstus", mesorderstus);
+ }
+ if (mesordercode != "" && mesordercode != null)
+ {
+ search += "and A.wo like '%'+@mesordercode+'%' ";
+ dynamicParams.Add("@mesordercode", mesordercode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and A.materiel_code like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and B.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and B.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (createdate != "" && createdate != null)
+ {
+ search += "and A.paydate=@createdate ";
+ dynamicParams.Add("@createdate", createdate);
+ }
+ if (creatuser != "" && creatuser != null)
+ {
+ search += "and A.createuser like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
+ A.stck_code,D.name as stck_name,A.paydate,A.createuser,A.createdate
+ from TKimp_Ewo A
+ left join TMateriel_Info B on A.materiel_code=B.partcode
+ left join TOrganization C on A.wkshp_code=C.org_code
+ left join T_Sec_Stck D on A.stck_code=D.code " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Logs/2022-06-27.TXT b/VueWebApi/Logs/2022-06-27.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-06-27.TXT
diff --git a/VueWebApi/Logs/2022-06-28.TXT b/VueWebApi/Logs/2022-06-28.TXT
new file mode 100644
index 0000000..5545087
--- /dev/null
+++ b/VueWebApi/Logs/2022-06-28.TXT
@@ -0,0 +1,71 @@
+ 【时间】:2022-06-28 11:35:44,199
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 13
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：“)”附近有语法错误。
+引发异常路径：/api/BasicSetting/MarkSaveErpOrder
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteNonQueryTds(String methodName, Boolean async, Int32 timeout, Boolean asyncWrite)
+ 在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
+ 在 Dapper.SqlMapper.ExecuteCommand(IDbConnection cnn, CommandDefinition& command, Action`2 paramReader)
+ 在 Dapper.SqlMapper.ExecuteImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.Execute(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.DoTransaction(List`1 sqlList) 位置 D:\新凯迪MES\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 355
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-06-28 12:16:52,006
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 15
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：必须声明标量变量 "@erpordercode"。
+引发异常路径：/api/BasicSetting/MarkSaveErpOrder
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteNonQueryTds(String methodName, Boolean async, Int32 timeout, Boolean asyncWrite)
+ 在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
+ 在 Dapper.SqlMapper.ExecuteCommand(IDbConnection cnn, CommandDefinition& command, Action`2 paramReader)
+ 在 Dapper.SqlMapper.ExecuteImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.Execute(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.DoTransaction(List`1 sqlList) 位置 D:\新凯迪MES\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 355
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
+ 【时间】:2022-06-28 17:04:53,184
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 11
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：必须声明标量变量 "@sumqty"。
+引发异常路径：/api/BasicSetting/ClosedErpOrder
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
+ 在 Dapper.SqlMapper.ExecuteCommand(IDbConnection cnn, CommandDefinition& command, Action`2 paramReader)
+ 在 Dapper.SqlMapper.ExecuteImpl(IDbConnection cnn, CommandDefinition& command)
+ 在 Dapper.SqlMapper.Execute(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.DoTransaction(List`1 sqlList) 位置 D:\新凯迪MES\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 355
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 036a81d..a66a145 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -372,13 +372,13 @@
<publishTime>11/28/2018 13:04:24</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>06/24/2022 16:42:15</publishTime>
+ <publishTime>06/28/2022 17:45:56</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>06/24/2022 16:42:15</publishTime>
+ <publishTime>06/28/2022 17:45:56</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
<publishTime>06/16/2022 14:26:01</publishTime>
@@ -519,7 +519,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/21/2022 16:19:30</publishTime>
+ <publishTime>06/24/2022 23:51:54</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index e20c2a8..2d2a60c 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -256,6 +256,7 @@
<Compile Include="Controllers\ImportExcelController.cs" />
<Compile Include="Controllers\LoginController.cs" />
<Compile Include="Controllers\MaterialManagerController.cs" />
+ <Compile Include="Controllers\ProductionManagementController.cs" />
<Compile Include="Controllers\ProductModelController.cs" />
<Compile Include="Controllers\SystemSettingController.cs" />
<Compile Include="Controllers\ValuesController.cs" />
@@ -264,6 +265,7 @@
<Compile Include="DLL\BLL\ExcelCheckBLL.cs" />
<Compile Include="DLL\BLL\LoginBLL.cs" />
<Compile Include="DLL\BLL\MaterialManagerBLL.cs" />
+ <Compile Include="DLL\BLL\ProductionManagementBLL.cs" />
<Compile Include="DLL\BLL\ProductModelBLL.cs" />
<Compile Include="DLL\BLL\SystemSettingBLL.cs" />
<Compile Include="DLL\BLL\UserDataBLL.cs" />
@@ -272,6 +274,7 @@
<Compile Include="DLL\DAL\ExcelCheckDAL.cs" />
<Compile Include="DLL\DAL\LoginDAL.cs" />
<Compile Include="DLL\DAL\MaterialManagerDAL.cs" />
+ <Compile Include="DLL\DAL\ProductionManagementDAL.cs" />
<Compile Include="DLL\DAL\ProductModelDAL.cs" />
<Compile Include="DLL\DAL\SystemSettingDAL.cs" />
<Compile Include="DLL\DAL\UserDataDAL.cs" />
diff --git a/VueWebApi/VueWebApi.csproj.user b/VueWebApi/VueWebApi.csproj.user
index d9b58fe..926c718 100644
--- a/VueWebApi/VueWebApi.csproj.user
+++ b/VueWebApi/VueWebApi.csproj.user
@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 71deec8..df30966 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 0741fab..0e9a620 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -987,6 +987,38 @@
<param name="storagecode">搴撲綅缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <summary>
+ ERP璁㈠崟鏌ヨ
+ </summary>
+ <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
+ <param name="erpordercode">璁㈠崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">浜у搧瑙勬牸</param>
+ <param name="paydate">浜や粯鏃堕棿</param>
+ <param name="creatuser">鍒涘缓浜哄憳</param>
+ <param name="createdate">鍒涘缓鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MarkSaveErpOrder(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ ERP璁㈠崟涓嬭揪
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String)">
+ <summary>
+ ERP璁㈠崟鍏抽棴
+ </summary>
+ <param name="erpordercode">璁㈠崟鍙�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelect">
<summary>
瀛樿揣绫诲瀷鎺ュ彛
@@ -1046,9 +1078,15 @@
</member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelectMaterialType(System.String)">
<summary>
- 瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨�
+ 瀛樿揣绫诲瀷鏌ユ壘鐗╂枡绫诲瀷
</summary>
<param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.UomSelect">
+ <summary>
+ 鍗曚綅涓嬫媺鍒楄〃鏌ヨ
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductModelController.InventoryFileSelect(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -1094,6 +1132,12 @@
</summary>
<param name="partcode">鐗╂枡缂栫爜</param>
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.RouteSelect">
+ <summary>
+ 宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛
+ </summary>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -1184,6 +1228,14 @@
<param name="stepcode">宸ュ簭缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationDefect(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <summary>
+ 宸ュ簭鍏宠仈缂洪櫡鎻愪氦
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <param name="json">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.PartSelect">
<summary>
浜у搧淇℃伅涓嬫媺妗嗘煡璇�
@@ -1204,9 +1256,16 @@
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqp(System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqp(System.String)">
<summary>
- 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚�
+ 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎
+ </summary>
+ <param name="stepcode">宸ュ簭缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.StepSelectEqpList(System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <summary>
+ 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚�
</summary>
<param name="partcode">浜у搧缂栫爜</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -1217,23 +1276,27 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.BeatRateSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.ProductModelController.BeatRateSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
鑺傛媿宸ヤ环鏌ヨ
</summary>
<param name="partcode">浜у搧缂栫爜</param>
- <param name="partname">浜у搧鍚嶇О</param>
- <param name="partspec">浜у搧瑙勬牸</param>
<param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
<param name="stepcode">宸ュ簭缂栫爜</param>
<param name="eqpcode">璁惧缂栫爜</param>
- <param name="eqpname">璁惧鍚嶇О</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveBeatRate(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鑺傛媿宸ヤ环鎻愪氦
+ </summary>
+ <param name="obj">鎻愪氦鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.SystemSettingController.EncodingRules(System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
缂栫爜瑙勫垯鏌ヨ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
index 654c0bb..8b457e2 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ead7cf2282d587d6d640ba9024111a7417c9f938
+9eca3a694af2cbf87424cd7c2924c1c66317385c
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
index 89d6004..5bc209e 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -153,4 +153,3 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Debug\VueWebApi.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Debug\VueWebApi.pdb
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.AssemblyReference.cache
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index 71deec8..c9e4440 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index f9e0494..1623563 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -15,7 +15,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃甶p-->
<add key="RedisConnIp" value="127.0.0.1" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 8eb0410..df30966 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index 0b14d31..d5f88f4 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -15,7 +15,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃甶p-->
<add key="RedisConnIp" value="127.0.0.1" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index f9e0494..1623563 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -15,7 +15,7 @@
<!--鏈湴鐜-->
<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
<!--鏈嶅姟鍣ㄧ幆澧�-->
- <add key="DBServer" value="Data Source=121.196.36.24;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
+ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃甶p-->
<add key="RedisConnIp" value="127.0.0.1" />
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index d7bf93a..ff95c47 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b66fb695daf003212f22fc5e10c6694251fb7628
+5d8d719063c73a5c06cd8873bc89ea569af1241b
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 8eb0410..df30966 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3