From 0a0d8bdfc13d6b780aa37b3b08e702fc96e6b892 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 29 四月 2025 16:28:42 +0800
Subject: [PATCH] 翻译

---
 WebAPI/Controllers/Sc_GroupOrderBillController.cs |   32 ++++++++--------
 WebAPI/Controllers/LMESController.cs              |   84 ++++++++++++++++++++++++++++++------------
 2 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 314106f..fd1247a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -323,7 +323,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.Message = "[0000-1-045]娌℃湁杩斿洖浠讳綍璁板綍锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -331,7 +331,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                    objJsonResult.Message = "[0000-1-037]鑾峰彇淇℃伅鎴愬姛锛�";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -340,7 +340,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -371,7 +371,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                objJsonResult.Message = "[0000-1-045]娌℃湁杩斿洖浠讳綍璁板綍锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -379,7 +379,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.Message = "[0000-1-050]鑾峰彇淇℃伅鎴愬姛锛�";
                 objJsonResult.data = ds.Tables[0];
                 return objJsonResult;
             }
@@ -738,13 +738,14 @@
                     ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
                     if (ds1.Tables[0].Rows.Count > 0)
                     {
-                        return CustomError("璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
+                        return CustomError("[0000-2-039]璇ュ瓙浠舵潯鐮佸凡瀛樺湪");
                     }
                     if (HBarCode == null || HBarCode.Equals(""))
                     {
                         HBarCode = " ";
                     }
                     ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
+                    LogService.Write("ID:" + HInterID + ",娴佽浆鍗″彿:" + HBillNo + ",鍗曟嵁鍙�:" + HBillNo2 + ",鏉$爜:" + SubBarcode + ",鎵樻潯鐮�:" + HBarCode);
                 }
 
             }
@@ -909,7 +910,7 @@
                 string HSNum2 = GetNewCodeByNum(HSNum,1,2);
                 if (HBillNo == null || HBillNo.Equals(""))
                 {
-                    return CustomError("娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
+                    return CustomError("[0000-1-057]娴佽浆鍗″彿涓嶈兘涓虹┖锛�");
                 }
                 else
                 {
@@ -920,7 +921,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "寮傚父锛�"+e.ToString();
+                objJsonResult.Message = "[0000-1-051]寮傚父锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -1002,6 +1003,41 @@
             }
             return CustomCorrect(ds);
             //return ds.Tables[0].Rows;
+        }
+
+        //鏇存柊娌℃湁鍙嶅啓鐨勬暟鎹�
+        [Route("LEMS/SaveToSc_PackUnionBillSub_Back")]
+        [HttpGet]
+        public object SaveToSc_PackUnionBillSub_Back(string HInterID, string HRemark)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    return CustomError("[0000-2-058]鏇存柊澶辫触HitemID涓虹┖锛�");
+                }
+                else
+                {
+                    oCN.RunProc("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Back '" + HInterID + "','" + HRemark + "'");
+                }
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "[0000-2-059]鏇存柊鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "[0000-2-058]" + e.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+           
         }
 
         /// <summary>
@@ -1243,7 +1279,7 @@
                 oCN.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID = " + HInterID);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -1251,7 +1287,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -1369,7 +1405,7 @@
                 oCn.RunProc("Delete TOP(1) from KF_PonderationBillMain_Temp where HInterID = " + sHInterID + " and HSourceBillNo = '" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -1377,7 +1413,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -1408,7 +1444,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "褰撳墠鏉$爜鐨勭姸鎬佷负:"+ ds.Tables[0].Rows[0]["HReasult"].ToString() + "锛�";
+                    objJsonResult.Message = "[0000-2-037]褰撳墠鏉$爜鐨勭姸鎬佷负:" + ds.Tables[0].Rows[0]["HReasult"].ToString() + "锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1425,7 +1461,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "寮傚父锛�";
+                objJsonResult.Message = "[0000-1-010]寮傚父锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -1455,7 +1491,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏌ユ棤鏁版嵁!";
+                    objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1463,7 +1499,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+                    objJsonResult.Message = "[0000-1-051]"+ ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1475,7 +1511,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "鏌ユ棤鏁版嵁!";
+                        objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -1483,7 +1519,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+                        objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                         return objJsonResult;
                     }
                     else {
@@ -1499,7 +1535,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "寮傚父锛�";
+                objJsonResult.Message = "[0000-1-010]寮傚父锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -1522,7 +1558,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏌ユ棤鏁版嵁!";
+                    objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1530,7 +1566,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+                    objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                     return objJsonResult;
                 }
                 else
