From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/Controllers/ProductModelController.cs | 337 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 302 insertions(+), 35 deletions(-)
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index 55b428e..2015393 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -1,11 +1,13 @@
锘縰sing Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web;
using System.Web.Http;
+using System.Web.Script.Serialization;
using VueWebApi.DLL.BLL;
using VueWebApi.Models;
using VueWebApi.Tools;
@@ -13,8 +15,9 @@
namespace VueWebApi.Controllers
{
- [RoutePrefix(prefix: "api/BasicSetting")]
+ [RoutePrefix(prefix: "api/ProductModel")]
[ControllerGroup("鍒堕�犳ā鍨�", "鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilter]
public class ProductModelController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -157,9 +160,9 @@
}
#endregion
- #region[瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨媇
+ #region[瀛樿揣绫诲瀷鏌ユ壘鐗╂枡绫诲瀷]
/// <summary>
- /// 瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨�
+ /// 瀛樿揣绫诲瀷鏌ユ壘鐗╂枡绫诲瀷
/// </summary>
/// <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
/// <returns></returns>
@@ -176,6 +179,20 @@
mes.code = "300";
mes.Message = e.Message;
}
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鍗曚綅涓嬫媺鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 鍗曚綅涓嬫媺鍒楄〃鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "UomSelect")]
+ [HttpGet]
+ public HttpResponseMessage UomSelect()
+ {
+ mes = ProductModelBLL.UomSelect();
return TJson.toJson(mes);
}
#endregion
@@ -199,9 +216,11 @@
[HttpGet]
public HttpResponseMessage InventoryFileSelect(string partcode = null, string partname = null, string partspec = null, string stocktypecode = null, string materialtypecode = null, string storehousecode = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.InventoryFileSelect(partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.InventoryFileSelect(stu_torgcode, stu_torgtypecode,partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -223,12 +242,15 @@
string uomcode = obj["uomcode"].ToString(); //鍗曚綅缂栫爜
string warehousecode = obj["warehousecode"].ToString(); //鎵�灞炰粨搴撶紪鐮�
string stocktypecode = obj["stocktypecode"].ToString(); //瀛樿揣绫诲瀷缂栫爜
- string materialtypecode = obj["materialtypecode"].ToString(); //鐗╂枡绫诲瀷缂栫爜
string minstockqty = obj["minstockqty"].ToString(); //鏈�灏忓簱瀛�
string maxstockqty = obj["maxstockqty"].ToString(); //鏈�澶у簱瀛�
+ string is_batchno = obj["is_batchno"].ToString(); //鏄惁鎵规绠＄悊
+ string is_fifo = obj["is_fifo"].ToString(); //鏄惁鍏堣繘鍏堝嚭
+ string is_incheck = obj["is_incheck"].ToString(); //鏄惁鍏ュ巶妫�楠�
+ string is_outcheck = obj["is_outcheck"].ToString(); //鏄惁鍑哄巶妫�楠�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, username, OperType);
+ mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -258,7 +280,9 @@
[HttpGet]
public HttpResponseMessage InventoryFileAssociationRoute(string partcode)
{
- mes = ProductModelBLL.InventoryFileAssociationRoute(partcode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductModelBLL.InventoryFileAssociationRoute(stu_torgcode, stu_torgtypecode,partcode);
return TJson.toJson(mes);
}
#endregion
@@ -268,14 +292,126 @@
/// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
/// </summary>
/// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="defaultroute_code">榛樿宸ヨ壓璺嚎缂栫爜</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
[Route(template: "SaveInventoryFile")]
[HttpPost]
- public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json)
+ public HttpResponseMessage SaveInventoryFile(string partcode, List<PartRout> json, string defaultroute_code = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveInventoryFile(partcode, username, json);
+ mes = ProductModelBLL.SaveInventoryFile(stu_torgcode, stu_torgtypecode, partcode, defaultroute_code, username, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[鐗╂枡娓呭崟涓诲垪琛ㄦ煡璇
+ /// <summary>
+ /// 鐗╂枡娓呭崟涓诲垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="parentpartcode">姣嶄欢缂栫爜</param>
+ /// <param name="parentpartname">姣嶄欢鍚嶇О</param>
+ /// <param name="parentpartspec">姣嶄欢瑙勬牸</param>
+ /// <param name="status">鍚敤鐘舵��</param>
+ /// <param name="version">鐗堟湰鍙�</param>
+ /// <param name="createusername">鍒涘缓浜哄憳</param>
+ /// <param name="createdate">鍒涘缓鏃ユ湡</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">鍒嗛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勬牸</param>
+ /// <returns></returns>
+ [Route(template: "BoIventorySelect")]
+ [HttpGet]
+ public HttpResponseMessage BoIventorySelect(string parentpartcode = null, string parentpartname = null,string parentpartspec=null,string parttype=null, string status = null, string version = null, string createusername = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string createopendate = ""; //寮�濮嬫椂闂�
+ string createclosedate = ""; //缁撴潫鏃堕棿
+ if (createdate != "" && createdate != null)
+ {
+ createopendate = createdate.Split('~')[0].ToString();
+ createclosedate = createdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ProductModelBLL.BoIventorySelect(parentpartcode, parentpartname, parentpartspec, parttype, status, version, createusername, createopendate, createclosedate, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟缂栬緫鏄剧ず鍙婇瑙圿
+ /// <summary>
+ /// 鐗╂枡娓呭崟缂栬緫鏄剧ず鍙婇瑙�
+ /// </summary>
+ /// <param name="bomid">Bom涓昏〃id</param>
+ /// <returns></returns>
+ [Route(template: "BoIventorySelectView")]
+ [HttpGet]
+ public HttpResponseMessage BoIventorySelectView(string bomid)
+ {
+ mes = ProductModelBLL.BoIventorySelectView(bomid);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鏂板鏃惰幏鍙栨渶澶х増鏈彿]
+ /// <summary>
+ /// 鐗╂枡娓呭崟鏂板鏃惰幏鍙栨渶澶х増鏈彿
+ /// </summary>
+ /// <param name="parentpartcode">姣嶄欢缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MaterielDetailedVsion")]
+ [HttpGet]
+ public HttpResponseMessage MaterielDetailedVsion(string parentpartcode)
+ {
+ mes = ProductModelBLL.MaterielDetailedVsion(parentpartcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鏂板/缂栬緫鎻愪氦]
+ /// <summary>
+ /// 鐗╂枡娓呭崟鏂板/缂栬緫鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateBoIventory")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateBoIventory([FromBody] JObject obj)
+ {
+ string bomid = obj["bomid"].ToString(); //姣嶄欢id
+ string parentpartcode = obj["parentpartcode"].ToString(); //姣嶄欢缂栫爜
+ string parentpartname = obj["parentpartname"].ToString(); //姣嶄欢鍚嶇О
+ string parentpartspec = obj["parentpartspec"].ToString(); //姣嶄欢瑙勬牸
+ string status = obj["status"].ToString();//鍚敤鐘舵��
+ string uomcode = obj["uomcode"].ToString(); //璁￠噺鍗曚綅缂栫爜
+ string quantity = obj["quantity"].ToString(); //鍩虹鏁伴噺
+ string startdate = obj["startdate"].ToString(); //鍚敤鏃ユ湡
+ string version = obj["version"].ToString(); //鐗堟湰鍙�
+ string worklist = obj["worklist"].ToString(); //鎻愪氦鏁版嵁
+ string opertype = obj["opertype"].ToString(); //鎻愪氦绫诲瀷
+ string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ List<BomSub> objs = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BomSub>>(worklist);
+ mes = ProductModelBLL.AddUpdateBoIventory(bomid,parentpartcode, parentpartname, parentpartspec, status, uomcode, quantity, startdate, version, username, opertype, objs);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐗╂枡娓呭崟鍒犻櫎]
+ /// <summary>
+ /// 鐗╂枡娓呭崟鍒犻櫎
+ /// </summary>
+ /// <param name="bomid">Bom涓昏〃id</param>
+ /// <returns></returns>
+ [Route(template: "DeleteBoIventory")]
+ [HttpPost]
+ public HttpResponseMessage DeleteBoIventory(string bomid)
+ {
+ mes = ProductModelBLL.DeleteBoIventory(bomid);
return TJson.toJson(mes);
}
#endregion
@@ -283,10 +419,25 @@
+ #region[宸ュ簭涓嬫媺鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 宸ュ簭涓嬫媺鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "StepSelect")]
+ [HttpGet]
+ public HttpResponseMessage StepSelect(string WorkShop)
+ {
+ mes = ProductModelBLL.StepSelect(WorkShop);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[宸ヨ壓璺嚎鏌ヨ]
/// <summary>
/// 宸ヨ壓璺嚎鏌ヨ
/// </summary>
+ /// <param name="WorkShop">鎵�灞炶溅闂�</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
/// <param name="description">宸ヨ壓璺嚎鎻忚堪</param>
@@ -298,11 +449,13 @@
/// <returns></returns>
[Route(template: "RouteSearch")]
[HttpGet]
- public HttpResponseMessage RouteSearch(string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage RouteSearch(string WorkShop=null,string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
+ mes = ProductModelBLL.RouteSearch(stu_torgcode, stu_torgtypecode, WorkShop, routecode, routename, description, createuser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -324,7 +477,7 @@
#region[宸ヨ壓璺嚎鏂板]
/// <summary>
- /// 宸ヨ壓璺嚎鏂板缂栬緫
+ /// 宸ヨ壓璺嚎鏂板
/// </summary>
/// <param name="id">宸ヨ壓璺嚎id</param>
/// <param name="opertype">鎿嶄綔绫诲瀷(鏂板)</param>
@@ -332,7 +485,7 @@
/// <returns></returns>
[Route(template: "AddUpdateRoute")]
[HttpPost]
- public HttpResponseMessage AddUpdateRoute(string id, string opertype, RoutEdit json)
+ public HttpResponseMessage AddUpdateRoute(string opertype, RoutEdit json,string id=null)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = ProductModelBLL.AddUpdateRoute(id, opertype, username, json);
@@ -355,12 +508,56 @@
}
#endregion
+ #region[宸ヨ壓璺嚎鍏宠仈浜у搧鏌ヨ]
+ /// <summary>
+ /// 宸ヨ壓璺嚎鍏宠仈浜у搧鏌ヨ
+ /// </summary>
+ /// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="partname">鐗╂枡鍚嶇О</param>
+ /// <param name="partspec">鐗╂枡瑙勬牸</param>
+ /// <param name="stocktypecode">瀛樿揣绫诲瀷缂栫爜</param>
+ /// <param name="materialtypecode">鐗╂枡绫诲瀷缂栫爜</param>
+ /// <param name="storehousecode">鎵�灞炰粨搴撶紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "RputeInventorySearch")]
+ [HttpGet]
+ public HttpResponseMessage RputeInventorySearch(string partcode = null, string partname = null, string partspec = null, string stocktypecode = null, string materialtypecode = null, string storehousecode = null)
+ {
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductModelBLL.RputeInventorySearch(stu_torgcode, stu_torgtypecode, partcode, partname, partspec, stocktypecode, materialtypecode, storehousecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[宸ヨ壓璺嚎鎵归噺鎸囧畾鐗╂枡淇濆瓨]
+ /// <summary>
+ /// 宸ヨ壓璺嚎鎵归噺鎸囧畾鐗╂枡淇濆瓨
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "RouteBatchPartSave")]
+ [HttpPost]
+ public HttpResponseMessage RouteBatchPartSave([FromBody] JObject obj)
+ {
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ string routecode = obj["routecode"].ToString(); //宸ヨ壓璺嚎缂栫爜
+ string routepart = obj["routepart"].ToString(); //宸ヨ壓璺嚎缁戝畾浜у搧缂栫爜
+ string[] rolebatchpartcode = Array.ConvertAll<string, string>(routepart.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ mes = ProductModelBLL.RouteBatchPartSave(stu_torgcode, stu_torgtypecode, username, routecode, rolebatchpartcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[宸ュ簭鏌ヨ]
/// <summary>
/// 宸ュ簭鏌ヨ
/// </summary>
+ /// <param name="WorkShop">鎵�灞炶溅闂�</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="stepname">宸ュ簭鍚嶇О</param>
/// <param name="enable">鍚敤鐘舵��</param>
@@ -373,11 +570,13 @@
/// <returns></returns>
[Route(template: "StepSearch")]
[HttpGet]
- public HttpResponseMessage StepSearch(string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage StepSearch(string WorkShop=null, string stepcode = null, string stepname = null, string enable = null, string steptypecode = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
+ mes = ProductModelBLL.StepSearch(stu_torgcode, stu_torgtypecode, WorkShop, stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -393,6 +592,7 @@
public HttpResponseMessage AddUpdateStep([FromBody] JObject obj)
{
string stepid = obj["id"].ToString(); //宸ュ簭id(涓婚敭)
+ string WorkShop = obj["WorkShop"].ToString(); //杞﹂棿缂栫爜
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
string stepname = obj["stepname"].ToString(); //宸ュ簭鍚嶇О
string steptypecode = obj["steptypecode"].ToString(); //宸ュ簭绫诲瀷缂栫爜
@@ -400,7 +600,7 @@
string description = obj["description"].ToString(); //宸ュ簭鎻忚堪
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = ProductModelBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, OperType);
+ mes = ProductModelBLL.AddUpdateStep(stepid, WorkShop,stepcode, stepname, steptypecode, enable, description, username, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -428,9 +628,9 @@
/// <returns></returns>
[Route(template: "StepAssociationEqp")]
[HttpGet]
- public HttpResponseMessage StepAssociationEqp(string stepcode)
+ public HttpResponseMessage StepAssociationEqp(string WorkShop, string stepcode)
{
- mes = ProductModelBLL.StepAssociationEqp(stepcode);
+ mes = ProductModelBLL.StepAssociationEqp(WorkShop,stepcode);
return TJson.toJson(mes);
}
#endregion
@@ -439,15 +639,16 @@
/// <summary>
/// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
/// </summary>
+ /// <param name="WorkShop">鎵�灞炵粍缁囩紪鐮�(杞﹂棿)</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="json">鎻愪氦鏁版嵁</param>
/// <returns></returns>
[Route(template: "SaveStepAssociationEqp")]
[HttpPost]
- public HttpResponseMessage SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
+ public HttpResponseMessage SaveStepAssociationEqp(string WorkShop, string stepcode, List<ObjectData> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveStepAssociationEqp(stepcode, username, json);
+ mes = ProductModelBLL.SaveStepAssociationEqp(WorkShop,stepcode, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -460,20 +661,26 @@
/// <returns></returns>
[Route(template: "StepAssociationDefect")]
[HttpGet]
- public HttpResponseMessage StepAssociationDefect(string stepcode)
+ public HttpResponseMessage StepAssociationDefect(string WorkShop, string stepcode)
{
- mes = ProductModelBLL.StepAssociationDefect(stepcode);
+ mes = ProductModelBLL.StepAssociationDefect(WorkShop,stepcode);
return TJson.toJson(mes);
}
#endregion
#region[宸ュ簭鍏宠仈缂洪櫡鎻愪氦]
+ /// <summary>
+ /// 宸ュ簭鍏宠仈缂洪櫡鎻愪氦
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
[Route(template: "SaveStepAssociationDefect")]
[HttpPost]
- public HttpResponseMessage SaveStepAssociationDefect(string stepcode, List<ObjectData> json)
+ public HttpResponseMessage SaveStepAssociationDefect(string WorkShop, string stepcode, List<ObjectData> json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveStepAssociationDefect(stepcode, username, json);
+ mes = ProductModelBLL.SaveStepAssociationDefect(WorkShop,stepcode, username, json);
return TJson.toJson(mes);
}
#endregion
@@ -514,7 +721,9 @@
{
try
{
- mes = ProductModelBLL.PartSelectRpute(partcode);
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
+ mes = ProductModelBLL.PartSelectRpute(stu_torgcode, stu_torgtypecode,partcode);
}
catch (Exception e)
{
@@ -548,26 +757,42 @@
}
#endregion
- #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎]
/// <summary>
- /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚�
+ /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囦笅鎷夋闆嗗悎
+ /// </summary>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "StepSelectEqp")]
+ [HttpGet]
+ public HttpResponseMessage StepSelectEqp(string stepcode)
+ {
+ mes = ProductModelBLL.StepSelectEqp(stepcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚圿
+ /// <summary>
+ /// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚�
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="steptype">宸ュ簭绫诲瀷</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
- [Route(template: "StepSelectEqp")]
+ [Route(template: "StepSelectEqpList")]
[HttpGet]
- public HttpResponseMessage StepSelectEqp(string partcode, string routecode, string stepcode, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage StepSelectEqpList(string partcode, string routecode, string stepcode,string steptype, int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.StepSelectEqp(partcode, routecode, stepcode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.StepSelectEqpList(partcode, routecode, stepcode, steptype, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -577,12 +802,9 @@
/// 鑺傛媿宸ヤ环鏌ヨ
/// </summary>
/// <param name="partcode">浜у搧缂栫爜</param>
- /// <param name="partname">浜у搧鍚嶇О</param>
- /// <param name="partspec">浜у搧瑙勬牸</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <param name="eqpcode">璁惧缂栫爜</param>
- /// <param name="eqpname">璁惧鍚嶇О</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -590,11 +812,56 @@
/// <returns></returns>
[Route(template: "BeatRateSearch")]
[HttpGet]
- public HttpResponseMessage BeatRateSearch(string partcode = null, string partname = null, string partspec = null, string routecode = null, string stepcode = null, string eqpcode = null, string eqpname = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage BeatRateSearch(string partcode = null, string routecode = null, string stepcode = null, string eqpcode = null,int page = 0, int rows = 0, string prop = null, string order = null)
{
+ var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //鎵�灞炵粍缁�
+ var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //鎵�灞炵粍缁囩被鍨�
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductModelBLL.BeatRateSearch(partcode, partname, partspec, routecode, stepcode, eqpcode, eqpname, startNum, endNum, prop, order);
+ mes = ProductModelBLL.BeatRateSearch(stu_torgcode, stu_torgtypecode,partcode, routecode, stepcode, eqpcode, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鎻愪氦]
+ /// <summary>
+ /// 鑺傛媿宸ヤ环鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SaveBeatRate")]
+ [HttpPost]
+ public HttpResponseMessage SaveBeatRate([FromBody] JObject obj)
+ {
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string routecode = obj["routecode"].ToString(); //宸ヨ壓璺嚎缂栫爜
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string wkshopcode = obj["wkshopcode"].ToString(); //鐢熶骇杞﹂棿缂栫爜
+ string eqp_value = obj["eqp_value"].ToString(); //璁惧鑺傛媿
+ string stand_value = obj["stand_value"].ToString(); //鐢熶骇鑺傛媿
+ string cavity_qty = obj["cavity_qty"].ToString(); //鍨嬭厰鏁�
+ string unprice = obj["unprice"].ToString(); //璁′欢鍗曚环
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductModelBLL.SaveBeatRate(partcode, routecode, stepcode, eqpcode, wkshopcode, eqp_value, stand_value, cavity_qty, unprice, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鑺傛媿宸ヤ环鍒犻櫎]
+ /// <summary>
+ /// 鑺傛媿宸ヤ环鍒犻櫎
+ /// </summary>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "DeleteBeatRate")]
+ [HttpPost]
+ public HttpResponseMessage DeleteBeatRate(string partcode,string routecode,string stepcode,string eqpcode)
+ {
+ mes = ProductModelBLL.DeleteBeatRate(partcode, routecode, stepcode, eqpcode);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3