From 36ac7452cd5345809df4fe27f24ea83f70cd0919 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 十月 2022 14:27:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Service/YqnQbService.cs | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index b35aa2f..cfa77d4 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -98,10 +98,10 @@
{
if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
- var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
+ var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
if (stationInList.Count > 0)
{
- var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
+ var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夊嚭绔欏崟
var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//鑾峰彇杩涚珯鍗曟渶鏂拌繘绔欏伐搴�
if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
return new ApiResult { code = -1, msg = "閲嶅鎵弿" };
@@ -158,6 +158,78 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
/// <summary>
+ /// 鑾峰彇涓嶈壇浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetBadWHList(string sWhere)
+ {
+ var dataSet = GetBadWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌涓嶈壇浠撳簱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇鎶ュ簾浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetWasterWHList(string sWhere)
+ {
+ var dataSet = GetWasterWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鎶ュ簾浠撳簱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇鐮斿彂涓嶈壇鍝佷粨搴撳垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
+ {
+ var dataSet = GetBadCountDevelopWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鐮斿彂涓嶈壇鍝佷粨搴�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿涓嶈壇浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetWWBadWHList(string sWhere)
+ {
+ var dataSet = GetWWBadWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌濮斿涓嶈壇浠撳簱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿鎶ュ簾浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetWWWasterWHList(string sWhere)
+ {
+ var dataSet = GetWWWasterWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌濮斿鎶ュ簾浠撳簱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇鑹搧浠撳簱鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetWHList(string sWhere)
+ {
+ var dataSet = GetWH(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鑹搧浠撳簱" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
/// 鑾峰彇娴佽浆鍗″垪琛�
/// </summary>
/// <param name="sWhere"></param>
@@ -190,10 +262,10 @@
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
try
{
- var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HICMOBillNo);
+ var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HProcExchBillNo);
if (stationInBillModel == null)
return new ApiResult { code = -1, msg = "璇ュ伐搴忚繘绔欏崟涓嶅瓨鍦�" };
- var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HICMOBillNo);
+ var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HProcExchBillNo);
if (stationOutBillModel != null)
return new ApiResult { code = -1, msg = "璇ュ伐搴忓凡瀛樺湪鍑虹珯鍗�" };
omodel.HYear = DateTime.Now.Year;
@@ -239,7 +311,7 @@
if (list?.Count == 0)
return new ApiResult<List<M_Process>> { code = -1, msg = "鏌ヨ涓虹┖" };
return new ApiResult<List<M_Process>> { code = 0, msg = "鏌ヨ鎴愬姛", data = list, count = pageCount };
- }
+ }
/// <summary>
/// 鍒犻櫎涓�鏉″伐搴�
/// </summary>
@@ -260,6 +332,48 @@
var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
return dataSet;
}
+ public static DataSet GetBadWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetBadWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetBadWH");
+ return dataSet;
+ }
+ public static DataSet GetWasterWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetWasterWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWasterWH");
+ return dataSet;
+ }
+ public static DataSet GetBadCountDevelopWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetBadCountDevelopWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetBadCountDevelopWH");
+ return dataSet;
+ }
+ public static DataSet GetWWBadWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetWWBadWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWWBadWH");
+ return dataSet;
+ }
+ public static DataSet GetWWWasterWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetWWWasterWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWWWasterWH");
+ return dataSet;
+ }
+ public static DataSet GetWH(string sWhere)
+ {
+ var sql = "Select * from h_v_Sc_GetWH Where 1=1 " + sWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWH");
+ return dataSet;
+ }
public static DataSet GetStationInBill(string strWhere)
{
var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
--
Gitblit v1.9.1