From c0cee04d997030777bd85d198d82cc2567f4773f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 02 二月 2024 18:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/NewApiController.cs | 233 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 138 insertions(+), 95 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index 504fce4..cd2e310 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -2,9 +2,6 @@
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 WebAPI.Models;
using WebAPI.Service;
@@ -20,9 +17,9 @@
/// <returns></returns>
[Route("api/newBill/getNewInterBillNo")]
[HttpGet]
- public ApiResult<DocumentsView> GetNewInterBillNo()
+ public ApiResult<DocumentsView> GetNewInterBillNo(string billType)
{
- var model = YqnQbService.GetInterBillNo();
+ var model = YqnQbService.GetInterBillNo(billType);
return model;
}
/// <summary>
@@ -70,6 +67,17 @@
return YqnQbService.GetWorkCenterList(sWhere);
}
/// <summary>
+ /// 杩涚珯鎺ユ敹鍗�
+ /// </summary>
+ /// <param name="oMain"></param>
+ /// <returns></returns>
+ [Route("api/newBill/setStationInBill")]
+ [HttpPost]
+ public ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
+ {
+ return YqnQbService.SetStationInBill(oMain);
+ }
+ /// <summary>
/// 鑾峰彇杩涚珯鍗曞垪琛�
/// </summary>
/// <param name="sWhere"></param>
@@ -92,104 +100,139 @@
return YqnQbService.GetStationOutBillList(sWhere);
}
/// <summary>
- /// 杩涚珯鎺ユ敹鍗�
- /// </summary>
- /// <param name="oMain"></param>
- /// <returns></returns>
- [Route("api/newBill/setStationInBill")]
- [HttpPost]
- public ApiResult SetStationInBill()
- {
- HttpContextBase context = (HttpContextBase)Request.Properties["MS_HttpContext"];//鑾峰彇浼犵粺context
- HttpRequestBase request = context.Request;//瀹氫箟浼犵粺request瀵硅薄
- var omain = GetOMind(request);
- return YqnQbService.SetStationInBill(omain);
- }
- ClsSc_StationInBillMain GetOMind(HttpRequestBase request)
- {
- ClsSc_StationInBillMain oMain = new ClsSc_StationInBillMain();
- if(request.Form["HAddr"]!=null)
- {
- oMain.HAddr = request.Form["HAddr"].ToString();
- }
- if (request.Form["HBarCode"] != null)
- {
- oMain.HBarCode = request.Form["HBarCode"].ToString();
- }
- if (request.Form["HProcExchBillNo"] != null)
- {
- oMain.HProcExchBillNo = request.Form["HProcExchBillNo"].ToString();
- }
-
- if (!string.IsNullOrEmpty(request.Form["HProcID"]))
- {
- oMain.HProcID = long.Parse(request.Form["HProcID"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HEmpID"]))
- {
- oMain.HEmpID =long.Parse(request.Form["HEmpID"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HQty"]))
- {
- oMain.HQty =double.Parse(request.Form["HQty"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HSourceID"]))
- {
- oMain.HSourceID =long.Parse(request.Form["HSourceID"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HGroupID"]))
- {
- oMain.HGroupID =long.Parse(request.Form["HGroupID"].ToString());
- }
- if (request.Form["HCenterID"] != null)
- {
- //oMain.HCenterID = request.Form["HCenterID"].ToString();
- }
- if (request.Form["HBillNo"] != null)
- {
- oMain.HBillNo = request.Form["HBillNo"].ToString();
- }
- if (!string.IsNullOrEmpty(request.Form["HInterID"]))
- {
- oMain.HInterID =long.Parse(request.Form["HInterID"].ToString());
- }
- if (request.Form["HStationInTime"] != null)
- {
- oMain.HStationInTime =DateTime.Parse(request.Form["HStationInTime"].ToString());
- }
- if (request.Form["HICMOBillNo"] != null)
- {
- oMain.HICMOBillNo = request.Form["HICMOBillNo"].ToString();
- }
- if (request.Form["HMaterID"] != null)
- {
- oMain.HMaterID =long.Parse(request.Form["HMaterID"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HICMOQty"]))
- {
- oMain.HICMOQty =double.Parse( request.Form["HICMOQty"].ToString());
- }
- if (request.Form["HICMOInterID"] != null)
- {
- oMain.HICMOInterID =long.Parse( request.Form["HICMOInterID"].ToString());
- }
- if (!string.IsNullOrEmpty(request.Form["HDeptID"]))
- {
- oMain.HDeptID = long.Parse(request.Form["HDeptID"].ToString());
- }
- return oMain;
-
- }
- /// <summary>
/// 鍑虹珯绔欐帴鏀跺崟
/// </summary>
/// <param name="oMain"></param>
/// <returns></returns>
[Route("api/newBill/setStationOutBill")]
[HttpPost]
- public ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain oMain)
+ public ApiResult SetStationOutBill(StationOutBillView oMain)
{
return YqnQbService.SetStationOutBill(oMain);
}
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getStationMainList")]
+ [HttpGet]
+ public static ApiResult<DataSet> GetPorcessMainList(string sWhere)
+ {
+ return YqnQbService.GetPorcessMainList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″瓙琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getPorcessSubList")]
+ [HttpGet]
+ public static ApiResult<DataSet> GetPorcessSubList(int hInterId)
+ {
+ return YqnQbService.GetPorcessSubList(hInterId);
+ }
+ /// <summary>
+ /// 鑾峰彇宸ュ簭鍒楄〃
+ /// </summary>
+ /// <param name="hName"></param>
+ /// <param name="hLevel"></param>
+ /// <param name="hNumber"></param>
+ /// <param name="hBillSubType"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getProcessList")]
+ [HttpGet]
+ public ApiResult<List<Models.M_Process>> GetProcessList(string hName,string hNumber, string hBillSubType,int page,int limit,int hLevel=0)
+ {
+ return YqnQbService.GetProcessList(hName, hLevel, hNumber, hBillSubType , page, limit);
+ }
+ /// <summary>
+ /// 鑾峰彇鍗曚釜宸ュ簭璇︽儏
+ /// </summary>
+ /// <param name="hItemId"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getProcessDetail")]
+ [HttpGet]
+ public ApiResult<Models.M_Process> GetProcessDetail(int hItemId)
+ {
+ return YqnQbService.GetProcessDetail(hItemId);
+ }
+ /// <summary>
+ /// 鍒犻櫎鏌愪釜宸ュ簭
+ /// </summary>
+ /// <param name="hItemId"></param>
+ /// <returns></returns>
+ [Route("api/newBill/deleteProcess")]
+ [HttpGet]
+ public ApiResult DeleteProcess(int hItemId)
+ {
+ return YqnQbService.DeleteProcess(hItemId);
+ }
+ /// <summary>
+ /// 鑾峰彇涓嶈壇浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getBadWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetBadWHList(string sWhere)
+ {
+ return YqnQbService.GetBadWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鎶ュ簾浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWasterWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWasterWHList(string sWhere)
+ {
+ return YqnQbService.GetWasterWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鐮斿彂涓嶈壇鍝佷粨搴�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getBadCountDevelopWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
+ {
+ return YqnQbService.GetBadCountDevelopWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿涓嶈壇浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWWBadWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWWBadWHList(string sWhere)
+ {
+ return YqnQbService.GetWWBadWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿鎶ュ簾浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWWWasterWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWWWasterWHList(string sWhere)
+ {
+ return YqnQbService.GetWWWasterWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鑹搧浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWHList(string sWhere)
+ {
+ return YqnQbService.GetWHList(sWhere);
+ }
}
}
--
Gitblit v1.9.1