From 4b7075beba3ac2f75bd295fb1c413cd514ce1a4c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 六月 2024 23:41:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 109 +++++++++++++++++++++---------------------------------
1 files changed, 42 insertions(+), 67 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index 1876434..b3d6f23 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -198,6 +198,9 @@
+ HInterID + ",'"+ HBillNo + "'," + i + "," + oSub.HMouldID.ToString() + ",'" + oSub.HQty
+ "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString()+",'"+ oSub.HICMOBillNo.ToString() +
"') ");
+
+ //鍙嶅啓妯″叿鐘舵��
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='棰嗗嚭' where HInterID= " + oSub.HMouldID.ToString());
}
objJsonResult.code = "1";
@@ -877,6 +880,9 @@
+ HInterID + ",'" + HBillNo + "'," + i + "," + oSub.HMouldID.ToString() + ",'" + oSub.HQty
+ "'," + oSub.HSourceID.ToString() + "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo.ToString() +
"') ");
+
+ //鍙嶅啓妯″叿鐘舵��
+ oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='鍦ㄥ簱' where HInterID= " + oSub.HMouldID.ToString());
}
objJsonResult.code = "1";
@@ -1375,6 +1381,41 @@
}
#endregion
+ #region 涓嬫ā鍗曟煡璇笂妯″崟淇℃伅 鍒楄〃鏌ヨ
+ [Route("Sc_MouldLowerBill/Sc_MouldUpperBillList")]
+ [HttpGet]
+ public object Sc_MouldUpperBillList(string sWhere)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Qj_Sc_MouldUpperBillList where 1=1" + sWhere, "h_v_Qj_Sc_MouldUpperBillList");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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("Sc_MouldUpperBill/txtHBarCode_KeyDown")]
@@ -1392,73 +1433,7 @@
return objJsonResult;
}
- //鎷嗗垎鏉″舰鐮�
- string sBillBarCode = HBarCode.Trim();
-
-
- //鎴彇鏉＄爜绫诲瀷 鍓嶄袱浣�
- string BillNoType2 = sBillBarCode.Substring(0, Math.Min(2, 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)
- {
- //鐢熶骇璧勬簮
- case "BM":
- case "SS":
- ds = oCN.RunProcReturn("select HItemID,HName,HNumber from Gy_Source where HNumber = '" + HBarCode + "'", "Gy_Source");
- break;
- case "MO":
- ds = oCN.RunProcReturn("select 鍗曟嵁鍙�,hmainid,HEntryID from h_v_IF_ICMOBillList where 鍗曟嵁鍙� = '" + HBarCode + "'", "h_v_IF_ICMOBillList");
- break;
- default:
- break;
- }
-
-
- switch (BillNoType3)
- {
- //鍣ㄥ叿妗ｆ
- case "MJD":
- case "PAK":
- 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;
- }
-
- switch (BillNoType4)
- {
- //娴佽浆鍗�
- 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");
- }
+ ds = oCN.RunProcReturn("exec h_p_Sc_AllowLoadData '" + HBarCode + "'", "h_p_Sc_AllowLoadData");
if (ds == null || ds .Tables.Count== 0 || ds.Tables[0].Rows.Count == 0)
{
--
Gitblit v1.9.1