From 151a93d2dccb2043e1a97bcae51b0f91a3d4aff3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 06 六月 2024 14:43:49 +0800
Subject: [PATCH] PDA扫码匹配设备档案，扫设备码时根据设备档案中的条形码匹配
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESProductReportStepBillController.cs | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
index 0338614..f40d8c5 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
@@ -18,21 +18,21 @@
private WebS.WebService1 oWebs = new WebS.WebService1();
#region 浜ч噺姹囨姤鍒楄〃
- [Route("Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillList")]
+ [Route("Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillListxxxx")]
[HttpGet]
- public object Get_Sc_MESProductReportBillList(string sWhere)
+ public object Get_Sc_MESProductReportBillListxxxx(string sWhere)
{
try
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
else
{
- string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
+ string sql1 = "select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where 1 = 1 ";
string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -52,6 +52,89 @@
#endregion
#region 浜ч噺姹囨姤缂栬緫鑾峰彇鏁版嵁
+ [Route("Sc_MESProductReportStepBill/Get_Sc_MESProductReportEditBillListxxxx")]
+ [HttpGet]
+ public object Get_Sc_MESProductReportEditBillListxxxx(string linterid, string HICMOInID, string HICMOEnID)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
+ ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 浜ч噺姹囨姤鍒楄〃鏂�
+ [Route("Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillList")]
+ [HttpGet]
+ public object Get_Sc_MESProductReportBillList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("MES_ProcExchReport_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp order by HInterID desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by HInterID desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鏁版嵁鎴愬姛锛�";
+ 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("Sc_MESProductReportStepBill/Get_Sc_MESProductReportEditBillList")]
[HttpGet]
public object Get_Sc_MESProductReportEditBillList(string linterid, string HICMOInID, string HICMOEnID)
@@ -59,7 +142,7 @@
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
if (ds.Tables[0].Rows.Count > 0)
{
--
Gitblit v1.9.1