From d94d583abc305f679db67962aa7f9bc7023b89d5 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期三, 29 十二月 2021 23:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/ProductInController.cs | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 162 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 13a7233..3269a5b 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -59,6 +59,37 @@
return "";
}
}
+
+ /// <summary>
+ /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃缂栬緫鍓嶅垽鏂崟鎹槸鍚﹀凡涓婁紶 鐩存帴璋僕ebService
+ /// </summary>
+ /// <returns></returns>
+ //[Route("ProductIn/ProductInTempList_Modify")]
+ //[HttpGet]
+ //public Object ProductInTempList_Modify(Int64 sInterID,string sBillNo, string sBillType)
+ //{
+
+ // //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ // WebS.WebService1 oWebs = new WebS.WebService1();
+ // if (oWebs.TempList_Modify(sInterID, sBillNo, sBillType, ref sErrMsg))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
/// <summary>
/// 浜у搧鍏ュ簱/鎵潯鐮�/鐩存帴璋冪敤webservice
/// </summary>
@@ -165,6 +196,134 @@
}
}
+ ///// <summary>
+ ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("ProductIn/DisBillEntryList_Json1")]
+ //[HttpGet]
+ //public object DisBillEntryList_Json1(string HBillType,string sHMaker, Int64 HOrgID)
+ //{
+ // try
+ // {
+ // ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+ // 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;
+ // }
+ //}
+
+
+
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃缂栬緫鎸夐挳 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("ProdIn/ProdInDetaiNew")]
+ [HttpGet]
+ public object ProdInDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ /// <summary>
+ /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [Route("ProductIn/DisPlayBarCodeList_Json")]
+ [HttpGet]
+ public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[3].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;
+ }
+ }
+
[Route("ProductIn/DisBillEntryList_Mate_Webs_Json")]
[HttpGet]
public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
@@ -210,6 +369,7 @@
[HttpGet]
public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
{
+ string aa = "";
try
{
// DataSet ds = new DataSet();
@@ -217,6 +377,7 @@
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
if (HSourceBillType == "3710")
{
+ aa = "鎵ц浜�";
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
if (HSourceBillType == "3711")
@@ -227,7 +388,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒";
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒"+aa;
objJsonResult.data = null;
return objJsonResult; ;
}
--
Gitblit v1.9.1