From 8b1159f7744c752e9499ffd82de393d255b4b2e0 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 19 八月 2025 16:09:10 +0800
Subject: [PATCH] 优化产线包装组托单方法，进出站报错提示，基础老包装车间方法到这个api
---
WebAPI/Controllers/LMESController.cs | 769 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 661 insertions(+), 108 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index a110b64..0364bfb 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -20,6 +20,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
+ //鑷畾涔�34杩涘埗鏁扮粍
+ private static char[] lNCode = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' };
+
+
+
/// <summary>
/// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -2833,7 +2838,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "[0000-1-045]娌℃湁杩斿洖浠讳綍璁板綍锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2841,7 +2846,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.Message = "[0000-1-050]鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -2963,15 +2968,97 @@
return CustomCorrect(ds);
}
- /// <summary>
- /// 鎵祦杞崱鍙锋柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 浜х嚎鍖呰缁勬墭鍗�
+
+
+ #region 杞崲34杩涘埗
+ public string GetNewCodeByNum(Int64 lastNum, Int64 codeNum, Int64 codeLength)
+ {
+ List<string> codeList = new List<string>();
+ var maxNum = lastNum + codeNum;
+ var lNLength = lNCode.Length;
+ for (Int64 i = lastNum; i < maxNum; i++)
+ {
+ char[] bgCode = GetNewCodeArray(codeLength);
+ var sNum = i;//鏁存暟鍊嶅垵濮嬭祴鍊�
+ for (int a = bgCode.Length - 1; a >= 0; a--)
+ {
+ var yNum = sNum % lNLength;//璁＄畻浣欐暟
+ bgCode[a] = lNCode[yNum];//閫氳繃浣欐暟瀹氫綅鏁扮粍浣嶇疆
+ sNum = (int)(sNum / lNLength);//璁＄畻鍓╀綑鏁存暟
+ if (sNum == 0)//鏁存暟鍊嶄负0锛屽垯璺冲嚭寰幆
+ break;
+ }
+ //Console.WriteLine($"鐢熸垚鐮亄i}锛歿new string(bgCode)}");//鎵撳嵃鐢熸垚鐨勫簭鍒楃爜锛堟祴璇曠敤锛屾寮忕幆澧冭鍒犻櫎鎴栬�呮敞閲婏級
+ codeList.Add(new string(bgCode));
+ }
+ return codeList[0];
+ }
+
+ //搴忓垪鐮佸垵濮嬪寲
+ private char[] GetNewCodeArray(Int64 codeLength)
+ {
+ char[] bgCode = new char[codeLength];
+ for (Int64 i = 0; i < codeLength; i++)
+ {
+ bgCode[i] = '0';
+ }
+ return bgCode;
+ }
+
+ #endregion
+
+ #region 澧ㄨタ鍝ョ櫧鏍囩敓鎴愭煡璇�
+
+ //澧ㄨタ鍝ョ櫧鏍囨煡璇�
+ [Route("MES/MES_BarcodeWhiteLabelReport")]
+ [HttpGet]
+ public object MES_BarcodeWhiteLabelReport(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("SELECT top 1000 * FROM h_v_MES_BarcodeWhiteLabelReport where 1=1 " + sWhere, "h_v_MES_BarcodeWhiteLabelReport");
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ //return ds.Tables[0].Rows;
+ }
+
+ //澧ㄨタ鍝ョ櫧鏍囩敓鎴�
+ [Route("LEMS/SaveCirculationCard_Json_MXG")]
+ [HttpGet]
+ public object SaveCirculationCard_Json_MXG(string HBillNo, string HInterID, string HBillNo2, string HBarCode,string HNumber, string HName, string HModel)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ HBarCode = " ";
+ }
+ ds = oCN.RunProcReturn("exec Save_Sc_ProcessExchangeBillMainToTmp_MXG '" + HBillNo + "','" + HInterID + "','" + HBillNo2 + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "Save_Sc_ProcessExchangeBillMainToTmp_MXG");
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+ #endregion
+
+ #region 鎵祦杞崱鍙锋柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
[Route("LEMS/SaveCirculationCard_Json")]
[HttpGet]
- public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode,
- string HNumber, string HName, string HModel)
+ public object SaveCirculationCard_Json(string HBillNo, string HInterID, string HBillNo2, string HBarCode, string HNumber, string HName, string HModel)
{
DataSet ds;
try
@@ -2996,18 +3083,15 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎵瓙浠舵潯鐮佹柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜淇濆瓨鍒皌emp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎵瓙浠舵潯鐮佹柟娉曪紙浜х嚎鍖呰鍗曘�佷骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜淇濆瓨鍒皌emp琛�
+
[Route("LEMS/SaveSubBarcode_Json")]
[HttpGet]
- public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2,
- string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel)
+ public object SaveSubBarcode_Json(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel ,string HOrgID)
{
DataSet ds1;
DataSet ds;
@@ -3023,13 +3107,14 @@
ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
if (ds1.Tables[0].Rows.Count > 0)
{
- return CustomError("璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
+ return CustomError("[0000-2-039]璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
}
if (HBarCode == null || HBarCode.Equals(""))
{
HBarCode = " ";
}
- ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
+ ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','"+ HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
+ LogService.Write("ID:" + HInterID + ",娴佽浆鍗″彿:" + HBillNo + ",鍗曟嵁鍙�:" + HBillNo2 + ",鏉＄爜:" + SubBarcode + ",鎵樻潯鐮�:" + HBarCode);
}
}
@@ -3038,14 +3123,41 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ [Route("LEMS/SaveSubBarcode_Json_MXG")]
+ [HttpGet]
+ public object SaveSubBarcode_Json_MXG(string HBillNo, string SubBarcode, string HInterID, string HBillNo2, string HBillType, string sMaker, string HBarCode, string HNumber, string HName, string HModel,string HOrgID)
+ {
+ DataSet ds1;
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ return CustomError("璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
+ }
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ HBarCode = " ";
+ }
+ ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "','"+ HOrgID + "'", "h_p_Save_SubBarcodeToTmp");
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+
+ #endregion
+
+ #region 鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Select_Gy_BarCodeBill_HQty")]
[HttpGet]
public object Select_Gy_BarCodeBill_HQty(string HBarCode)
@@ -3072,11 +3184,10 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Update_Gy_BarCodeBill_HQty")]
[HttpGet]
public object Update_Gy_BarCodeBill_HQty(string HBarCode, string HQty)
@@ -3091,7 +3202,7 @@
}
else
{
- ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("exec h_p_Update_Gy_BarCodeBill_HQty " + HBarCode + "," + HQty + "", "h_p_Update_Gy_BarCodeBill_HQty");
}
}
@@ -3099,15 +3210,13 @@
{
ds = null;
}
- return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
+ return CustomCorrect(ds);;
}
- /// <summary>
- /// 鏇存柊鎵爜璁板綍鍒楄〃鏂规硶锛堜骇绾垮寘瑁呭崟銆佷骇绾跨粍瑁呰拷婧崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鏇存柊鎵爜璁板綍鍒楄〃鏂规硶锛堜骇绾垮寘瑁呭崟銆佷骇绾跨粍瑁呰拷婧崟锛�
+
[Route("LEMS/Update_HBillNo_SubBarcodeList_Json")]
[HttpGet]
public object Update_HBillNo_SubBarcodeList_Json(string HBillNo)
@@ -3134,48 +3243,101 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
+ #endregion
+
+ #region 鎻愪氦-涓昏〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+
[Route("LEMS/SaveToSc_PackUnionBillMain")]
[HttpGet]
- public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark)
+ public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber,string HOrgID)
{
DataSet ds;
+ DataSet dsHSNum;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string HBarCode_White = "";
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
+ {
+ ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR");
+ HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
+ }
+
+ //椤圭洰鍙疯幏鍙栨祦姘村彿
+ dsHSNum = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HProjectNum + "'", "h_p_WMS_GetMaxNo");
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
+ int HSNum = ClsPub.isInt(dsHSNum.Tables[0].Rows[0][0]) + 1;
+ //璋冪敤杩涘埗杞崲鏂规硶鎶婃祦姘村彿杞崲鎴愭祦姘村彿2
+ string HSNum2 = GetNewCodeByNum(HSNum, 1, 2);
+ if (HBillNo == null || HBillNo.Equals(""))
+ {
+ return CustomError("[0000-1-057]娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','"+ HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return CustomCorrect(ds);
+ }
+
+
+ [Route("LEMS/SaveToSc_PackUnionBillMain_MXG")]
+ [HttpGet]
+ public object SaveToSc_PackUnionBillMain(string HBillNo, string HRemark, string HProjectNum, string zxQty, string BBM, string LDM, string HMaterNumber, string HBarCode_White,string HOrgID)
+ {
+ DataSet ds;
+ DataSet dsHSNum;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HBarCode_White!="")
+ {
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬")
+ {
+ ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_MXG {zxQty},'{BBM}','{HMaterNumber}','{HBillNo}'", "h_p_MES_HBarCode_White_SMR_MXG");
+ HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString();
+ }
+ }
+ //椤圭洰鍙疯幏鍙栨祦姘村彿
+ dsHSNum = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HProjectNum + "'", "h_p_WMS_GetMaxNo");
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + HProjectNum + "'");
+ int HSNum = ClsPub.isInt(dsHSNum.Tables[0].Rows[0][0]) + 1;
+ //璋冪敤杩涘埗杞崲鏂规硶鎶婃祦姘村彿杞崲鎴愭祦姘村彿2
+ string HSNum2 = GetNewCodeByNum(HSNum, 1, 2);
if (HBillNo == null || HBillNo.Equals(""))
{
return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
}
else
{
- if (HRemark == null || HRemark.Equals(""))
- {
- ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "',''", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
- }
- else
- {
- ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain '" + HBillNo + "','" + HRemark + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain");
- }
+ ds = oCN.RunProcReturn("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG '" + HBillNo + "','" + HRemark + "'," + HSNum + ",'" + HSNum2 + "','" + HBarCode_White + "','"+ HOrgID + "'", "h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillMain_MXG");
}
}
catch (Exception e)
{
- ds = null;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾垮寘瑁呭崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+
[Route("LEMS/SaveToSc_PackUnionBillSub")]
[HttpGet]
public object SaveToSc_PackUnionBillSub(string HitemID, string HRemark)
@@ -3199,14 +3361,47 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鏇存柊temp琛ㄧ殑鏍囪瀛楁鏂规硶锛堜骇绾垮寘瑁呭崟锛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ //鏇存柊娌℃湁鍙嶅啓鐨勬暟鎹�
+ [Route("LEMS/SaveToSc_PackUnionBillSub_Back")]
+ [HttpGet]
+ public object SaveToSc_PackUnionBillSub_Back(string HInterID, string HRemark)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ return CustomError("[0000-2-058]鏇存柊澶辫触HitemID涓虹┖锛�");
+ }
+ else
+ {
+ oCN.RunProc("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Back '" + HInterID + "','" + HRemark + "'");
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-2-059]鏇存柊鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-058]" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ #endregion
+
+ #region 鏇存柊temp琛ㄧ殑鏍囪瀛楁鏂规硶锛堜骇绾垮寘瑁呭崟锛�
+
[Route("LEMS/Update_Flag_HRelationInterID")]
[HttpGet]
public object Update_Flag_HRelationInterID(string HitemID)
@@ -3233,11 +3428,10 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-涓昏〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎻愪氦-涓昏〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁娴佷紶鍗″彿浠巘emp琛ㄤ繚瀛樺埌涓昏〃
+
[Route("LEMS/SaveToSc_AssemblyBillMain")]
[HttpGet]
public object SaveToSc_AssemblyBillMain(string HBillNo)
@@ -3264,11 +3458,10 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鎻愪氦-瀛愯〃鏂规硶锛堜骇绾跨粍瑁呰拷婧崟锛�--鏍规嵁瀛愪欢鏉＄爜浠巘emp琛ㄤ繚瀛樺埌瀛愯〃
+
[Route("LEMS/SaveToSc_AssemblyBillSub")]
[HttpGet]
public object SaveToSc_AssemblyBillSub(string HitemID)
@@ -3295,14 +3488,13 @@
//return ds.Tables[0].Rows;
}
- /// <summary>
- /// 鐢熸垚鍞竴鏉＄爜鏂规硶锛堜骇绾垮寘瑁呭崟锛�--淇濆瓨鏃剁敓鎴愬敮涓�鏉＄爜
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鐢熸垚鍞竴鏉＄爜鏂规硶锛堜骇绾垮寘瑁呭崟锛�--淇濆瓨鏃剁敓鎴愬敮涓�鏉＄爜
+
[Route("LEMS/SaveBarCode_json")]
[HttpGet]
- public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName)
+ public object SaveBarCode_json(string sHMaterID, string sHUnitID, string sHBarcodeNo, string sHMaterName,string HOrgID)
{
DataSet ds;
string sTMNumber = "";
@@ -3357,7 +3549,7 @@
string HEndDate = sDate;
string HWorkLineName = "";
string HBarCodeDate = sDate;
- string HSTOCKORGID = "0";
+ string HSTOCKORGID = HOrgID;
string HOWNERID = "0";
string HSeOrderBillNo = "";
string HMaterName = sHMaterName;
@@ -3372,7 +3564,7 @@
+ " HSourceBillType,HEndQty,HBarcodeQtys,HBarcodeNo,HDeptID,"
+ " HWhID,HSPID,HRemark,HCusID,HCusType,"
+ " HEndDate,HWorkLineName,HBarCodeDate,HSTOCKORGID,HOWNERID,"
- + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo "
+ + "HSeOrderBillNo,HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo"
+ ") values ('" + HBarCode + "','" + HBarCodeType + "','" + sHMaterID + "','" + sHUnitID + "','" + HQty + "','"
+ HBatchNo + "','" + HSupID + "','" + HGroupID + "','" + HMaker + "',getdate(),'"
+ HPrintQty + "','" + HinitQty + "','" + HSourceInterID + "','" + HSourceEntryID + "','" + HSourceBillNo + "','"
@@ -3381,7 +3573,7 @@
+ HEndDate + "','" + HWorkLineName + "','" + HBarCodeDate + "','" + HSTOCKORGID + "'," + HOWNERID + ",'"
+ HSeOrderBillNo + "','" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HAuxPropID + "','" + HMTONo + "')"
);
- ds = oCn.RunProcReturn("select HBarCode from Gy_BarCodeBill where HSourceBillNo = '" + sHBarcodeNo + "' order by HMakeDate desc", "Gy_BarCodeBill");
+ ds = oCn.RunProcReturn("select top 10 HBarCode from Gy_BarCodeBill where HSourceBillNo = '" + sHBarcodeNo + "' order by HMakeDate desc", "Gy_BarCodeBill");
}
catch (Exception e)
{
@@ -3390,11 +3582,11 @@
return CustomCorrect(ds);
}
- /// <summary>
- /// 杩斿洖浜х嚎鍖呰鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+
+ #region 浜х嚎鍖呰鍗曞垪琛ㄦ煡璇�
+
[Route("LEMS/MES_ProductionLinePackagingList_Json")]
[HttpGet]
public object MES_ProductionLinePackagingList_Json(string sWhere)
@@ -3405,13 +3597,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_ProductionLinePackagingList order by 鍞竴鏉＄爜 desc", "h_v_ProductionLinePackagingList");
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_ProductionLinePackagingList order by 鎵爜鏃ユ湡 desc, 鍞竴鏉＄爜 desc", "h_v_ProductionLinePackagingList");
}
else
{
- string sql1 = "select * from h_v_ProductionLinePackagingList where 1 = 1 ";
+ string sql1 = "select top 1000 * from h_v_ProductionLinePackagingList where 1 = 1 ";
string sql = sql1 + sWhere;
- string sql2 = " order by 鍞竴鏉＄爜 desc";
+ string sql2 = " order by 鎵爜鏃ユ湡 desc, 鍞竴鏉＄爜 desc";
sql = sql + sql2;
ds = oCN.RunProcReturn(sql, "h_v_ProductionLinePackagingList");
}
@@ -3424,11 +3616,40 @@
return GetObjectJson(ds);
}
- /// <summary>
- /// 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 鍒犻櫎瀵瑰簲鐨勫寘瑁呭崟
+
+ [Route("LEMS/DelMES_ProductionLinePackagingList")]
+ [HttpGet]
+ public object DelMES_ProductionLinePackagingList(string HInterID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ oCN.RunProc("Delete from Sc_PackUnionBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete from Sc_PackUnionBillSub where HInterID = " + HInterID);
+ oCN.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID = " + HInterID);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
+
[Route("LEMS/Save_Gy_BarCodeBillToTmp_Json")]
[HttpGet]
public object Save_Gy_BarCodeBillToTmp_Json(string HInterID, string HBillNo2, string HBarCode)
@@ -3459,14 +3680,12 @@
ds = null;
}
return CustomCorrect(ds);
- //return ds.Tables[0].Rows;
}
- /// <summary>
- /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 浜х嚎缁勮杩芥函鍗曞垪琛ㄦ煡璇�
+
[Route("LEMS/MES_AssemblyTraceabilityList_Json")]
[HttpGet]
public object MES_AssemblyTraceabilityList_Json(string sWhere)
@@ -3496,11 +3715,10 @@
return GetObjectJson(ds);
}
- /// <summary>
- /// 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�--杩囨护鏉′欢涓洪暛闆曟潯鐮佺殑涓撶敤鏂规硶
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #endregion
+
+ #region 杩斿洖浜х嚎缁勮杩芥函鍗曞垪琛�--杩囨护鏉′欢涓洪暛闆曟潯鐮佺殑涓撶敤鏂规硶
+
[Route("LEMS/MES_AssemblyTraceabilityList_E_Json")]
[HttpGet]
public object MES_AssemblyTraceabilityList_E_Json(string HICMOBillNo)
@@ -3526,6 +3744,341 @@
return GetObjectJson(ds);
}
+ #endregion
+
+
+ #region 鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍-浜х嚎鍖呰鍗�
+
+ [Route("LEMS/DelProductionLinePackagingTable")]
+ [HttpGet]
+ public object DelProductionLinePackagingTable(long sHInterID, string HSourceBillNo)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ oCn.RunProc("Delete TOP(1) from KF_PonderationBillMain_Temp where HInterID = " + sHInterID + " and HSourceBillNo = '" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鏉＄爜鏄惁鏄笉鑹殑鐘舵��
+ [Route("LEMS/HbadStaus")]
+ [HttpGet]
+ public object HbadStaus(string SubBarcode)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn(@"select HBillNo,HReasult from tiaom where HBillNo='" + SubBarcode + @"'
+union
+select HBarCode HBillNo,HStatus HReasult from Gy_BarCodeBill
+where HBarCode='" + SubBarcode + "'", "Gy_BarCodeBill");
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "ok!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HReasult"].ToString() == "涓嶈壇")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-037]褰撳墠鏉＄爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HReasult"].ToString() + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]寮傚父锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍒ゆ柇鏉＄爜涔嬪墠鐨勫伐搴忔槸鍚﹀嚭绔�
+
+ [Route("LEMS/SNBarcodeProcCtrl")]
+ [HttpGet]
+ public object SNBarcodeProcCtrl(string SubBarcode, string HProcExchBillNo, string HMixedBox, string HBillNo)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_SNBarcodeProcCtrl '" + SubBarcode + "'", "h_p_Sc_SNBarcodeProcCtrl");
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_SNBarcodeMixedBox '" + SubBarcode + "','" + HProcExchBillNo + "','" + HMixedBox + "','" + HBillNo + "'", "h_p_Sc_SNBarcodeMixedBox");
+
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]寮傚父锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 09椤圭洰鍒ゆ柇閰嶄欢鏉＄爜 妯″叿绌村彿鏄惁鍖归厤
+
+ [Route("LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect")]
+ [HttpGet]
+ public object h_p_CJ_SNBarCodeBillMouldBathSelect(string SubBarcode, string HProcExchBillNo, string HBillType)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn(@"exec h_p_CJ_SNBarCodeBillMouldBathSelect '" + SubBarcode + "','" + HProcExchBillNo + "','" + HBillType + "'", "h_p_Sc_SNBarcodeMixedBox");
+
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]寮傚父锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+
+ [Route("LEMS/h_p_Sc_ProductionLinePackaging_Checkqty")]
+ [HttpGet]
+ public object h_p_Sc_ProductionLinePackaging_Checkqty(long HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProductionLinePackaging_Checkqty " + HInterID, "h_p_Sc_ProductionLinePackaging_Checkqty");
+ if (ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";//杩斿洖鍓╀綑鏁伴噺
+ objJsonResult.data = Pub_Class.ClsPub.isInt(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]寮傚父锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 缂撳瓨琛ㄥ寘瑁呭崟鍒楄〃
+
+ [Route("LEMS/PackUnionCacheList")]
+ [HttpGet]
+ public object PackUnionCacheList(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 1000 * from h_v_PackUnionBillCacheList order by 鎵爜鏃堕棿 desc", "h_v_PackUnionBillCacheList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_PackUnionBillCacheList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ string sql2 = " order by 鎵爜鏃堕棿 desc";
+ sql += sql2;
+ ds = oCN.RunProcReturn(sql, "h_v_PackUnionBillCacheList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 宸ュ簭娴佽浆鍗＄殑鏈亾宸ュ簭
+
+ [Route("LEMS/TxtHBarCode_KeyDown_Last")]
+ [HttpGet]
+ public object TxtHBarCode_KeyDown_Last(string sBillBarCode)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sBillBarCode == null || sBillBarCode.Equals(""))
+ {
+ return CustomError("鏈緭鍏ユ潯褰㈢爜锛�");
+ }
+ else
+ {
+ //鎷嗗垎鏉″舰鐮�
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode;
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 鏈亾宸ュ簭='鏄�' ", "h_v_Sc_ProcessExchangeBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return CustomError("涓嶅瓨鍦ㄦ娴佽浆鍗″彿锛�");
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ ds = null;
+ }
+ return CustomCorrect(ds);
+ }
+
+
+ #endregion
+
+ #endregion
+
/// <summary>
/// 杩斿洖澧欏挃宸ヨ祫缁熻鎶ヨ〃
///鍙傛暟锛歴tring sql銆�
--
Gitblit v1.9.1