From 9f7b0ecace9c80ff2a1d95f4343058b3b031bd22 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 30 三月 2026 21:39:29 +0800
Subject: [PATCH] 容器管理新增字段子单据类型
---
WebAPI/Controllers/LMESController.cs | 104 +++++++++++++---------------------------------------
1 files changed, 26 insertions(+), 78 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 0e1db04..3ea3d32 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -872,25 +872,39 @@
{
continue;
}
- string sReturn = "";
- if (oSystemParameter.ShowBill(ref sReturn) == true)
+ //淇濆瓨鍓嶅垽鏂祦杞崱鍚屼竴涓伐搴忔淳宸ユ槸鍚︽帓浜嗕袱娆�
+ string SQ = "select * from Sc_ICMOBillStatus_Tmp where HSourceInterID=" + hSourceInterID + " and HSourceEntryID=" + hSourceEntryID + " and HSourceID=" + hSourceID + " and HMouldID=" + hMoldID + "";
+ ds2 = oCN.RunProcReturn(SQ, "Sc_ICMOBillStatus_Tmp");
+ if (ds2.Tables[0].Rows.Count > 0)
{
- if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
- {
- oCN.RunProc("update Sc_ProcessExchangeBillMain set HMakeDate = GETDATE(),HRemark3='宸叉淳宸�',HMaker='" + msg4 + "' where HInterID = " + hSourceInterID);
- LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...");
-
- //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
- ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + hSourceInterID + "," + 3772, "h_p_OA_WorkLinkBill_Create");
- }
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屼竴宸ュ崟涓嶈兘鍐嶇浉鍚屼骇绾跨浉鍚屾ā鍏蜂笂閲嶅娲惧伐锛�";
+ return objJsonResult;
}
+ //鏇存柊娴佽浆鍗″瓙琛ㄧ敓浜ц祫婧�
oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + hSourceID + " where HInterID=" + hSourceInterID + " and HEntryID=" + hSourceEntryID);
// 鎻掑叆鐢熶骇鐘舵�佷复鏃惰〃
string SQL = $"exec h_p_Sc_ICMOBillStatus_Tmp_PGPL {hSourceInterID},{hSourceEntryID},{hSourceID},{hMoldID}";
oCN.RunProc(SQL);
//鎻掑叆宸ュ簭娴佽浆鍗℃淳宸ュ崟
string SQL1 = $"exec h_p_Sc_ProcExchSendWorkBill_PG {hSourceInterID},{hSourceEntryID},{hSourceID},{hMoldID}";
+
oCN.RunProc(SQL1);
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ oCN.RunProc("update Sc_ProcessExchangeBillMain set HMakeDate = GETDATE(),HRemark3='宸叉淳宸�',HMaker='" + msg4 + "' where HInterID = " + hSourceInterID);
+
+ LogService.Write("娲惧伐鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ hSourceInterID);
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + hSourceInterID + "," + 3772, "h_p_OA_WorkLinkBill_Create");
+ }
+ }
+
// 7. 鎻愪氦浜嬪姟
oCN.Commit();
@@ -2248,7 +2262,6 @@
return GetObjectJson(ds);
}
-
/// <summary>
/// 杩斿洖宸ュ簭娴佽浆鍗″垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -2314,6 +2327,8 @@
}
return GetObjectJson(ds);
}
+
+
#region 鐢熶骇璁㈠崟鍒楄〃-鍒嗛〉
@@ -2895,73 +2910,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "";
- objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 鍒ゆ柇涓嬫帹鐨勫伐搴忔祦杞崱鏄惁瀹℃牳
- [Route("LEMS/ProcessExchangeBillCheck")]
- [HttpGet]
- public object ProcessExchangeBillCheck(string hmainid, string HEntryID, int OrganizationID,string HSourceBillNo)
- {
- DataSet ds;
- try
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 and hmainid=" + hmainid + " and HEntryID=" + HEntryID + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
- string HNumber = ds.Tables[0].Rows[0]["浜у搧浠ｇ爜"].ToString();
-
- if (ds.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎵�閫夌敓浜ц鍗曚负鏈鏍哥姸鎬侊紝涓嶅厑璁镐笅鎺ㄧ敓鎴愬伐搴忔祦杞崱锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (ds.Tables[0].Rows[0]["鍏抽棴浜�"].ToString() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎵�閫夌敓浜ц鍗曚负宸插叧闂姸鎬侊紝涓嶅厑璁镐笅鎺ㄧ敓鎴愬伐搴忔祦杞崱锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (ds.Tables[0].Rows[0]["浣滃簾浜�"].ToString() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎵�閫夌敓浜ц鍗曚负宸蹭綔搴熺姸鎬侊紝涓嶅厑璁镐笅鎺ㄧ敓鎴愬伐搴忔祦杞崱锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- ds = oCN.RunProcReturn("select * from Kf_ICStockBillSub where HInterID=" + hmainid + " and HEntryID=" + HEntryID , "Kf_ICStockBillSub");
-
- if (double.Parse(ds.Tables[0].Rows[0]["HSourceBillNo"].ToString()).Equals(HSourceBillNo))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎵�閫夌敓浜ц鍗曞凡鍏ㄩ儴涓嬫帹,涓嶅厑璁稿啀娆′笅鎺紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1