From a3850178fe970578e8fcc6a21237c71d5d087b95 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 五月 2024 09:08:30 +0800
Subject: [PATCH] 获取最近的上模单 把工单跟模具进行绑定 上模单器具回车截取字符优化
---
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 20 ++++++++++
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 35 +++++++++++++++--
WebAPI/Controllers/LMESController.cs | 14 ++++++-
3 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 7535fe3..2177b34 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -577,9 +577,19 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceInterID=" + HInterID + " and HSourceEntryID=" + HEntryID + " and HICMOStatus=0 and HSourceID=" + HSourceID, "Sc_ICMOBillStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceInterID=" + HInterID + " and HSourceEntryID=" + HEntryID + " and HSourceID=" + HSourceID, "Sc_ICMOBillStatus_Tmp");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎶ュ伐鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "0")
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娴佽浆鍗″搴旂殑鎶ュ伐鏁版嵁涓嶄负鏈紑宸ョ姸鎬�,鏃犳硶鍒犻櫎锛�";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index e0df0f0..1876434 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -1396,12 +1396,14 @@
string sBillBarCode = HBarCode.Trim();
- //鎴彇鏉＄爜绫诲瀷2 鍓嶄袱浣�
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄袱浣�
string BillNoType2 = sBillBarCode.Substring(0, Math.Min(2, sBillBarCode.Length));
- //鎴彇鏉＄爜绫诲瀷 鍓嶄笁浣�
- string BillNoType3 = sBillBarCode.Substring(0, Math.Min(3, sBillBarCode.Length));
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄簲浣�
+ string BillNoType3 = sBillBarCode.Substring(0, Math.Min(5, sBillBarCode.Length));
//鎴彇鏉＄爜绫诲瀷3 鍓嶅洓浣�
string BillNoType4 = sBillBarCode.Substring(0, Math.Min(4, sBillBarCode.Length));
+ //鎴彇鏉＄爜绫诲瀷 鍓嶅叓浣�
+ string BillNoType5 = sBillBarCode.Substring(0, Math.Min(8, sBillBarCode.Length));
switch (BillNoType2)
@@ -1418,12 +1420,15 @@
break;
}
+
switch (BillNoType3)
{
//鍣ㄥ叿妗ｆ
case "MJD":
case "PAK":
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where 鍗曟嵁鍙� = '" + HBarCode + "'", "h_v_Gy_MouldFileList");
+ case "https":
+ HBarCode = HBarCode.Substring(23, HBarCode.Length-23);
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where 鏉＄爜缂栧彿 = '" + HBarCode + "'", "h_v_Gy_MouldFileList");
break;
default:
break;
@@ -1435,8 +1440,24 @@
case "GXLX":
ds = oCN.RunProcReturn("select 浠诲姟鍗曞彿,hicmointerid,HICMOEntryID,鍗曟嵁鍙�,hmainid,HEntryID from h_v_Sc_ProcessExchangeBillQuerySub where 鍗曟嵁鍙� = '" + HBarCode + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
break;
+ //鐢熶骇璁㈠崟
+ case "9010":
+ ds = oCN.RunProcReturn("select 鍗曟嵁鍙�,hmainid,HEntryID from h_v_IF_ICMOBillList where 鍗曟嵁鍙� = '" + HBarCode + "'", "h_v_IF_ICMOBillList");
+ break;
default:
break;
+ }
+
+ DateTime date;
+ bool flag = false;
+ if (BillNoType5.Length == 8) {
+ BillNoType5 = BillNoType5.Substring(0, 4) + "-" + BillNoType5.Substring(4, 2) + "-" + BillNoType5.Substring(6, 2);
+ }
+ flag = DateTime.TryParse(BillNoType5, out date);
+
+
+ if (flag) {
+ ds = oCN.RunProcReturn("select 浠诲姟鍗曞彿,hicmointerid,HICMOEntryID,鍗曟嵁鍙�,hmainid,HEntryID from h_v_Sc_ProcessExchangeBillQuerySub where 鍗曟嵁鍙� = '" + HBarCode + "'", "h_v_Sc_ProcessExchangeBillQuerySub");
}
if (ds == null || ds .Tables.Count== 0 || ds.Tables[0].Rows.Count == 0)
@@ -1598,6 +1619,9 @@
+ "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo.ToString()
+ "','" + oSub.HProcExchBillNo.ToString() + "'," + oSub.HProcExchInterID.ToString() + "," + oSub.HProcExchEntryID.ToString()
+ ",'" + oSub.HScanDate.ToString() + "','" + oSub.HMouldNumber.ToString() + "') ");
+
+ //鍙嶅啓妯″叿鐘舵��
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='棰嗗嚭' where HInterID= "+ oSub.HMouldID.ToString());
}
objJsonResult.code = "1";
@@ -1742,6 +1766,9 @@
+ "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo.ToString()
+ "','" + oSub.HProcExchBillNo.ToString() + "'," + oSub.HProcExchInterID.ToString() + "," + oSub.HProcExchEntryID.ToString()
+ ",'" + oSub.HScanDate.ToString() + "','" + oSub.HMouldNumber.ToString() + "') ");
+
+ //鍙嶅啓妯″叿鐘舵��
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='鍦ㄥ簱' where HInterID= " + oSub.HMouldID.ToString());
}
objJsonResult.code = "1";
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 1b7e945..f8b31cf 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -212,6 +212,26 @@
}
//=========================================================
+ //鑾峰彇鏈�杩戠殑涓婃ā鍗� 鎶婂伐鍗曡窡妯″叿杩涜缁戝畾
+ ds = oCn.RunProcReturn(@"select HICMOInterID,HICMOEntryID,HSourceInterID,HSourceEntryID,HSourceID from Sc_ICMOBillStatus_Tmp where HInterID=" + omodel.HMainSourceInterID.ToString(), "Sc_ICMOBillStatus_Tmp");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ string HICMOInterID = ds.Tables[0].Rows[0]["HICMOInterID"].ToString();
+ string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
+ string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
+ string HSourceEntryID = ds.Tables[0].Rows[0]["HSourceEntryID"].ToString();
+ string HSourceID = ds.Tables[0].Rows[0]["HSourceID"].ToString();
+
+ ds = oCn.RunProcReturn(@"select HMouldID from Sc_MouldUpperBillMain a
+inner join Sc_MouldUpperBillSub b on a.HInterID = b.HInterID where HICMOInterID=" + HICMOInterID + " and HICMOEntryID=" + HICMOEntryID + " and HProcExchInterID=" + HSourceInterID + " and HProcExchEntryID=" + HSourceEntryID + " and HSourceID=" + HSourceID + " order by HMakeDate desc", "Sc_MouldUpperBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oCn.RunProc("update Sc_ICMOBillStatus_Tmp set HMouldID= " + ds.Tables[0].Rows[0]["HMouldID"].ToString() + " where HInterID=" + omodel.HMainSourceInterID.ToString());
+ }
+
+ }
+
sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
--
Gitblit v1.9.1