From 3865194441f1e1da34c0be9034d86c8d0d68706c Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期五, 04 七月 2025 17:26:23 +0800
Subject: [PATCH] 接口调用中间表开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs |   68 ++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
index 2600909..9ea6922 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -187,14 +187,7 @@
                                 }
 
                             }
-                            //else
-                            //{
-                            //    result.code = "1";
-                            //    result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
-                            //    AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
-                            //    return result;
-                            //}
-
+                        
                         }
                         else
                         {
@@ -768,7 +761,7 @@
                 {
 
                     //鍒涘缓鎵樼洏鏁版嵁缁戝畾鍏崇郴
-                    if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
+                    if (ContainerHelper.CreateCntrItemTray(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime, model.PowderType))
                     {
                         //鍒涘缓鎴愬姛娴佺▼
                     }
@@ -1090,7 +1083,7 @@
                     #region 鏍规嵁鐗╂枡缂栫爜璁$畻鍑哄簱璐т綅锛岄�寰�嚎杈逛綅缃�                     Location Endloc = null;
                     //鏍规嵁鐗╂枡缂栫爜璁$畻鍑哄簱璐т綅
-                    var loc = airlift(areacode, itemcode, model.PartLevel);
+                    var loc = airlift(areacode, itemcode, model.PartLevel, model.PowderType);
                     if (loc != null)
                     {
                         Start = loc.S_CODE;
@@ -2288,7 +2281,7 @@
             }
             try
             {
-                if (model.prepare=="1")
+                if (model.prepare == "1")
                 {
                     var db = new SqlHelper<object>().GetInstance();
                     //淇敼瀵瑰簲鐢垫浠诲姟杩涜鎺ㄩ�
@@ -2300,9 +2293,9 @@
                     result.msg = $"涓�ゼ鐢垫鎼繍浠诲姟鎺ㄩ�澶辫触 prepare{model.prepare}涓嶄负1";
                     LogHelper.Info(result.msg);
                     return result;
-                }     
+                }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.code = "1";
                 result.msg = $"鐢垫浠诲姟鎺ㄩ�澶辫触 閿欒淇℃伅锛歿ex}";
@@ -2665,8 +2658,9 @@
         /// <param name="areacode"></param>
         /// <param name="itemcode"></param>
         /// <param name="level">鐗╂枡绛夌骇</param>
+        /// <param name="powderType">鏈哄瀷</param>
         /// <returns></returns>
-        internal static Location airlift(string areacode, string itemcode, string level = "")
+        internal static Location airlift(string areacode, string itemcode, string level, string powderType)
         {
             var db = new SqlHelper<object>().GetInstance();
             Location result = null;
@@ -2723,8 +2717,8 @@
             //}
 
             #endregion
-            var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
-            LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鐗╂枡绛夌骇璁$畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
+            var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level, powderType);
+            LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鏈哄瀷{powderType},鐗╂枡绛夌骇璁$畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
             // result = FindStartcolByLoclist(loc);
             if (loc.Count > 0)
             {
@@ -2859,6 +2853,48 @@
         }
 
         /// <summary>
+        /// 鍚堣偉浣抽�鎺ュ彛璋冪敤淇℃伅
+        /// </summary>
+        /// <param name="source">绯荤粺鏉ユ簮</param>
+        /// <param name="name">鎺ュ彛鍚嶇О</param>
+        /// <param name="type">璇锋眰鍦板潃绫诲瀷</param>
+        /// <param name="body">璇锋眰鍙傛暟</param>
+        /// <param name="url">璇锋眰鍦板潃</param>
+        /// <param name="err">閿欒淇℃伅</param>
+        /// <returns></returns>
+        public static bool AddInfo(string source, string name, string body, string err, string type, string url)
+        {
+            bool result = false;
+            var db = new SqlHelper<object>().GetInstance();
+            try
+            {
+                var error = new GT_Interface_Exc
+                {
+                    S_SOURCE = source,
+                    S_NAME = name,
+                    S_TYPE = type,
+                    S_URL = url,
+                    S_BODY = body,
+                    S_ERR = err
+                };
+                if (result = db.Insertable<GT_Interface_Exc>(error).ExecuteCommand() > 0)
+                {
+
+                }
+                //else
+                //{
+                //    //娣诲姞澶辫触閲嶆柊娣诲姞
+                //    AddErrorInfo(errorInfo, remake, areacode, taskno);
+                //}
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Info($"AddInfo Error:{ex.Message}");
+            }
+            return result;
+        }
+
+        /// <summary>
         /// 鎵剧粓鐐圭┖璐т綅
         /// </summary>
         /// <param name="locations"></param>

--
Gitblit v1.9.1