From 93b96dd90242cd568b9c1fa02637b14102164c97 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 16 十月 2022 23:47:24 +0800
Subject: [PATCH] 添加xx仓库字段
---
WebAPI/Service/YqnQbService.cs | 116 ++++++++++++++++++++++++++++
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 17 +++
WebAPI/Models/基础资料/Gy_Process.cs | 6 +
WebAPI/WebAPI.csproj.user | 4
WebAPI/Controllers/NewApiController.cs | 66 ++++++++++++++++
5 files changed, 204 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 105b64e..a995beb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -327,6 +327,13 @@
long HWorkCenterID = list[0].HWorkCenterID; //宸ヤ綔涓績
+ long HBadWHID = list[0].HBadWHID; //涓嶈壇浠撳簱
+ long HWasterWHID = list[0].HWasterWHID; //鎶ュ簾浠撳簱
+ long HBadCountDevelopWHID = list[0].HBadCountDevelopWHID; //鐮斿彂涓嶈壇鍝佷粨搴�
+ long HWWBadWHID = list[0].HWWBadWHID; //濮斿涓嶈壇浠撳簱
+ long HWWWasterWHID = list[0].HWWWasterWHID; //濮斿鎶ュ簾浠撳簱
+ long HWHID = list[0].HWHID; //鑹搧浠撳簱
+
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
@@ -365,13 +372,13 @@
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
- ",HUSEORGID,HWorkCenterID) " +
+ ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
- ","+ HUSEORGID + "," + HWorkCenterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ","+ HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -403,6 +410,12 @@
",HOverFixPrice= " + HOverFixPrice +
",HProcMulID= " + HProcMulID +
",HWorkCenterID= " + HWorkCenterID +
+ ",HBadWHID= " + HBadWHID +
+ ",HWasterWHID= " + HWasterWHID +
+ ",HBadCountDevelopWHID= " + HBadCountDevelopWHID +
+ ",HWWBadWHID= " + HWWBadWHID +
+ ",HWWWasterWHID= " + HWWWasterWHID +
+ ",HWHID= " + HWHID +
",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index 6686d48..cd2e310 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -168,5 +168,71 @@
{
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);
+ }
}
}
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index fc6d065..a7dc37b 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -38,5 +38,11 @@
public string HBarCodeForBase { get; set; }
public long HWorkCenterID { get; set; }
+ public long HBadWHID { get; set; }
+ public long HWasterWHID { get; set; }
+ public long HBadCountDevelopWHID { get; set; }
+ public long HWWBadWHID { get; set; }
+ public long HWWWasterWHID { get; set; }
+ public long HWHID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 24ed380..cfa77d4 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -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>
@@ -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;
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 16d95e2..b5bf336 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -19,8 +19,8 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<ProjectView>ShowAllFiles</ProjectView>
- <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
- <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
+ <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+ <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1