From 770c681572301c938d7b9adcc60d9aad9d1dd604 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:37:03 +0800
Subject: [PATCH] 1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp) 4.增加生成系统条码接口(自定义)
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Controllers/SystemSettingController.cs | 17
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/Controllers/BaseDateController.cs | 63 ++
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/BaseDateDAL.cs | 123 ++++
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 455 ++++++++++++++++
VueWebApi/VueWebApi.csproj | 6
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 97 +++
VueWebApi/DLL/BLL/SystemSettingBLL.cs | 8
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/BaseDateBLL.cs | 33 +
VueWebApi/Tools/AppLableBarCode.cs | 183 ++++++
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/Models/AppLabCode.cs | 27
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 9
VueWebApi/Tools/SeachEncodeJob.cs | 265 +++++++++
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 10
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 46 +
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/bin/VueWebApi.xml | 149 +++++
/dev/null | 0
VueWebApi/Controllers/MessageController.cs | 2
VueWebApi/obj/Release/VueWebApi.dll | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 141 +++++
VueWebApi/Tools/DapperHelper.cs | 27
29 files changed, 1,638 insertions(+), 26 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 9798d54..0768f20 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/BaseDateController.cs b/VueWebApi/Controllers/BaseDateController.cs
new file mode 100644
index 0000000..4e0780b
--- /dev/null
+++ b/VueWebApi/Controllers/BaseDateController.cs
@@ -0,0 +1,63 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using VueWebApi.DLL.BLL;
+using VueWebApi.Tools;
+
+namespace VueWebApi.Controllers
+{
+ [RoutePrefix(prefix: "api/BaseDate")]
+ [ControllerGroup("鍩烘湰璧勬枡", "鍦ㄧ嚎鎺ュ彛")]
+ public class BaseDateController : ApiController
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisHelper redis = new RedisHelper();
+
+
+ #region[ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ]
+ /// <summary>
+ /// ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ErpWkshopDepartmentSelect")]
+ [HttpGet]
+ public HttpResponseMessage ErpWkshopDepartmentSelect()
+ {
+ mes = BaseDateBLL.ErpWkshopDepartmentSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[ERP鐢熶粨搴撲俊鎭煡璇
+ /// <summary>
+ /// ERP鐢熶粨搴撲俊鎭煡璇�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ErpWarehouseSelect")]
+ [HttpGet]
+ public HttpResponseMessage ErpWarehouseSelect()
+ {
+ mes = BaseDateBLL.ErpWarehouseSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[ERP鐢熺敤鎴蜂俊鎭煡璇
+ /// <summary>
+ /// ERP鐢熺敤鎴蜂俊鎭煡璇�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "ErpUserSelect")]
+ [HttpGet]
+ public HttpResponseMessage ErpUserSelect()
+ {
+ mes = BaseDateBLL.ErpUserSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebApi/Controllers/MessageController.cs b/VueWebApi/Controllers/MessageController.cs
index 329f298..0b2bab0 100644
--- a/VueWebApi/Controllers/MessageController.cs
+++ b/VueWebApi/Controllers/MessageController.cs
@@ -16,7 +16,7 @@
namespace VueWebApi.Controllers
{
[RoutePrefix(prefix: "api/Message")]
- [ControllerGroup("T8鎺堟潈绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ [ControllerGroup("T+鎺堟潈绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
public class MessageController : ApiController
{
public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 2de4c6e..09fb41f 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -504,6 +504,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -513,7 +514,7 @@
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -556,6 +557,7 @@
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
@@ -564,7 +566,7 @@
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -908,5 +910,96 @@
return TJson.toJson(mes);
}
#endregion
+
+
+ #region[鐢熶骇鍏ュ簱鏉＄爜琛ユ墦]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鏉＄爜琛ユ墦
+ /// </summary>
+ /// <param name="ordercode">宸ュ崟缂栧彿</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseLabCode")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseLabCode(string ordercode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseLabCode(ordercode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟
+ /// </summary>
+ /// <param name="ordertype">鍗曟嵁绫诲瀷</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseWkshopOrder")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseWkshopOrder(string ordertype, string wkshopcode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseWkshopOrder(ordertype, wkshopcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱淇℃伅鏌ヨ]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="erpordercode">璁㈠崟缂栧彿</param>
+ /// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="orderdate">宸ュ崟鏃ユ湡</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSearch")]
+ [HttpGet]
+ public HttpResponseMessage ProductInHouseOrderSearch(string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string orderdate = null)
+ {
+ string startorderdate = ""; //宸ュ崟寮�濮嬫椂闂�
+ string endorderdate = ""; //宸ュ崟缁撴潫鏃堕棿
+ if (orderdate != "" && orderdate != null)
+ {
+ startorderdate = orderdate.Split('~')[0].ToString();
+ endorderdate = orderdate.Split('~')[1].ToString();
+ }
+ mes = ProductionManagementBLL.ProductInHouseOrderSearch(wkshopcode, erpordercode, mesordercode, partcode, partname, partspec, startorderdate, endorderdate);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙穄
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderCodeSearch")]
+ [HttpPost]
+ public HttpResponseMessage ProductInHouseOrderCodeSearch(string rightcode)
+ {
+ mes = ProductionManagementBLL.ProductInHouseOrderCodeSearch(rightcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鏄庣粏鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "ProductInHouseOrderSeave")]
+ [HttpPost]
+ public HttpResponseMessage ProductInHouseOrderSeave([FromBody] JObject obj)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.ProductInHouseOrderSeave(username, obj);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebApi/Controllers/SystemSettingController.cs b/VueWebApi/Controllers/SystemSettingController.cs
index 4c266d6..bbfc18c 100644
--- a/VueWebApi/Controllers/SystemSettingController.cs
+++ b/VueWebApi/Controllers/SystemSettingController.cs
@@ -79,6 +79,23 @@
}
#endregion
+ #region[鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)]
+ /// <summary>
+ /// 鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="qty">鏁伴噺</param>
+ /// <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ /// <returns></returns>
+ [Route(template: "LabelBarCode")]
+ [HttpGet]
+ public HttpResponseMessage LabelBarCode(string rightcode, string partcode, string qty, string onelabqty)
+ {
+ mes = SystemSettingBLL.LabelBarCode(rightcode, partcode, qty, onelabqty);
+ return TJson.toJson(mes);
+ }
+ #endregion
#region[杞﹂棿鍏憡鍒楄〃]
diff --git a/VueWebApi/DLL/BLL/BaseDateBLL.cs b/VueWebApi/DLL/BLL/BaseDateBLL.cs
new file mode 100644
index 0000000..0be63f4
--- /dev/null
+++ b/VueWebApi/DLL/BLL/BaseDateBLL.cs
@@ -0,0 +1,33 @@
+锘縰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 BaseDateBLL
+ {
+ #region[ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ]
+ public static ToMessage ErpWkshopDepartmentSelect()
+ {
+ return BaseDateDAL.ErpWkshopDepartmentSelect();
+ }
+ #endregion
+
+ #region[ERP鐢熶粨搴撲俊鎭煡璇
+ public static ToMessage ErpWarehouseSelect()
+ {
+ return BaseDateDAL.ErpWarehouseSelect();
+ }
+ #endregion
+
+ #region[ERP鐢熺敤鎴蜂俊鎭煡璇
+ public static ToMessage ErpUserSelect()
+ {
+ return BaseDateDAL.ErpUserSelect();
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index b1c14aa..767c530 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -186,9 +187,9 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦]
- public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode, string usergroupcode, string reportuser, string taskqty,string startqty, string reportqty,string ngqty, string badcode,string remarks, string username)
+ public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode,string inbarcode, string usergroupcode, string reportuser, string taskqty,string startqty, string reportqty,string ngqty, string badcode,string remarks, string username)
{
- return ProductionManagementDAL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+ return ProductionManagementDAL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
}
#endregion
@@ -200,9 +201,9 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐, 鏀舵枡鎻愪氦]
- public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode, string inuser, string taskqty, string sqty, string ngqty, string badcode,string remarks, string username)
+ public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode,string inbarcode, string inuser, string taskqty, string sqty, string ngqty, string badcode,string remarks, string username)
{
- return ProductionManagementDAL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+ return ProductionManagementDAL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
}
#endregion
@@ -329,5 +330,40 @@
}
#endregion
+
+ #region[鐢熶骇鍏ュ簱鏉＄爜琛ユ墦]
+ public static ToMessage ProductInHouseLabCode(string ordercode)
+ {
+ return ProductionManagementDAL.ProductInHouseLabCode(ordercode);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟]
+ public static ToMessage ProductInHouseWkshopOrder(string ordertype, string wkshopcode)
+ {
+ return ProductionManagementDAL.ProductInHouseWkshopOrder(ordertype, wkshopcode);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱淇℃伅鏌ヨ]
+ public static ToMessage ProductInHouseOrderSearch(string wkshopcode, string erpordercode, string mesordercode, string partcode, string partname, string partspec, string startorderdate, string endorderdate)
+ {
+ return ProductionManagementDAL.ProductInHouseOrderSearch(wkshopcode, erpordercode, mesordercode, partcode, partname, partspec, startorderdate, endorderdate);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙穄
+ public static ToMessage ProductInHouseOrderCodeSearch(string rightcode)
+ {
+ return ProductionManagementDAL.ProductInHouseOrderCodeSearch(rightcode);
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鎻愪氦]
+ public static ToMessage ProductInHouseOrderSeave(string username, JObject obj)
+ {
+ return ProductionManagementDAL.ProductInHouseOrderSeave(username, obj);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/SystemSettingBLL.cs b/VueWebApi/DLL/BLL/SystemSettingBLL.cs
index c9a6d26..5a767b0 100644
--- a/VueWebApi/DLL/BLL/SystemSettingBLL.cs
+++ b/VueWebApi/DLL/BLL/SystemSettingBLL.cs
@@ -32,6 +32,14 @@
#endregion
+ #region[鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)]
+ public static ToMessage LabelBarCode(string rightcode, string partcode, string qty, string onelabqty)
+ {
+ return SystemSettingDAL.LabelBarCode(rightcode, partcode, qty, onelabqty);
+ }
+ #endregion
+
+
#region[杞﹂棿鍏憡鍒楄〃]
public static ToMessage SystemAnnouncementSearch(string wkspcode, string ancetitle, string ancecont, string cancel, string level, int startNum, int endNum, string prop, string order)
{
diff --git a/VueWebApi/DLL/DAL/BaseDateDAL.cs b/VueWebApi/DLL/DAL/BaseDateDAL.cs
new file mode 100644
index 0000000..cece1f0
--- /dev/null
+++ b/VueWebApi/DLL/DAL/BaseDateDAL.cs
@@ -0,0 +1,123 @@
+锘縰sing 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 BaseDateDAL
+ {
+ 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 ErpWkshopDepartmentSelect()
+ {
+ string sql = "";
+ try
+ {
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_BASIC_Wkshop_Department";
+ var data = DapperHelper.lissql(sql);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ 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 ErpWarehouseSelect()
+ {
+ string sql = "";
+ try
+ {
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_BASIC_Warehouse";
+ var data = DapperHelper.lissql(sql);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ 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 ErpUserSelect()
+ {
+ string sql = "";
+ try
+ {
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_BASIC_User";
+ var data = DapperHelper.lissql(sql);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ 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
index f26563d..ca8abc9 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -1,4 +1,5 @@
锘縰sing Dapper;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -77,7 +78,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id, 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.planstartdate,A.planenddate,U.username as createuser,A.createdate
+ A.stck_code,D.name as stck_name,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as 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
@@ -1589,7 +1590,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦]
- public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, string ngqty, string badcode, string remarks, string username)
+ public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string eqpcode,string inbarcode, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, string ngqty, string badcode, string remarks, string username)
{
var sql = "";
string[] arra = new string[] { };
@@ -1639,6 +1640,7 @@
dynamicParamsTran.Add("@stepseq", stepseq);
dynamicParamsTran.Add("@stepcode", stepcode);
dynamicParamsTran.Add("@eqpcode", eqpcode);
+ dynamicParamsTran.Add("@inbarcode", inbarcode);
dynamicParamsTran.Add("@usergroupcode", usergroupcode);
dynamicParamsTran.Add("@reportuser", reportuser);
dynamicParamsTran.Add("@taskqty", taskqty);
@@ -1673,6 +1675,7 @@
dynamicParamsTran.Add("@stepseq", stepseq);
dynamicParamsTran.Add("@stepcode", stepcode);
dynamicParamsTran.Add("@eqpcode", eqpcode);
+ dynamicParamsTran.Add("@inbarcode", inbarcode);
dynamicParamsTran.Add("@usergroupcode", usergroupcode);
dynamicParamsTran.Add("@reportuser", reportuser);
dynamicParamsTran.Add("@taskqty", taskqty);
@@ -1788,7 +1791,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐, 鏀舵枡鎻愪氦]
- public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode, string inuser, string taskqty, string sqty, string ngqty, string badcode, string remarks, string username)
+ public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode,string inbarcode, string inuser, string taskqty, string sqty, string ngqty, string badcode, string remarks, string username)
{
var sql = "";
string[] arra1 = new string[] { };
@@ -1872,6 +1875,7 @@
dynamicParamsTran.Add("@stepseq", stepseq);
dynamicParamsTran.Add("@stepcode", stepcode);
dynamicParamsTran.Add("@wxcode", wxcode);
+ dynamicParamsTran.Add("@inbarcode", inbarcode);
dynamicParamsTran.Add("@inuser", inuser);
dynamicParamsTran.Add("@taskqty", taskqty);
dynamicParamsTran.Add("@sqty", sqty);
@@ -1905,6 +1909,7 @@
dynamicParamsTran.Add("@stepseq", stepseq);
dynamicParamsTran.Add("@stepcode", stepcode);
dynamicParamsTran.Add("@wxcode", wxcode);
+ dynamicParamsTran.Add("@inbarcode", inbarcode);
dynamicParamsTran.Add("@inuser", inuser);
dynamicParamsTran.Add("@taskqty", taskqty);
dynamicParamsTran.Add("@sqty", sqty);
@@ -3402,5 +3407,449 @@
}
#endregion
+
+ #region[鐢熶骇鍏ュ簱鏉＄爜琛ユ墦]
+ public static ToMessage ProductInHouseLabCode(string ordercode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇鏈亾宸ュ簭鎶ュ伐鏉＄爜鏁版嵁
+ sql = @"select * from(
+ select A.inbarcode,A.wo_code,P.partcode,P.partname,P.partspec,
+ A.good_qty,U.username,A.lm_date
+ from TK_Wrk_Record A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TMateriel_Info P on A.materiel_code=P.partcode
+ inner join TUser U on A.lm_user=U.usercode
+ where A.style='B' and S.isend='Y' and A.good_qty>0 and A.inbarcode<>''
+ union all
+ select A.inbarcode,A.wo_code,P.partcode,P.partname,P.partspec,
+ A.sqty as sqty,U.username,A.lm_date
+ from TK_Wrk_OutRecord A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TMateriel_Info P on A.materiel_code=P.partcode
+ inner join TUser U on A.lm_user=U.usercode
+ where A.style='S' and S.isend='Y' and A.sqty>0 and A.inbarcode<>''
+ ) as AA where AA.wo_code=@ordercode";
+ dynamicParams.Add("@ordercode", ordercode);
+ var data = DapperHelper.selectdata(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 ProductInHouseWkshopOrder(string ordertype, string wkshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (ordertype == "Y") //鏈夋簮鍗�
+ {
+ sql = @"select distinct AA.ordercode from (
+ select A.m_po as ordercode
+ from TK_Wrk_Man A
+ inner join TK_Wrk_Step B on A.wo_code=B.wo_code
+ inner join TK_Wrk_Record S on B.wo_code=S.wo_code and B.step_code=S.step_code
+ where S.style='B' and S.inbarcode<>'' and B.isend='Y' and A.m_po<>'' and S.good_qty>0 and S.good_qty>isnull(S.inhouseqty,0) and A.wkshp_code=@wkshopcode
+ union all
+ select A.m_po as ordercode
+ from TK_Wrk_Man A
+ inner join TK_Wrk_Step B on A.wo_code=B.wo_code
+ inner join TK_Wrk_OutRecord S on B.wo_code=S.wo_code and B.step_code=S.step_code
+ where S.style='S' and S.inbarcode<>'' and B.isend='Y' and A.m_po<>'' and S.sqty>0 and S.sqty>isnull(S.inhouseqty,0) and A.wkshp_code=@wkshopcode
+ ) as AA";
+ }
+ if (ordertype == "N")
+ {
+ sql = @"select distinct AA.ordercode from (
+ select A.wo_code as ordercode
+ from TK_Wrk_Man A
+ inner join TK_Wrk_Step B on A.wo_code=B.wo_code
+ inner join TK_Wrk_Record S on B.wo_code=S.wo_code and B.step_code=S.step_code
+ where S.style='B' and S.inbarcode<>'' and B.isend='Y' and A.m_po='' and S.good_qty>0 and S.good_qty>isnull(S.inhouseqty,0) and A.wkshp_code=@wkshopcode
+ union all
+ select A.wo_code as ordercode
+ from TK_Wrk_Man A
+ inner join TK_Wrk_Step B on A.wo_code=B.wo_code
+ inner join TK_Wrk_OutRecord S on B.wo_code=S.wo_code and B.step_code=S.step_code
+ where S.style='S' and S.inbarcode<>'' and B.isend='Y' and A.m_po='' and S.sqty>0 and S.sqty>isnull(S.inhouseqty,0) and A.wkshp_code=@wkshopcode
+ ) as AA";
+ }
+
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ var data = DapperHelper.selectdata(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 ProductInHouseOrderSearch(string wkshopcode, string erpordercode, string mesordercode, string partcode, string partname, string partspec, string startorderdate, string endorderdate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
+ if (erpordercode != "" && erpordercode != null)
+ {
+ search += "and AA.m_po like '%'+@erpordercode+'%' ";
+ dynamicParams.Add("@erpordercode", erpordercode);
+ }
+ if (mesordercode != "" && mesordercode != null)
+ {
+ search += "and AA.wo_code like '%'+@mesordercode+'%' ";
+ dynamicParams.Add("@mesordercode", mesordercode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and AA.partcode like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and AA.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and AA.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (startorderdate != "" && startorderdate != null)
+ {
+ search += "and AA.lm_date between @startorderdate and @endorderdate ";
+ dynamicParams.Add("@opencheckdate", startorderdate + " 00:00:00");
+ dynamicParams.Add("@endorderdate", endorderdate + " 23:59:59");
+ }
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select * from(
+ select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
+ A.step_code,E.wkshp_id,M.wkshp_code,stck_id,K.code as stockcode,k.name as stockname,
+ E.saleOrderqty,E.qty,M.plan_qty,A.good_qty,isnull(A.inhouseqty,0) as inhouseqty,A.good_qty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style
+ from TK_Wrk_Record A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TK_Wrk_Man M on S.wo_code=M.wo_code
+ inner join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TKimp_Ewo E on M.sourceid=E.id
+ left join T_Sec_Stck K on E.stck_code=K.code
+ where A.style='B' and A.inbarcode<>'' and S.isend='Y' and A.good_qty>0
+ union all
+ select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
+ A.step_code,E.wkshp_id,M.wkshp_code,stck_id,K.code as stockcode,k.name as stockname,
+ E.saleOrderqty,E.qty,M.plan_qty,A.sqty as sqty,isnull(A.inhouseqty,0) as inhouseqty,A.sqty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style
+ from TK_Wrk_OutRecord A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TK_Wrk_Man M on S.wo_code=M.wo_code
+ inner join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TKimp_Ewo E on M.sourceid=E.id
+ left join T_Sec_Stck K on E.stck_code=K.code
+ where A.style='S' and A.inbarcode<>'' and S.isend='Y' and A.sqty>0
+ ) as AA where AA.good_qty>AA.inhouseqty " + search;
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ 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 ProductInHouseOrderCodeSearch(string rightcode)
+ {
+ try
+ {
+ mes = SeachEncodeJob.EncodingSeach(rightcode);
+ return mes;
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢熶骇鍏ュ簱鎻愪氦]
+ public static ToMessage ProductInHouseOrderSeave(string username, JObject obj)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ var dynamicParams1 = new DynamicParameters();
+ try
+ {
+ string sub = obj["sub"].ToString();//鏄庣粏
+ string subsum = obj["subsum"].ToString();//姹囨��
+ //鑾峰彇鎶ュ伐鏄庣粏
+ JArray sub_arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(sub);
+ //鑾峰彇姹囨��
+ JArray subsum_arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(subsum);
+
+ //鍥炲啓鎶ュ伐璁板綍涓昏〃銆佸伐鍗曞伐搴忚〃宸插叆搴撴暟閲忋�佸啓鍏ES搴撳瓨琛�
+ for (int i = 0; i < sub_arra.Count; i++)
+ {
+ if (sub_arra[i]["style"].ToString() == "B")
+ {
+ //鍥炲啓鎶ュ伐璁板綍涓昏〃鐨勫叆搴撴暟閲�
+ sql = @"update TK_Wrk_Record set inhouseqty=inhouseqty+@stinhouseqty where inbarcode=@inbarcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ stinhouseqty = decimal.Parse(sub_arra[i]["stinhouseqty"].ToString()),
+ inbarcode = sub_arra[i]["inbarcode"].ToString()
+ }
+ });
+ }
+ if (sub_arra[i]["style"].ToString() == "S")
+ {
+ //鍥炲啓澶栧崗鏀舵枡璁板綍涓昏〃鐨勫叆搴撴暟閲�
+ sql = @"update TK_Wrk_OutRecord set inhouseqty=inhouseqty+@stinhouseqty where inbarcode=@inbarcode";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ stinhouseqty = decimal.Parse(sub_arra[i]["stinhouseqty"].ToString()),
+ inbarcode = sub_arra[i]["inbarcode"].ToString()
+ }
+ });
+ }
+ //鍥炲啓宸ュ崟宸ュ簭琛ㄦ湯閬撳伐搴忓凡鍏ュ簱鏁伴噺
+ sql = @"update TK_Wrk_Step set inhouseqty=inhouseqty+@stinhouseqty where wo_code=@wo_code and step_code=@step_code and isend='Y'";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ stinhouseqty = decimal.Parse(sub_arra[i]["stinhouseqty"].ToString()),
+ wo_code = sub_arra[i]["wo_code"].ToString(),
+ step_code = sub_arra[i]["step_code"].ToString()
+ }
+ });
+ //鍐欏叆MES搴撳瓨琛�
+ sql = @"insert into TK_WMS_Stock(hbillno,labcode,materiel_code,storehouse_code,qty,lm_user,lm_date)
+ values(@hbillno,@labcode,@materiel_code,@storehouse_code,@qty,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ hbillno = obj["head"]["hbillno"].ToString(),
+ labcode = sub_arra[i]["inbarcode"].ToString(),
+ materiel_code = sub_arra[i]["partcode"].ToString(),
+ storehouse_code = sub_arra[i]["stockcode"].ToString(),
+ qty = decimal.Parse(sub_arra[i]["stinhouseqty"].ToString()),
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+ }
+ //鍐橫ES鍏ュ簱璁板綍涓昏〃
+ sql = @"insert into TK_WMS_Inwh_Main(docu_typecode,hbillno,hsoucenillnoid,hsoucenillno,saleorderid,saleordercode,status,wkshpcode,lm_user,lm_date)
+ values(@docu_typecode,@hbillno,@hsoucenillnoid,@hsoucenillno,@saleorderid,@saleordercode,@status,@wkshpcode,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ docu_typecode = "1202",
+ hbillno = obj["head"]["hbillno"].ToString(),
+ hsoucenillnoid = obj["head"]["sourceVoucherId"].ToString(),
+ hsoucenillno = obj["head"]["sourceVoucherCode"].ToString(),
+ saleorderid = obj["head"]["saleOrderId"].ToString(),
+ saleordercode = obj["head"]["saleOrderCode"].ToString(),
+ status = "NEW",
+ wkshpcode = obj["head"]["wkshpcode"].ToString(),
+ lm_user = username,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+
+ //鑾峰彇ERP鍏ュ簱琛╯ql
+ //DataTable dt = DapperHelper.lissql("h_p_MesInErpProductWareHous");
+ //鍐欏叆ERP鍏ュ簱璁板綍涓昏〃
+ //sql = @"" + dt.Rows[0]["cname"].ToString() + "";
+ //list.Add(new
+ //{
+ // str = sql,
+ // parm = new
+ // {
+ // code = obj["head"]["hbillno"].ToString(),
+ // sourceVoucherId = obj["head"]["sourceVoucherId"].ToString(),
+ // sourceVoucherCode = obj["head"]["sourceVoucherCode"].ToString(),
+ // saleOrderId = obj["head"]["saleOrderId"].ToString(),
+ // saleOrderCode = obj["head"]["saleOrderCode"].ToString(),
+ // rdDirectionFlag = obj["head"]["rdDirectionFlag"].ToString(),
+ // makerid = obj["head"]["makerid"].ToString(),
+ // maker = obj["head"]["maker"].ToString(),
+ // accountingyear = obj["head"]["accountingyear"].ToString(),
+ // VoucherYear = obj["head"]["VoucherYear"].ToString(),
+ // VoucherPeriod = obj["head"]["VoucherPeriod"].ToString(),
+ // ManufactureOrderCode = obj["head"]["ManufactureOrderCode"].ToString(),
+ // idbusitype = obj["head"]["idbusitype"].ToString(),
+ // iddepartment = obj["head"]["iddepartment"].ToString(),
+ // idrdstyle = obj["head"]["idrdstyle"].ToString(),
+ // idwarehouse = obj["head"]["idwarehouse"].ToString(),
+ // voucherState = obj["head"]["voucherState"].ToString(),
+ // idvouchertype = obj["head"]["idvouchertype"].ToString(),
+ // voucherdate = obj["head"]["voucherdate"].ToString(),
+ // madedate = obj["head"]["madedate"].ToString(),
+ // createdtime = obj["head"]["createdtime"].ToString(),
+ // DataSource = obj["head"]["DataSource"].ToString(),
+ // idsourcevouchertype= obj["head"]["idsourcevouchertype"].ToString()
+
+ // }
+ //});
+ //鍐欏叆ERP銆丮ES鍏ュ簱璁板綍瀛愯〃
+ for (int j = 0; j < subsum_arra.Count; j++)
+ {
+ //鍐欏叆ERP鍏ュ簱璁板綍瀛愯〃
+ //sql = @"" + dt.Rows[1]["cname"].ToString() + "";
+ //list.Add(new
+ //{
+ // str = sql,
+ // parm = new
+ // {
+ // code = subsum_arra[j]["code"].ToString(),
+ // arrivalQuantity = subsum_arra[j]["arrivalQuantity"].ToString(),
+ // quantity = subsum_arra[j]["quantity"].ToString(),
+ // compositionQuantity = subsum_arra[j]["compositionQuantity"].ToString(),
+ // baseQuantity = subsum_arra[j]["baseQuantity"].ToString(),
+ // sourceVoucherId = subsum_arra[j]["sourceVoucherId"].ToString(),
+ // sourceVoucherCode = subsum_arra[j]["sourceVoucherCode"].ToString(),
+ // sourceVoucherDetailId = subsum_arra[j]["sourceVoucherDetailId"].ToString(),
+ // idsourcevouchertype = subsum_arra[j]["idsourcevouchertype"].ToString(),
+ // saleOrderId = subsum_arra[j]["saleOrderId"].ToString(),
+ // saleOrderCode = subsum_arra[j]["saleOrderCode"].ToString(),
+ // saleOrderDetailId = subsum_arra[j]["saleOrderDetailId"].ToString(),
+ // ManufactureOrderId = subsum_arra[j]["ManufactureOrderId"].ToString(),
+ // ManufactureOrderCode = subsum_arra[j]["ManufactureOrderCode"].ToString(),
+ // ManufactureOrderDetailId = subsum_arra[j]["ManufactureOrderDetailId"].ToString(),
+ // idbusiTypeByMergedFlow = subsum_arra[j]["idbusiTypeByMergedFlow"].ToString(),
+ // idinventory = subsum_arra[j]["idinventory"].ToString(),
+ // idbaseunit = subsum_arra[j]["idbaseunit"].ToString(),
+ // idunit = subsum_arra[j]["idunit"].ToString(),
+ // idwarehouse = subsum_arra[j]["idwarehouse"].ToString(),
+ // SourceVoucherIdByMergedFlow = subsum_arra[j]["SourceVoucherIdByMergedFlow"].ToString(),
+ // SourceVoucherCodeByMergedFlow = subsum_arra[j]["SourceVoucherCodeByMergedFlow"].ToString(),
+ // SourceVoucherDetailIdByMergedFlow = subsum_arra[j]["SourceVoucherDetailIdByMergedFlow"].ToString(),
+ // idsourceVoucherTypeByMergedFlow = subsum_arra[j]["idsourceVoucherTypeByMergedFlow"].ToString(),
+ // createdtime = subsum_arra[j]["createdtime"].ToString(),
+ // DataSource = subsum_arra[j]["DataSource"].ToString()
+ // }
+ //});
+ //鍐欏叆ERP鐜板瓨閲忔煡璇㈣〃
+ //sql = @"" + dt.Rows[2]["cname"].ToString() + "";
+ //list.Add(new
+ //{
+ // str = sql,
+ // parm = new
+ // {
+ // idinventory = subsum_arra[j]["idinventory"].ToString(),
+ // idwarehouse = subsum_arra[j]["idwarehouse"].ToString(),
+ // propertyName = "ProductForReceive",
+ // baseQuantity= subsum_arra[j]["quantity"].ToString(),
+ // IdMarketingOrgan="1",
+ // idbaseunit= subsum_arra[j]["idbaseunit"].ToString(),
+ // updated= DateTime.Now.ToString(),
+ // isCarriedForwardOut ="0",
+ // isCarriedForwardIn = "0"
+ // }
+ //});
+
+
+
+ //鍐欏叆MES鍏ュ簱璁板綍瀛愯〃
+ sql = @"insert into TK_WMS_Inwh_Sub(hbillno,rownumber,materiel_code,storehouse_code,qty)
+ values(@hbillno,@rownumber,@materiel_code,@storehouse_code,@qty)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ hbillno = obj["head"]["hbillno"].ToString(),
+ rownumber = subsum_arra[j]["rownumber"].ToString(),
+ materiel_code = subsum_arra[j]["materiel_code"].ToString(),
+ storehouse_code = subsum_arra[j]["warehouse"].ToString(),
+ qty = decimal.Parse(subsum_arra[j]["quantity"].ToString())
+ }
+ });
+ }
+ //鏇存柊鍗曟嵁娴佹按鍙�
+ List<object> list1 = SeachEncodeJob.StrEncodingUpdate(obj["head"]["rightcode"].ToString(), obj["head"]["incbit"].ToString());
+ list.Add(list1[0]);
+ 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/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index b350950..dcad43d 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -155,6 +155,15 @@
#endregion
+ #region[鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)]
+ public static ToMessage LabelBarCode(string rightcode, string partcode, string qty, string onelabqty)
+ {
+ mes = AppLableBarCode.EncodingSeach(rightcode, partcode, qty, onelabqty);
+ return mes;
+ }
+ #endregion
+
+
#region[杞﹂棿鍏憡鍒楄〃]
public static ToMessage SystemAnnouncementSearch(string wkspcode, string ancetitle, string ancecont, string cancel, string level, int startNum, int endNum, string prop, string order)
{
diff --git a/VueWebApi/Models/AppLabCode.cs b/VueWebApi/Models/AppLabCode.cs
new file mode 100644
index 0000000..a1ae747
--- /dev/null
+++ b/VueWebApi/Models/AppLabCode.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class AppLabCode
+ {
+ /// <summary>
+ /// 鍔熻兘缂栫爜
+ /// </summary>
+ public string rightcode { get; set; }
+ /// <summary>
+ /// 鏍囩鏉＄爜
+ /// </summary>
+ public string labcode { get; set; }
+ /// <summary>
+ /// 鏍囩鏁伴噺
+ /// </summary>
+ public string labqty { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string partnumber { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7a95594..d42563a 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES澶у矝</_PublishTargetUrl>
- <History>True|2023-06-06T01:11:01.4364463Z;True|2023-06-06T09:06:33.0753304+08:00;True|2023-06-05T17:28:47.5572993+08:00;True|2023-05-11T16:22:21.4169327+08:00;True|2023-04-06T16:17:39.8168342+08:00;True|2023-04-06T16:08:06.6932373+08:00;True|2023-04-06T15:30:35.9271047+08:00;True|2023-04-06T14:53:28.3876503+08:00;True|2023-04-06T14:49:10.8090409+08:00;True|2023-04-06T12:57:58.8938655+08:00;True|2023-03-15T11:31:16.8856417+08:00;True|2023-03-15T10:00:15.9338807+08:00;True|2023-02-20T19:52:36.6829323+08:00;True|2023-02-20T19:47:00.5907347+08:00;True|2022-12-15T16:47:41.9666110+08:00;True|2022-12-15T16:38:38.9713755+08:00;True|2022-12-15T16:34:38.9167956+08:00;True|2022-12-15T16:32:22.0170099+08:00;True|2022-12-15T16:26:19.2183222+08:00;True|2022-12-15T16:05:40.6150440+08:00;True|2022-12-15T15:47:14.7275154+08:00;True|2022-12-15T15:27:43.2559066+08:00;True|2022-12-15T15:05:03.9791030+08:00;True|2022-12-15T14:58:03.5228864+08:00;True|2022-12-09T11:19:57.5229650+08:00;True|2022-12-09T11:16:31.1056268+08:00;True|2022-12-08T09:12:54.1800922+08:00;True|2022-12-07T18:20:16.4727548+08:00;True|2022-12-07T18:16:51.0385710+08:00;True|2022-12-07T18:12:12.9513757+08:00;True|2022-12-07T17:56:05.3946463+08:00;True|2022-12-07T15:55:59.5285218+08:00;True|2022-12-07T15:54:51.5198072+08:00;True|2022-12-07T15:50:12.9317585+08:00;True|2022-12-07T15:42:16.3635430+08:00;True|2022-12-07T15:27:57.7391935+08:00;True|2022-12-07T15:22:51.7733554+08:00;True|2022-12-07T15:15:49.8992272+08:00;True|2022-12-07T15:09:11.8994864+08:00;True|2022-12-02T09:14:43.7658105+08:00;True|2022-12-02T08:28:38.4365511+08:00;True|2022-12-02T08:28:11.8967473+08:00;True|2022-12-01T18:34:24.4323636+08:00;True|2022-12-01T18:30:15.0179207+08:00;True|2022-12-01T17:49:31.7352185+08:00;True|2022-11-24T17:07:01.0440315+08:00;True|2022-11-21T14:54:16.5315281+08:00;False|2022-11-21T14:53:01.7974134+08:00;False|2022-11-21T14:52:04.3216136+08:00;False|2022-11-21T14:50:41.6255071+08:00;False|2022-11-21T14:50:34.5329156+08:00;True|2022-11-17T08:09:52.5492132+08:00;True|2022-11-16T10:29:58.3811314+08:00;True|2022-11-16T09:28:24.4988972+08:00;True|2022-11-11T13:21:09.9421307+08:00;True|2022-10-29T13:00:04.2067170+08:00;True|2022-10-29T10:28:07.3176364+08:00;True|2022-10-21T10:16:37.9596848+08:00;True|2022-10-21T10:08:04.0410617+08:00;True|2022-10-21T09:55:38.8123887+08:00;True|2022-10-18T11:21:48.6599456+08:00;True|2022-10-13T08:41:15.4838542+08:00;True|2022-10-13T08:10:18.0430775+08:00;True|2022-10-12T10:09:26.1977035+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2023-09-19T05:40:11.7764542Z;True|2023-09-19T13:39:27.0178689+08:00;True|2023-09-19T10:36:12.6485644+08:00;True|2023-06-06T09:11:01.4364463+08:00;True|2023-06-06T09:06:33.0753304+08:00;True|2023-06-05T17:28:47.5572993+08:00;True|2023-05-11T16:22:21.4169327+08:00;True|2023-04-06T16:17:39.8168342+08:00;True|2023-04-06T16:08:06.6932373+08:00;True|2023-04-06T15:30:35.9271047+08:00;True|2023-04-06T14:53:28.3876503+08:00;True|2023-04-06T14:49:10.8090409+08:00;True|2023-04-06T12:57:58.8938655+08:00;True|2023-03-15T11:31:16.8856417+08:00;True|2023-03-15T10:00:15.9338807+08:00;True|2023-02-20T19:52:36.6829323+08:00;True|2023-02-20T19:47:00.5907347+08:00;True|2022-12-15T16:47:41.9666110+08:00;True|2022-12-15T16:38:38.9713755+08:00;True|2022-12-15T16:34:38.9167956+08:00;True|2022-12-15T16:32:22.0170099+08:00;True|2022-12-15T16:26:19.2183222+08:00;True|2022-12-15T16:05:40.6150440+08:00;True|2022-12-15T15:47:14.7275154+08:00;True|2022-12-15T15:27:43.2559066+08:00;True|2022-12-15T15:05:03.9791030+08:00;True|2022-12-15T14:58:03.5228864+08:00;True|2022-12-09T11:19:57.5229650+08:00;True|2022-12-09T11:16:31.1056268+08:00;True|2022-12-08T09:12:54.1800922+08:00;True|2022-12-07T18:20:16.4727548+08:00;True|2022-12-07T18:16:51.0385710+08:00;True|2022-12-07T18:12:12.9513757+08:00;True|2022-12-07T17:56:05.3946463+08:00;True|2022-12-07T15:55:59.5285218+08:00;True|2022-12-07T15:54:51.5198072+08:00;True|2022-12-07T15:50:12.9317585+08:00;True|2022-12-07T15:42:16.3635430+08:00;True|2022-12-07T15:27:57.7391935+08:00;True|2022-12-07T15:22:51.7733554+08:00;True|2022-12-07T15:15:49.8992272+08:00;True|2022-12-07T15:09:11.8994864+08:00;True|2022-12-02T09:14:43.7658105+08:00;True|2022-12-02T08:28:38.4365511+08:00;True|2022-12-02T08:28:11.8967473+08:00;True|2022-12-01T18:34:24.4323636+08:00;True|2022-12-01T18:30:15.0179207+08:00;True|2022-12-01T17:49:31.7352185+08:00;True|2022-11-24T17:07:01.0440315+08:00;True|2022-11-21T14:54:16.5315281+08:00;False|2022-11-21T14:53:01.7974134+08:00;False|2022-11-21T14:52:04.3216136+08:00;False|2022-11-21T14:50:41.6255071+08:00;False|2022-11-21T14:50:34.5329156+08:00;True|2022-11-17T08:09:52.5492132+08:00;True|2022-11-16T10:29:58.3811314+08:00;True|2022-11-16T09:28:24.4988972+08:00;True|2022-11-11T13:21:09.9421307+08:00;True|2022-10-29T13:00:04.2067170+08:00;True|2022-10-29T10:28:07.3176364+08:00;True|2022-10-21T10:16:37.9596848+08:00;True|2022-10-21T10:08:04.0410617+08:00;True|2022-10-21T09:55:38.8123887+08:00;True|2022-10-18T11:21:48.6599456+08:00;True|2022-10-13T08:41:15.4838542+08:00;True|2022-10-13T08:10:18.0430775+08:00;True|2022-10-12T10:09:26.1977035+08:00;True|2022-10-12T08:53:16.5351204+08:00;True|2022-10-12T08:24:28.2157523+08:00;False|2022-10-12T08:23:56.2743080+08:00;True|2022-10-12T08:12:38.4791356+08:00;False|2022-10-12T08:12:14.9860966+08:00;True|2022-10-12T08:08:31.1437091+08:00;True|2022-10-11T18:10:13.8327911+08:00;True|2022-10-10T16:21:33.7622381+08:00;True|2022-10-10T09:56:53.1134309+08:00;False|2022-10-10T09:56:18.9153013+08:00;True|2022-10-10T08:46:48.2842004+08:00;True|2022-10-09T16:25:10.1147763+08:00;True|2022-10-08T16:54:50.7779806+08:00;True|2022-10-08T16:35:23.1960956+08:00;True|2022-10-08T16:06:16.5635598+08:00;True|2022-10-08T16:01:24.5889763+08:00;True|2022-10-08T13:11:34.8631266+08:00;True|2022-09-29T15:59:52.7749027+08:00;True|2022-09-28T18:13:25.7208132+08:00;True|2022-09-27T14:01:52.5493804+08:00;True|2022-09-27T08:32:48.3460557+08:00;True|2022-09-23T16:12:28.0271396+08:00;True|2022-09-23T13:50:16.4039745+08:00;True|2022-09-23T13:49:02.0464589+08:00;True|2022-09-23T13:47:12.4458913+08:00;True|2022-09-23T13:42:58.0795715+08:00;True|2022-09-23T13:32:34.2909297+08:00;True|2022-09-23T13:31:14.5573692+08:00;True|2022-09-23T13:27:32.1842906+08:00;True|2022-09-23T12:50:51.2811202+08:00;True|2022-09-22T17:31:41.3605592+08:00;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -720,16 +720,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>06/06/2023 09:49:31</publishTime>
+ <publishTime>09/19/2023 13:40:10</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>06/06/2023 09:49:31</publishTime>
+ <publishTime>09/19/2023 13:40:10</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>06/06/2023 09:49:31</publishTime>
+ <publishTime>09/19/2023 13:40:10</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1527,7 +1527,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/06/2023 09:49:37</publishTime>
+ <publishTime>09/19/2023 13:40:11</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/AppLableBarCode.cs b/VueWebApi/Tools/AppLableBarCode.cs
new file mode 100644
index 0000000..385125b
--- /dev/null
+++ b/VueWebApi/Tools/AppLableBarCode.cs
@@ -0,0 +1,183 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using VueWebApi.Models;
+
+namespace VueWebApi.Tools
+{
+ public class AppLableBarCode
+ {
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+
+ #region [鑾峰彇瑙勫垯缂栫爜]
+ /// <summary>
+ /// 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="qty">鏁伴噺</param>
+ /// <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ /// <returns></returns>
+ public static ToMessage EncodingSeach(string rightcode, string partcode, string qty, string onelabqty)
+ {
+ string sql, year = "", month = "", day = "", fdate = "", q = "", cunm2 = "", Encode = "", cunm = "";
+ int digit2 = 0, value2 = 0, digit3 = 0, digitdiff = 0;
+ bool stf;
+ List<object> list = new List<object>();
+ List<string> listdt = new List<string>();
+ List<AppLabCode> lab = new List<AppLabCode>();
+ var dynamicParams = new DynamicParameters();
+ //鑾峰彇鏍囩涓暟:杩涗竴娉�
+ decimal labcum = Math.Ceiling(decimal.Parse(qty) / decimal.Parse(onelabqty));
+ try
+ {
+ sql = @"select prefix,filingdate,incbit,value from T_CodeRules where rightcode=@rightcode";
+ dynamicParams.Add("@rightcode", rightcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ string prefix = data.Rows[0]["PREFIX"].ToString(); //鍥哄畾瀛楁
+ string filingdate = data.Rows[0]["FILINGDATE"].ToString(); //鎻愪氦鏃ユ湡
+ int incbit = int.Parse(data.Rows[0]["INCBIT"].ToString()); //鑷浣嶆暟
+ string value = data.Rows[0]["VALUE"].ToString(); //娴佹按鍙�
+ decimal sumqty = 0;//瀹氫箟绱鍗曟爣绛炬暟閲�
+ if (int.Parse(value) >= 0)
+ {
+ switch (filingdate)
+ {
+ case "骞存湀鏃�":
+ lab = Labcode(partcode, year, month, day, prefix, fdate, digit2, value2, digit3, digitdiff, q, cunm2, Encode, value, labcum, sumqty, onelabqty, rightcode, qty, out cunm);
+ break;
+ case "骞存湀":
+ lab = Labcode(partcode, year, month, day, prefix, fdate, digit2, value2, digit3, digitdiff, q, cunm2, Encode, value, labcum, sumqty, onelabqty, rightcode, qty, out cunm);
+ break;
+ case "骞�":
+ lab = Labcode(partcode, year, month, day, prefix, fdate, digit2, value2, digit3, digitdiff, q, cunm2, Encode, value, labcum, sumqty, onelabqty, rightcode, qty, out cunm);
+ break;
+ default:
+ break;
+ }
+ //鏇存柊瑙勫垯琛ㄤ綅鏁板強娴佹按鍙�
+ sql = @"update T_CodeRules set incbit=@incbit,value=@cunm2 where rightcode=@rightcode";
+ dynamicParams.Add("@incbit", cunm.Length);
+ dynamicParams.Add("@cunm2", cunm);
+ dynamicParams.Add("@rightcode", rightcode);
+ list.Add(new { str = sql, parm = dynamicParams });
+ stf = DapperHelper.DoTransaction(list);
+ if (stf)
+ {
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = lab;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "澶辫触!";
+ mes.data = null;
+ }
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢熸垚鏉＄爜]
+ /// <summary>
+ /// 鐢熸垚鏉＄爜
+ /// </summary>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="year">骞�</param>
+ /// <param name="month">鏈�</param>
+ /// <param name="day">鏃�</param>
+ /// <param name="prefix">鍥哄畾瀛楁</param>
+ /// <param name="fdate">骞�(2浣�)+鏈�(2浣�)+鏃�(2浣�)</param>
+ /// <param name="digit2">娴佹按鍙烽暱搴�</param>
+ /// <param name="value2">鑷娴佹按鍙�</param>
+ /// <param name="digit3">鑷娴佹按鍙烽暱搴�</param>
+ /// <param name="digitdiff">浣嶆暟宸�</param>
+ /// <param name="q">琛ヤ綅(0)</param>
+ /// <param name="cunm2">鏈�缁堟祦姘村彿(鍖呭惈琛ヤ綅)</param>
+ /// <param name="Encode">鏈�缁堟爣绛剧爜(鍥哄畾瀛楁+瑙勫垯+鏈�缁堟祦姘村彿)</param>
+ /// <param name="value">鍒濆鏌ヨ鏈�鏂版祦姘村彿</param>
+ /// <param name="labcum">鏍囩涓暟</param>
+ /// <param name="sumqty">绱鍗曟爣绛炬暟閲�</param>
+ /// <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <param name="qty">鏁伴噺</param>
+ /// <param name="cunm">杈撳嚭鏈�缁堟祦姘村彿</param>
+ /// <returns></returns>
+ public static List<AppLabCode> Labcode(string partcode, string year, string month, string day, string prefix, string fdate, int digit2, int value2, int digit3, int digitdiff, string q, string cunm2, string Encode, string value, decimal labcum, decimal sumqty, string onelabqty, string rightcode, string qty, out string cunm)
+ {
+ List<AppLabCode> lab = new List<AppLabCode>();
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ month = DateTime.Now.Month.ToString().PadLeft(2, '0');//鑾峰彇鏈�(2浣�)
+ day = DateTime.Now.Day.ToString().PadLeft(2, '0');//鑾峰彇鏃�(2浣�)
+ fdate = year + month + day;
+
+ //鑾峰彇鏌ヨ娴佹按鍙风殑浣嶆暟
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ for (int i = 1; i <= labcum; i++)
+ {
+ AppLabCode lb = new AppLabCode();
+ lb.rightcode = rightcode;
+ if (i == labcum) //鏈�鍚庝竴寮犳爣绛�
+ {
+ lb.labqty = (decimal.Parse(qty) - sumqty).ToString(); //鍗曟爣绛炬暟閲�
+ }
+ else
+ {
+ lb.labqty = onelabqty; //鍗曟爣绛炬暟閲�
+ sumqty += decimal.Parse(onelabqty);
+ }
+
+ //娴佹按鍙峰惊鐜嚜澧�
+ value2 = int.Parse(value) + i;
+ //鑾峰彇鑷鍚庢祦姘村彿浣嶆暟
+ digit3 = value2.ToString().Length;
+ //鑾峰彇浣嶆暟涔嬪樊
+ digitdiff = digit2 - digit3;
+ //閲嶆柊鑾峰彇娴佹按鍙蜂綅鏁�
+ digit2 = digit3;
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int j = 1; j <= digitdiff; j++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+ lb.labcode = Encode;
+ lb.partnumber = partcode;
+ lab.Add(lb);
+ }
+ cunm = cunm2;
+ return lab;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Tools/DapperHelper.cs b/VueWebApi/Tools/DapperHelper.cs
index a0762d0..1d5423b 100644
--- a/VueWebApi/Tools/DapperHelper.cs
+++ b/VueWebApi/Tools/DapperHelper.cs
@@ -581,5 +581,32 @@
}
return result;
}
+
+ public static DataTable lissql(string sql)
+ {
+ //sql璇彞
+ using (IDbConnection conn = sqlConnection())
+ {
+ try
+ {
+ DataTable table = new DataTable();
+ //var data = conn.ExecuteReader(sql, parm);
+ var res = conn.ExecuteReader(sql);//sql 瀛樺偍杩囩▼
+ table.Load(res);
+ return table;
+ }
+ catch (Exception ex)
+ {
+ //鍒涘缓鏃ュ織璁板綍缁勪欢瀹炰緥
+ LogHelper.WriteLog(ex);
+ throw ex;
+ }
+ finally
+ {
+ conn.Dispose();
+ conn.Close();
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/VueWebApi/Tools/SeachEncodeJob.cs b/VueWebApi/Tools/SeachEncodeJob.cs
new file mode 100644
index 0000000..1644732
--- /dev/null
+++ b/VueWebApi/Tools/SeachEncodeJob.cs
@@ -0,0 +1,265 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Tools
+{
+ public class SeachEncodeJob
+ {
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+
+ #region [鑾峰彇瑙勫垯缂栫爜鐢熸垚鐨勬潯鐮乚
+ /// <summary>
+ /// 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <returns></returns>
+ public static ToMessage EncodingSeach(string rightcode)
+ {
+ string sql, year, month, day, fdate, q, cunm2, Encode;
+ int digit2, value2, digit3, digitdiff;
+ bool stf;
+ List<object> list = new List<object>();
+ List<string> listdt = new List<string>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select prefix,filingdate,incbit,value from T_CodeRules where rightcode=@rightcode";
+ dynamicParams.Add("@rightcode", rightcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ string prefix = data.Rows[0]["PREFIX"].ToString(); //鍥哄畾瀛楁
+ string filingdate = data.Rows[0]["FILINGDATE"].ToString(); //鎻愪氦鏃ユ湡
+ int incbit = int.Parse(data.Rows[0]["INCBIT"].ToString()); //鑷浣嶆暟
+ string value = data.Rows[0]["VALUE"].ToString(); //娴佹按鍙�
+ if (int.Parse(value) > 0) //鍒ゆ柇鏄惁涓洪娆¤幏鍙�
+ {
+ switch (filingdate)
+ {
+ case "骞存湀鏃�":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ month = DateTime.Now.Month.ToString().PadLeft(2, '0');//鑾峰彇鏈�(2浣�)
+ day = DateTime.Now.Day.ToString().PadLeft(2, '0');//鑾峰彇鏃�(2浣�)
+ fdate = year + month + day;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+ break;
+ case "骞存湀":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ month = DateTime.Now.Month.ToString().PadLeft(2, '0');//鑾峰彇鏈�(2浣�)
+ fdate = year + month;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+ break;
+ case "骞�":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ fdate = year;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ switch (filingdate)
+ {
+ case "骞存湀鏃�":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ month = DateTime.Now.Month.ToString().PadLeft(2, '0');//鑾峰彇鏈�(2浣�)
+ day = DateTime.Now.Day.ToString().PadLeft(2, '0');//鑾峰彇鏃�(2浣�)
+ fdate = year + month + day;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+ break;
+ case "骞存湀":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ month = DateTime.Now.Month.ToString().PadLeft(2, '0');//鑾峰彇鏈�(2浣�)
+ fdate = year + month;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+
+
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+ break;
+ case "骞�":
+ year = DateTime.Now.Year.ToString().Substring(2, 2);//鑾峰彇骞�(2浣�)
+ fdate = year;
+ digit2 = value.Length;//鑾峰彇string绫诲瀷浣嶆暟
+ value2 = int.Parse(value) + 1;// 灏唖tring绫诲瀷杞寲涓篿nt鑷1
+ digit3 = value2.ToString().Length; //鑾峰彇杞寲鍚巌nt鍨嬬殑浣嶆暟
+ digitdiff = digit2 - digit3; //浣嶆暟涔嬪樊
+ q = "";
+ if (digitdiff < 0) //浣嶆暟宸负璐熸暟闇�瑕佽繘琛ヤ綅
+ {
+ cunm2 = value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ else
+ {
+ for (int i = 1; i <= digitdiff; i++)
+ {
+ q = q + "0";
+ }
+ cunm2 = q + value2.ToString();//鏈�缁堟祦姘村彿
+ }
+ Encode = prefix + fdate + cunm2; //鏈�缁堢紪鐮�
+
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
+ mes.code = "200";
+ mes.Message = "鎴愬姛!";
+ mes.data = listdt;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鏇存柊鏉＄爜瑙勫垯琛╙
+ /// <summary>
+ /// 鏇存柊鏉＄爜瑙勫垯琛�
+ /// </summary>
+ /// <param name="rightcode">鍔熻兘缂栫爜</param>
+ /// <param name="incbit">娴佹按鍙�</param>
+ /// <returns></returns>
+ public static List<object> StrEncodingUpdate(string rightcode, string incbit)
+ {
+ List<object> list = new List<object>();
+ list.Clear();
+ string sql = @"update T_CodeRules set value=@cunm2,incbit=@incbit where rightcode=@rightcode";
+ list.Add(new { str = sql, parm = new { rightcode = rightcode, cunm2 = Convert.ToInt32(incbit), incbit = incbit.Length } });
+ return list;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index ef26a4e..db44a0f 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -308,10 +308,13 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Controllers\BaseDateController.cs" />
<Compile Include="Controllers\MessageController.cs" />
<Compile Include="Controllers\ReportManagerController.cs" />
<Compile Include="Controllers\SendController.cs" />
+ <Compile Include="DLL\BLL\BaseDateBLL.cs" />
<Compile Include="DLL\BLL\ReportManagerBLL.cs" />
+ <Compile Include="DLL\DAL\BaseDateDAL.cs" />
<Compile Include="DLL\DAL\ReportManagerDAL.cs" />
<Compile Include="Hubs\ChatHub.cs" />
<Compile Include="Controllers\AppDeviceManageController.cs" />
@@ -366,6 +369,7 @@
<Compile Include="Models\AlreadyScheduling.cs" />
<Compile Include="Models\AnDnDate.cs" />
<Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\AppLabCode.cs" />
<Compile Include="Models\APSList.cs" />
<Compile Include="Models\BomSub.cs" />
<Compile Include="Models\CapacityPlanSect.cs" />
@@ -391,6 +395,7 @@
<Compile Include="Models\Uom.cs" />
<Compile Include="Models\User.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Tools\AppLableBarCode.cs" />
<Compile Include="Tools\ChannelActionFilterAttribute.cs" />
<Compile Include="Tools\DALSkillCondition.cs" />
<Compile Include="Tools\DapperHelper.cs" />
@@ -412,6 +417,7 @@
<Compile Include="Tools\ScanStartReport.cs" />
<Compile Include="Tools\SchedulingMethod.cs" />
<Compile Include="Tools\SeachEncode.cs" />
+ <Compile Include="Tools\SeachEncodeJob.cs" />
<Compile Include="Tools\SessionControllerRouteHandler.cs" />
<Compile Include="Tools\SessionRouteHandler.cs" />
<Compile Include="Tools\TJson.cs" />
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index 16e772f..b4f1770 100644
--- a/VueWebApi/bin/VueWebApi.dll
+++ b/VueWebApi/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 7c7de45..a295c36 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 9d07d37..22cf377 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -506,18 +506,28 @@
</summary>
<param name="documentPath">The physical path to XML document.</param>
</member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
+ <summary>
+ ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpWarehouseSelect">
+ <summary>
+ ERP鐢熶粨搴撲俊鎭煡璇�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpUserSelect">
+ <summary>
+ ERP鐢熺敤鎴蜂俊鎭煡璇�
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.MessageController.AppTicketSelect">
<summary>
鑾峰彇AppTicket
</summary>
- <returns></returns>
- </member>
- <member name="M:VueWebApi.Controllers.MessageController.HttpPost">
- <summary>
- 璇锋眰token
- </summary>
- <param name="action"></param>
- <param name="dic"></param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
@@ -2281,6 +2291,48 @@
</summary>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseLabCode(System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱鏉＄爜琛ユ墦
+ </summary>
+ <param name="ordercode">宸ュ崟缂栧彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseWkshopOrder(System.String,System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟
+ </summary>
+ <param name="ordertype">鍗曟嵁绫诲瀷</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="erpordercode">璁㈠崟缂栧彿</param>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
+ <param name="orderdate">宸ュ崟鏃ユ湡</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderCodeSearch(System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderSeave(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鐢熶骇鍏ュ簱鎻愪氦
+ </summary>
+ <param name="obj">鏄庣粏鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelect">
<summary>
瀛樿揣绫诲瀷鎺ュ彛
@@ -2777,6 +2829,16 @@
<param name="rightcode">鍔熻兘缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.SystemSettingController.LabelBarCode(System.String,System.String,System.String,System.String)">
+ <summary>
+ 鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.SystemSettingController.SystemAnnouncementSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
杞﹂棿鍏憡鍒楄〃
@@ -2897,6 +2959,62 @@
<summary>
娉ㄥ唽Session
</summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.rightcode">
+ <summary>
+ 鍔熻兘缂栫爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.labcode">
+ <summary>
+ 鏍囩鏉＄爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.labqty">
+ <summary>
+ 鏍囩鏁伴噺
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.partnumber">
+ <summary>
+ 鐗╂枡缂栫爜
+ </summary>
+ </member>
+ <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
+ <summary>
+ 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Tools.AppLableBarCode.Labcode(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.Decimal,System.Decimal,System.String,System.String,System.String,System.String@)">
+ <summary>
+ 鐢熸垚鏉＄爜
+ </summary>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="year">骞�</param>
+ <param name="month">鏈�</param>
+ <param name="day">鏃�</param>
+ <param name="prefix">鍥哄畾瀛楁</param>
+ <param name="fdate">骞�(2浣�)+鏈�(2浣�)+鏃�(2浣�)</param>
+ <param name="digit2">娴佹按鍙烽暱搴�</param>
+ <param name="value2">鑷娴佹按鍙�</param>
+ <param name="digit3">鑷娴佹按鍙烽暱搴�</param>
+ <param name="digitdiff">浣嶆暟宸�</param>
+ <param name="q">琛ヤ綅(0)</param>
+ <param name="cunm2">鏈�缁堟祦姘村彿(鍖呭惈琛ヤ綅)</param>
+ <param name="Encode">鏈�缁堟爣绛剧爜(鍥哄畾瀛楁+瑙勫垯+鏈�缁堟祦姘村彿)</param>
+ <param name="value">鍒濆鏌ヨ鏈�鏂版祦姘村彿</param>
+ <param name="labcum">鏍囩涓暟</param>
+ <param name="sumqty">绱鍗曟爣绛炬暟閲�</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="cunm">杈撳嚭鏈�缁堟祦姘村彿</param>
+ <returns></returns>
</member>
<member name="T:VueWebApi.Tools.ChannelActionFilterAttribute">
<summary>
@@ -3481,6 +3599,21 @@
<param name="type"></param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Tools.SeachEncodeJob.EncodingSeach(System.String)">
+ <summary>
+ 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Tools.SeachEncodeJob.StrEncodingUpdate(System.String,System.String)">
+ <summary>
+ 鏇存柊鏉＄爜瑙勫垯琛�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="incbit">娴佹按鍙�</param>
+ <returns></returns>
+ </member>
<member name="T:VueWebApi.Util.ObjectValueParser`1">
<summary>
鍊艰浆鎹㈠櫒
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 3c7bb15..34d1d9f 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
index 08e0627..b4f1770 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index f8b69b0..a295c36 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/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 7481dab..22cf377 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -506,6 +506,24 @@
</summary>
<param name="documentPath">The physical path to XML document.</param>
</member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpWkshopDepartmentSelect">
+ <summary>
+ ERP鐢熶骇杞﹂棿/閮ㄩ棬淇℃伅鏌ヨ
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpWarehouseSelect">
+ <summary>
+ ERP鐢熶粨搴撲俊鎭煡璇�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.BaseDateController.ErpUserSelect">
+ <summary>
+ ERP鐢熺敤鎴蜂俊鎭煡璇�
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.MessageController.AppTicketSelect">
<summary>
鑾峰彇AppTicket
@@ -2273,6 +2291,48 @@
</summary>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseLabCode(System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱鏉＄爜琛ユ墦
+ </summary>
+ <param name="ordercode">宸ュ崟缂栧彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseWkshopOrder(System.String,System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱閫氳繃杞﹂棿鏌ユ壘鐢熶骇璁㈠崟
+ </summary>
+ <param name="ordertype">鍗曟嵁绫诲瀷</param>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱淇℃伅鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="erpordercode">璁㈠崟缂栧彿</param>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
+ <param name="orderdate">宸ュ崟鏃ユ湡</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderCodeSearch(System.String)">
+ <summary>
+ 鐢熶骇鍏ュ簱鑾峰彇鍗曟嵁鍙�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.ProductInHouseOrderSeave(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鐢熶骇鍏ュ簱鎻愪氦
+ </summary>
+ <param name="obj">鏄庣粏鏁版嵁</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelect">
<summary>
瀛樿揣绫诲瀷鎺ュ彛
@@ -2769,6 +2829,16 @@
<param name="rightcode">鍔熻兘缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.SystemSettingController.LabelBarCode(System.String,System.String,System.String,System.String)">
+ <summary>
+ 鐢熸垚绯荤粺鏉＄爜(鑷畾涔�)
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.SystemSettingController.SystemAnnouncementSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
<summary>
杞﹂棿鍏憡鍒楄〃
@@ -2889,6 +2959,62 @@
<summary>
娉ㄥ唽Session
</summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.rightcode">
+ <summary>
+ 鍔熻兘缂栫爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.labcode">
+ <summary>
+ 鏍囩鏉＄爜
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.labqty">
+ <summary>
+ 鏍囩鏁伴噺
+ </summary>
+ </member>
+ <member name="P:VueWebApi.Models.AppLabCode.partnumber">
+ <summary>
+ 鐗╂枡缂栫爜
+ </summary>
+ </member>
+ <member name="M:VueWebApi.Tools.AppLableBarCode.EncodingSeach(System.String,System.String,System.String,System.String)">
+ <summary>
+ 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Tools.AppLableBarCode.Labcode(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.Decimal,System.Decimal,System.String,System.String,System.String,System.String@)">
+ <summary>
+ 鐢熸垚鏉＄爜
+ </summary>
+ <param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="year">骞�</param>
+ <param name="month">鏈�</param>
+ <param name="day">鏃�</param>
+ <param name="prefix">鍥哄畾瀛楁</param>
+ <param name="fdate">骞�(2浣�)+鏈�(2浣�)+鏃�(2浣�)</param>
+ <param name="digit2">娴佹按鍙烽暱搴�</param>
+ <param name="value2">鑷娴佹按鍙�</param>
+ <param name="digit3">鑷娴佹按鍙烽暱搴�</param>
+ <param name="digitdiff">浣嶆暟宸�</param>
+ <param name="q">琛ヤ綅(0)</param>
+ <param name="cunm2">鏈�缁堟祦姘村彿(鍖呭惈琛ヤ綅)</param>
+ <param name="Encode">鏈�缁堟爣绛剧爜(鍥哄畾瀛楁+瑙勫垯+鏈�缁堟祦姘村彿)</param>
+ <param name="value">鍒濆鏌ヨ鏈�鏂版祦姘村彿</param>
+ <param name="labcum">鏍囩涓暟</param>
+ <param name="sumqty">绱鍗曟爣绛炬暟閲�</param>
+ <param name="onelabqty">鍗曟爣绛炬暟閲�</param>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="qty">鏁伴噺</param>
+ <param name="cunm">杈撳嚭鏈�缁堟祦姘村彿</param>
+ <returns></returns>
</member>
<member name="T:VueWebApi.Tools.ChannelActionFilterAttribute">
<summary>
@@ -3473,6 +3599,21 @@
<param name="type"></param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Tools.SeachEncodeJob.EncodingSeach(System.String)">
+ <summary>
+ 鏍规嵁鍔熻兘缂栫爜鑾峰彇鏈�鏂拌鍒欑紪鐮�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Tools.SeachEncodeJob.StrEncodingUpdate(System.String,System.String)">
+ <summary>
+ 鏇存柊鏉＄爜瑙勫垯琛�
+ </summary>
+ <param name="rightcode">鍔熻兘缂栫爜</param>
+ <param name="incbit">娴佹按鍙�</param>
+ <returns></returns>
+ </member>
<member name="T:VueWebApi.Util.ObjectValueParser`1">
<summary>
鍊艰浆鎹㈠櫒
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 05564fd..a221169 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2402a9053d05d63eea90f206f4e683a2d5d8f619
+3d0afc995f58e9327cf7d93a1fae471eceb66a9f
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 0e7d145..48e01dd 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -845,7 +845,6 @@
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
-D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES椤圭洰\MES澶у矝\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.dll b/VueWebApi/obj/Release/VueWebApi.dll
index 16e772f..b4f1770 100644
--- a/VueWebApi/obj/Release/VueWebApi.dll
+++ b/VueWebApi/obj/Release/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 7c7de45..a295c36 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3