@@ -1546,7 +1582,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "寮傚父锛�";
+                objJsonResult.Message = "[0000-1-010]寮傚父锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -1574,7 +1610,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
+                    objJsonResult.Message = "[0000-1-051]" + Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -1583,7 +1619,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "寮傚父锛�";
+                objJsonResult.Message = "[0000-1-010]寮傚父锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
diff --git a/WebAPI/Controllers/Sc_GroupOrderBillController.cs b/WebAPI/Controllers/Sc_GroupOrderBillController.cs
index 0bf42d1..6a46813 100644
--- a/WebAPI/Controllers/Sc_GroupOrderBillController.cs
+++ b/WebAPI/Controllers/Sc_GroupOrderBillController.cs
@@ -39,7 +39,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "璇疯緭鍏ヨ绠辩爜锛�";
+                    objJsonResult.Message = "[3783-2-003]璇疯緭鍏ヨ绠辩爜锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -51,7 +51,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();//璇ヨ绠卞崟宸叉壂鐮侊紒
+                        objJsonResult.Message = "[0000-1-038]" + ds.Tables[0].Rows[0][1].ToString();//璇ヨ绠卞崟宸叉壂鐮侊紒
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -65,7 +65,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛佹棤鏁版嵁锛岃纭瑁呯鐮佹槸鍚﹀瓨鍦紒";
+                    objJsonResult.Message = "[3783-2-004]false锛佹棤鏁版嵁锛岃纭瑁呯鐮佹槸鍚﹀瓨鍦紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -73,7 +73,7 @@
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.Message = "[0000-1-037]Sucess锛�";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -82,7 +82,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -122,7 +122,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = $"榛戞爣鍙穥HBarCode_Cus}宸插瓨鍦�";
+                    objJsonResult.Message = $"[3783-2-007]榛戞爣鍙穥HBarCode_Cus}宸插瓨鍦�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -156,16 +156,16 @@
                 oCN.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                objJsonResult.Message = "[0000-1-050]鏂板鍗曟嵁鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
             catch (Exception e)
             {
-                oCN.RollBack();
+                //oCN.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "[0000-1-051]Exception锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -200,7 +200,7 @@
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳暟鎹紒";
+                    objJsonResult.Message = "[0000-1-045]鏃犳暟鎹紒";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -208,7 +208,7 @@
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.Message = "[0000-1-037]Sucess锛�";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -218,7 +218,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "[0000-1-010]Exception锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -321,7 +321,7 @@
                 oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HBarCode = '" + BarCode + "' and HBillType = '2601'");
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -329,7 +329,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.Message = "[0000-1-007]鍒犻櫎澶辫触锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }
@@ -390,7 +390,7 @@
                 oCn.RunProc("update Sc_PackUnionBillMain set HBarCode_Cus = '" + HBarCode_Cus + "' where HInterID = " + HInterID);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "淇敼鎴愬姛锛�";
+                objJsonResult.Message = "[[0000-1-067]]淇敼鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -398,7 +398,7 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "淇敼澶辫触锛�";
+                objJsonResult.Message = "[0000-1-066]淇敼澶辫触锛�";
                 objJsonResult.data = e.ToString();
                 return objJsonResult;
             }

--
Gitblit v1.9.1