From 08665ff78fbc131fd647fad4ba48742faec53529 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 12 七月 2022 11:27:51 +0800
Subject: [PATCH] 修改了 夏宝 车间看板 采购看板 缺料看板 根据系统设置默认车间过滤功能
---
WebAPI/Controllers/WebAPIController.cs | 368 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 340 insertions(+), 28 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 54b55ab..f9892a7 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -79,6 +79,55 @@
return objjson;
}
}
+
+
+
+ //[Route("Web/Get_MaxBillNoAndID")]
+ //[HttpGet]
+ //public object Get_MaxBillNoAndID(string HBillType)
+ //{
+ // try
+ // {
+ // string HBillNo = "";
+ // Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ // HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ // HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ // //----------鍒涘缓铏氳〃------------------------
+ // DataTable dt_Main = new DataTable("Json");
+ // dt_Main.Columns.Add("HBillNo", typeof(string));
+ // dt_Main.Columns.Add("HInterID", typeof(int));
+ // //---------鍒涘缓鏂拌------------------------
+ // DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌
+ // dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
+ // dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
+ // dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
+
+ // if (HBillNo == null || HInterID == 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触";
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛";
+ // objjson.data = dt_Main;
+ // return objjson;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ // objjson.data = null;
+ // return objjson;
+ // }
+ //}
/// <summary>
/// 鐧诲綍
/// </summary>
@@ -128,7 +177,7 @@
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鐧诲綍寮傚父锛�"+e.Message;
+ objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
objjson.data = null;
return objjson; ;
}
@@ -209,7 +258,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -341,6 +390,159 @@
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
+ }
+ }
+
+
+
+ //鏍规嵁鎷栨潯鐮佽繑鍥炴潯鐮佹。妗堣〃鍞竴鐮佷俊鎭�
+ [Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
+ [HttpGet]
+ public object GetBillEntry_TmpListGroupOrder(string HBarCode)
+ {
+ try
+ {
+ ds = webserver.GetBarCode(HBarCode);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鍘讳慨鏀规潯鐮佹。妗堛�佺粍鎵樺崟瀛愯〃璁板綍骞堕噸鏂扮敓鎴愮粍鎵樺崟sum琛�
+ [Route("GroupOrderBill/Edit")]
+ [HttpGet]
+ public object Edit(string HBarCode1, Int64 HQty)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+ DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");
+
+ long HInterIDTTM = 0;
+ long HInterID = 0;
+ string HBarCode_Pack = "";
+ string HBarCode = "";
+ string HUser = "";
+ HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
+ HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
+ HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
+ HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+ oCN.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //DataSet DS1 = webserver.GetBarCode(HBarCode); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ //鏍规嵁缃戞牸閫変腑璁板綍鐨勫敮涓�鐮� 鍘诲垹闄ゆ潯鐮佹。妗� 缁勬墭鍗曞瓙琛� 缁勬墭鍗晄um琛ㄧ殑鍞竴鐮佹暟鎹�
+ [Route("GroupOrderBill/Delete")]
+ [HttpGet]
+ public object Delete(string HBarCode1)
+ {
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ oCN.RunProc("delete from Gy_BarCodeBill where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub where HBarCode = '" + HBarCode1 + "'");
+ oCN.RunProc("delete from Sc_PackUnionBillSub_Sum where HBarCode = '" + HBarCode1 + "'"); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+ // {
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ // objjson.data = null;
+ // return objjson;
+ // }
+ // else
+ // {
+ // objjson.code = "0";
+ // objjson.count = 1;
+ // objjson.Message = "鑾峰彇鎴愬姛!";
+ // objjson.data = DS1.Tables[0];
+ // return objjson;
+ // }
+ //}
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鍒犻櫎澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
}
}
@@ -576,7 +778,7 @@
/// <returns></returns>
[Route("Web/GetStockPlaceList_Json_NEW")]
[HttpGet]
- public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
+ public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
{
WebS.WebService1 oWeb = new WebS.WebService1();
sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
@@ -679,23 +881,26 @@
}
}
+
/// <summary>
/// 鑾峰彇渚涘簲鍟嗗垪琛�
/// </summary>
/// <returns></returns>
[Route("Web/GetSupplierList_Json")]
[HttpGet]
- public object GetSupplierList_Json(string Supplier)
+ public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (Supplier != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
}
try
{
- ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ //ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -799,7 +1004,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select HItemID,HNumber 鐝粍浠ｇ爜,HName 鐝粍 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
+ ds = oCN.RunProcReturn("Select HItemID,鐝粍浠ｇ爜 鐝粍浠ｇ爜,鐝粍鍚嶇О 鐝粍 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -1078,7 +1283,7 @@
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (sWhere != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
}
try
{
@@ -1481,7 +1686,7 @@
/// <returns></returns>
[Route("DeltetGy_BadReason")]
[HttpGet]
- public object DeltetGy_BadReason(string HItemID,string user)
+ public object DeltetGy_BadReason(string HItemID, string user)
{
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
@@ -1943,7 +2148,7 @@
[Route("Web/GetClassTimePrjGroupBillList_Json")]
[HttpGet]
- public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
+ public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
{
if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
{
@@ -1997,6 +2202,58 @@
return objjson;
}
}
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡缁勭紪杈�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
+ [HttpGet]
+ public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
+ {
+ //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 浠撳簱鍚嶇О from Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
#region 鍒犻櫎鏍哥畻鏂瑰紡缁�
/// <summary>
/// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
@@ -2045,9 +2302,9 @@
/// <returns></returns>
[Route("Web/SaveGetClassTimePrjGroupList")]
[HttpGet]
- public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
+ public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
{
-
+
try
{
int HItemID = int.Parse(HItem);
@@ -2060,18 +2317,18 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql="";
- if (refSav== "Add")
+ string sql = "";
+ if (refSav == "Add")
{
- sql = "Insert Into Gy_ClassTimePrjGroup " +
- "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
- ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
- ") " +
- " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
+ sql = "Insert Into Gy_ClassTimePrjGroup " +
+ "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
+ ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
+ ") " +
+ " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
}
else
{
- sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
+ sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
}
oCN.RunProc(sql);
objJsonResult.code = "1";
@@ -2557,7 +2814,7 @@
[HttpGet]
public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
{
-
+
if (MouldProjectID <= 0)
{
objjson.code = "0";
@@ -2669,7 +2926,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
- ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -2697,7 +2954,7 @@
}
}
- /// <summary>
+ /// <summary>
/// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
/// </summary>
/// <returns></returns>
@@ -2775,7 +3032,7 @@
from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
left join Gy_Employee e on e.HItemID=t.HManagerID
- where a.HInterID=" + EquipProjectID );
+ where a.HInterID=" + EquipProjectID);
string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
left join h_v_IF_Material m on b.HMaterID=m.HItemID
@@ -2907,8 +3164,8 @@
return objjson;
}
}
-
-
+
+
/// <summary>
/// 鑾峰彇缁翠慨椤圭洰鍒楄〃
/// </summary>
@@ -3133,7 +3390,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
try
{
- ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
+ ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -3163,7 +3420,62 @@
}
+ #region PDA鍏朵粬鍏ュ簱鍒楄〃妯″潡
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ /// </summary>
+ /// <param name="HBillType"></param>
+ /// <param name="sHMaker"></param>
+ /// <param name="HOrgID"></param>
+ /// <returns></returns>
+ [Route("Web/GetOtherInBillMain_TempList_New")]
+ [HttpGet]
+ public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1