From 02afa11e997bcf6f68d60cc2cfbaa8007f124989 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 03 二月 2026 09:40:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
index 9bd958b..9db9f64 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs
@@ -2441,6 +2441,16 @@
{
//淇濆瓨鍚庢帶鍒�
objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 1);
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + HInterID + "," + 3847);
+ }
+ }
+
if (objJsonResult.count == 0)
{
objJsonResult.code = "0";
@@ -2706,5 +2716,43 @@
}
}
#endregion
+
+ #region 涓婃ā鍗曟壂鎻忓伐鍗曟潯鐮佹煡璇㈠搴旂殑鍣ㄥ叿娓呭崟
+ [Route("Sc_MouldUpperBill/GetMaterialMouldList")]
+ [HttpGet]
+ public object GetMaterialMouldList(string sWhere, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialMouldBillMainList_APP where 1 = 1"+sWhere, "h_v_Gy_MaterialMouldBillMainList_APP");
+
+ 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 = "鏌ヨ鎴愬姛";
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1