From 04c8b36de09ce9654870c6628b2722fec2520545 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 21 十一月 2023 09:14:59 +0800
Subject: [PATCH] 判断 条码是否为不良 修改组托单的条码规则
---
WebAPI/Controllers/LMESController.cs | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 4c7a8ea..84cec3c 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1079,13 +1079,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");
}
@@ -1098,6 +1098,36 @@
return GetObjectJson(ds);
}
+ /// <summary>
+ /// 鍒犻櫎瀵瑰簲鐨勫寘瑁呭崟
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [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 = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
/// <summary>
/// 鎵壒娆℃潯鐮佹柟娉曪紙浜х嚎缁勮杩芥函鍗曪級--鏍规嵁鎵规鏉＄爜鍒版潯鐮佹。妗堣〃涓幏鍙栨暟鎹繚瀛樺埌temp琛�
///鍙傛暟锛歴tring sql銆�
@@ -1225,6 +1255,54 @@
}
}
+ //鍒ゆ柇鏉＄爜鏄惁鏄笉鑹殑鐘舵��
+ [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 = "褰撳墠鏉＄爜鐨勭姸鎬佷负:"+ 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 = "寮傚父锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+
//鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
[Route("LEMS/h_p_Sc_ProductionLinePackaging_Checkqty")]
[HttpGet]
--
Gitblit v1.9.1