From d6502baa8e5610c04127fbee92ff6111e40956f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 13 六月 2023 09:50:02 +0800
Subject: [PATCH] 生产入库、采购入库接口提交
---
VueWebApi/Controllers/ProductionManagementController.cs | 156 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 119 insertions(+), 37 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 9416126..1acdf21 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -595,6 +595,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string reckway = obj["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
@@ -605,7 +606,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, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -649,6 +650,7 @@
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
string sqty = obj["sqty"].ToString(); //鏀舵枡鏁伴噺
@@ -656,7 +658,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
@@ -677,40 +679,28 @@
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+
+ #region[宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ /// 宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
/// </summary>
- /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <param name="orderstepqrcode">鎵弿宸ュ簭浜岀淮鐮佷俊鎭�</param>
+ /// <param name="checktype">妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)</param>
/// <returns></returns>
[Route(template: "MesOrderStepCheckSearch")]
[HttpGet]
- public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode, string checktype)
{
- mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode);
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode, checktype);
return TJson.toJson(mes);
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ #region[宸ュ簭妫�楠屾牴鎹�夋嫨鐨勬楠屾柟妗堟煡鎵炬楠岄」鐩甝
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+ /// 鍏ュ巶妫�楠�,宸ュ簭妫�楠屾牴鎹�夋嫨鐨勬楠屾柟妗堟煡鎵炬楠岄」鐩�
/// </summary>
- /// <returns></returns>
- [Route(template: "MesOrderStepCheckSelect")]
- [HttpGet]
- public HttpResponseMessage MesOrderStepCheckSelect()
- {
- mes = ProductionManagementBLL.MesOrderStepCheckSelect();
- return TJson.toJson(mes);
- }
- #endregion
-
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛╙
- /// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
- /// </summary>
- /// <param name="checkstandcode">妫�楠屾爣鍑嗙紪鐮�</param>
+ /// <param name="checkstandcode">妫�楠屾柟妗堢紪鐮�</param>
/// <returns></returns>
[Route(template: "MesOrderStepCheckItemList")]
[HttpGet]
@@ -721,29 +711,29 @@
}
#endregion
- #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
+ #region[宸ュ簭妫�楠�,鎻愪氦]
/// <summary>
- /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+ /// 宸ュ簭妫�楠�,鎻愪氦
/// </summary>
- /// <param name="obj">鎻愪氦淇℃伅</param>
/// <returns></returns>
[Route(template: "SaveMesOrderStepCheckItem")]
[HttpPost]
public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
{
- string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string wocode = obj["wocode"].ToString(); //宸ュ崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
- string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
- string checkusercode = obj["checkusercode"].ToString(); //妫�楠屼汉鍛樼紪鐮�
- string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
- string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
- string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
- string checkqty = obj["checkqty"].ToString(); //妫�楠屾暟閲�
- string data = obj["data"].ToString();
- List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
+ string checkstandcode = obj["checkstandcode"].ToString(); //璐ㄦ鏂规缂栫爜
+ string check_type = obj["check_type"].ToString(); //妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)
+ string sampmethod = obj["sampmethod"].ToString(); //鎶芥鏂瑰紡锛氬浐瀹氭娊妫�(FIXED) 姣斾緥鎶芥(SCARE)
+ string qualitystatus = obj["qualitystatus"].ToString(); //璐ㄩ噺鐘舵��(鍚堟牸銆佷笉鍚堟牸)
+ string labqty = obj["good_qty"].ToString(); //宸ュ簭浠诲姟鍚堟牸鏁伴噺
+ string sampleqty = obj["sampleqty"].ToString(); //鏍锋湰鏁伴噺
+ string goodqty = obj["goodqty"].ToString(); //鍚堟牸鏁伴噺
+ string ngqty = obj["ngqty"].ToString();//涓嶅悎鏍兼暟閲�
+ string checkitemcont = obj["checkitemcont"].ToString(); //妫�楠岄」鐩暟鎹�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username, json);
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(wocode, partcode, stepcode, checkstandcode, check_type, sampmethod, qualitystatus, labqty, sampleqty, goodqty, ngqty, checkitemcont, username);
return TJson.toJson(mes);
}
#endregion
@@ -1075,5 +1065,97 @@
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
}
}
--
Gitblit v1.9.3