From 6b43055b5aa32dbea0dacee5a0235b0d5a76c293 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 30 五月 2025 17:19:35 +0800
Subject: [PATCH] 优化后台报错信息,空箱入库容器号增加检查逻辑

---
 api/ApiHelper.cs |  204 +++++++++++++++++++++++++++++---------------------
 1 files changed, 119 insertions(+), 85 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index fc8de9c..fa5a44d 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1,55 +1,49 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using HH.WCS.Mobox3.DSZSH.models;
 using HH.WCS.Mobox3.DSZSH.util;
 using HH.WCS.Mobox3.DSZSH.wms;
 
 using Newtonsoft.Json;
-using Org.BouncyCastle.Asn1.Tsp;
 
 using SqlSugar;
 
-using Swashbuckle.Swagger;
-
 using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
 using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
-using static HH.WCS.Mobox3.DSZSH.Config;
 
 namespace HH.WCS.Mobox3.DSZSH.api {
     public class ApiHelper {
         /// <summary>
         /// 濂借繍绠�婊$涓嬬嚎鍏ュ簱(PDA)
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="model">鍖呭惈锛氱墿鏂欎俊鎭�璧风偣璐т綅</param>
         /// <returns></returns>
         public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
 
             var taskName = TaskName.H濂借繍绠盻婊$涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�-            var startAreaName = AreaName.M婊$鎿嶄綔鍖�
-            var endAreaName = AreaName.M婊$璐ф灦鍖�
+            var startAreaName = AreaName.M婊$鎿嶄綔鍖� // 璧风偣璐у尯
+            var endAreaName = AreaName.M婊$璐ф灦鍖� // 缁堢偣璐у尯
 
             try {
+                // 璐存爣鏈轰細鎻愬墠灏嗙墿鏂欎俊鎭啓鍏G_Detail琛ㄤ腑
                 // 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
                 var cgDetail = db.Queryable<TN_CG_Detail>()
                     .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo) // 鎸囧畾锛氱墿鏂欑紪鐮併�鎵规鍙�                     .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
                     // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�                     .First();
-
+                // 濡傛灉鎵句笉鍒版寚瀹氱殑鐗╂枡锛岃鏄庝俊鎭笉涓�嚧锛屾姤閿�                 if (cgDetail == null) {
                     info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
 
-                // 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
-                // 鍥犱负AGV鍙栬揣鍚庡氨浼氭仮澶�锛岃�涓旇揣浣嶄笂閿佸悗涓嶄細琚闂埌
+                // 鏌ヨ璧风偣璐т綅锛屾槸鍚︾鍚堣姹傦紙鍒濇涓嬬嚎瑕佹眰璐т綅鏃犲鍣級
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
                     .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
@@ -63,7 +57,7 @@
                     return NewSimpleResult(3, info);
                 }
 
-                // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+                // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛堟弧绠变笅绾垮埌鎿嶄綔鍖猴紝姝ゆ椂灏氭湭缁戝畾锛�                 var locCntrRel = new TN_Loc_Container {
                     S_LOC_CODE = model.StartLoc,
                     S_CNTR_CODE = cgDetail.S_CNTR_CODE,
@@ -87,8 +81,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -121,7 +115,7 @@
                         LogHelper.Info(info);
                         return NewSimpleResult(5, info);
                     }
-
+                    
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
@@ -165,12 +159,28 @@
                     .First();
 
                 if (startLoc == null) {
-                    info = $"璧风偣浣嶇疆{model.StartLoc}涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+                    info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囪姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
                     LogHelper.Info(info);
                     return NewSimpleResult(2, info);
                 }
 
-                // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+                //// 鏌ョ湅瀹瑰櫒鏄惁宸叉湁鐗╂枡缁戝畾
+                //var cgDetail = db.Queryable<TN_CG_Detail>()
+                //    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+                //// 濡傛灉鏈夌粦瀹氱墿鏂欙紝鎶ラ敊锛屽洜涓虹┖鎵樹笉搴旇鏈夌墿鏂�+                //if (cgDetail != null) {
+                //    info = $"瀹瑰櫒{model.CntrCode}宸茬粡缁戝畾浜嗙墿鏂檣cgDetail.S_ITEM_CODE}锛屼笉鏄┖鎵樻棤娉曞叆搴�;
+                //    LogHelper.Info(info);
+                //    return NewSimpleResult(3, info);
+                //}
+
+                // 鍋囧畾浜哄伐涓嶄細灏嗘湁鐗╂枡鐨勭瀛愭斁鍦ㄧ┖绠卞叆搴撴帴椹充綅锛屾病鏈夊繀瑕佹鏌�+                // 濡傛灉浜哄伐灏嗗嚭搴撳悗鐨勬墭鐩樺叆搴擄紝杩欐椂鐗╂枡淇℃伅骞舵病鏈夊垹闄わ紝闇�灏嗘墭鐩樼墿鏂欑殑鍏崇郴瑙i櫎
+                var cgDetail = db.Queryable<TN_CG_Detail>()
+                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+                var needDeleteDetail = cgDetail != null;
+
+                // 缁戝畾璐т綅鍜屽鍣ㄥ彿锛圥DA鍦ㄦ帴椹充綅缁戝畾
                 var locCntrRel = new TN_Loc_Container {
                     S_LOC_CODE = model.StartLoc,
                     S_CNTR_CODE = model.CntrCode,
@@ -194,15 +204,15 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                         info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
                         tran.RollbackTran();
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(5, info);
                     }
 
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -214,7 +224,7 @@
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(5, info);
                     }
 
                     if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -226,14 +236,14 @@
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(5, info);
                     }
 
                     if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
                         info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
                         LogHelper.Info(info);
-                        return NewSimpleResult(4, info);
+                        return NewSimpleResult(5, info);
                     }
 
                     tran.CommitTran();
@@ -275,6 +285,16 @@
                     return NewSimpleResult(2, info);
                 }
 
+                // 鏌ョ湅瀹瑰櫒鏄惁宸叉湁鐗╂枡缁戝畾
+                var cgDetail = db.Queryable<TN_CG_Detail>()
+                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
+                // 濡傛灉鏈夌粦瀹氱墿鏂欙紝鎶ラ敊锛屽洜涓虹┖绠变笉搴旇鏈夌墿鏂�+                if (cgDetail != null) {
+                    info = $"瀹瑰櫒{model.CntrCode}宸茬粡缁戝畾浜嗙墿鏂檣cgDetail.S_ITEM_CODE}锛屼笉鏄┖绠辨棤娉曞叆搴�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
+                }
+
                 // 缁戝畾璐т綅鍜屽鍣ㄥ彿
                 var locCntrRel = new TN_Loc_Container {
                     S_LOC_CODE = model.StartLoc,
@@ -299,8 +319,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -365,6 +385,7 @@
 
             var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
             var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            var endAreaName = AreaName.B鍖呰鍖�
 
             try {
                 // 鏌ュ鍣�鐗╂枡绫诲瀷琛�@@ -394,7 +415,7 @@
                 }
 
                 var endLoc = db.Queryable<TN_Location>()
-                    //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) 
                     .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
                     .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
                     .First();
@@ -408,8 +429,8 @@
                 var cntId = model.CntId;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -467,6 +488,7 @@
 
             var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
             var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+            var endAreaName = AreaName.K绌虹鎿嶄綔鍖�
 
             try {
                 var startLoc = db.Queryable<TN_Location>()
@@ -484,7 +506,7 @@
                 }
 
                 var endLoc = db.Queryable<TN_Location>()
-                    //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.Contains(l.S_AREA_CODE))
+                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
                     .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
                     .Where(l => l.N_CURRENT_NUM == 0)
                     .First();
@@ -498,8 +520,8 @@
                 var cntId = model.CntId;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -616,8 +638,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -672,9 +694,11 @@
             }
         }
         public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
-            var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
+
+            var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
+
             try {
 
                 if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
@@ -731,8 +755,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
@@ -788,9 +812,11 @@
         }
 
         public static SimpleResult RestBack(RestBackInfo model) {
-            var taskName = TaskName.W灏剧鍥炲簱;
             var db = new SqlHelper<object>().GetInstance();
             var info = "";
+
+            var taskName = TaskName.W灏剧鍥炲簱;
+            
             try {
                 var startLoc = db.Queryable<TN_Location>()
                     .Where(l => l.S_CODE == model.StartLoc)
@@ -835,8 +861,8 @@
                 var cntId = locCntrRel.S_CNTR_CODE;
                 var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
 
-                LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�-                LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+                LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�+                LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿� 
                 using (var tran = db.Ado.UseTran()) {
                     if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -885,7 +911,7 @@
         }
 
         /// <summary>
-        /// 鎴愬搧鑳跺嚭搴�WMS)
+        /// 鎴愬搧鑳跺嚭搴�PDA)
         /// </summary>
         /// <remarks>
         /// WMS鎻愪緵鍑哄簱鐨勭墿鏂欑被鍨嬩笌鏁伴噺锛岃皟鐢ㄦ帴鍙g敱WCS鐢熸垚鍏蜂綋鐨勫嚭搴撲换鍔★紝鐒跺悗WCS鍚庡彴杞澶勭悊
@@ -894,14 +920,12 @@
         /// <returns></returns>
         public static SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
             var info = "";
+
+            var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
             try {
-                if (string.IsNullOrEmpty(orderNo)) {
-                    info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
-                    LogHelper.Info(info);
-                    return NewSimpleResult(2, info);
-                }
+                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
 
                 var cgDetailList = SelectCgByTotalQty(model);
 
@@ -916,7 +940,6 @@
                     S_ITEM_CODE = model.ItemCode,
                     S_BATCH = model.BatchNo,
                     N_END_NUM = model.Qty,
-                    //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
                     S_END_AREA = model.EndArea
                 };
 
@@ -951,7 +974,9 @@
                     tran.CommitTran();
                 }
 
-                return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+                info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+                LogHelper.Info(info);
+                return NewSimpleResult(0, info);
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
@@ -966,54 +991,63 @@
         /// <returns></returns>
         public static SimpleResult FinishedOutboundForce(FinishedOutboundInfo model) {
             var db = new SqlHelper<object>().GetInstance();
-            var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
             var info = "";
+
+            var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+
             try {
-                if (string.IsNullOrEmpty(orderNo)) {
-                    return NewSimpleResult(2, "鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+                var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+
+                var cgDetailList = SelectCgByTotalQty(model);
+
+                if (cgDetailList.Count == 0) {
+                    info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+                    LogHelper.Info(info);
+                    return NewSimpleResult(3, info);
+                }
+
+                var order = new TN_Outbound_Order {
+                    S_NO = orderNo,
+                    S_ITEM_CODE = model.ItemCode,
+                    S_BATCH = model.BatchNo,
+                    N_END_NUM = model.Qty,
+                    S_END_AREA = model.EndArea
+                };
+
+                var detailList = new List<TN_Outbound_Detail>();
+                foreach (var cgDetail in cgDetailList) {
+                    var detail = new TN_Outbound_Detail {
+                        S_OO_NO = orderNo,
+                        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+                        S_BATCH_NO = cgDetail.S_BATCH_NO,
+                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+                        N_COUNT = cgDetail.N_ITEM_NUM,
+                        S_END_AREA = model.EndArea
+                    };
+                    detailList.Add(detail);
                 }
 
                 using (var tran = db.Ado.UseTran()) {
-
-                    var cgDetailList = SelectCgByTotalQty(model);
-
-                    if (cgDetailList.Count == 0) {
-                        return NewSimpleResult(3, "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�);
-                    }
-
-                    foreach (var cgDetail in cgDetailList) {
-                        var detail = new TN_Outbound_Detail {
-                            S_OO_NO = orderNo,
-                            S_ITEM_CODE = cgDetail.S_ITEM_CODE,
-                            S_BATCH_NO = cgDetail.S_BATCH_NO,
-                            S_CNTR_CODE = cgDetail.S_CNTR_CODE,
-                            S_END_AREA = model.EndArea
-                        };
-
-                        if (db.Insertable<TN_Outbound_Detail>(detail).ExecuteCommand() <= 0) {
-                            tran.RollbackTran();
-                            return NewSimpleResult(4, "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐ワ細" + JsonConvert.SerializeObject(detail));
-                        }
-                    }
-
-                    var order = new TN_Outbound_Order {
-                        S_NO = orderNo,
-                        S_ITEM_CODE = model.ItemCode,
-                        S_BATCH = model.BatchNo,
-                        N_END_NUM = model.Qty,
-                        //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
-                        S_END_AREA = model.EndArea
-                    };
-
                     if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
                         tran.RollbackTran();
-                        return NewSimpleResult(5, "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order));
+                        info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+                        LogHelper.Info(info);
+                        return NewSimpleResult(2, info);
+                    }
+
+                    if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+                        tran.RollbackTran();
+                        info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+                        LogHelper.Info(info);
+                        return NewSimpleResult(4, info);
                     }
 
                     tran.CommitTran();
                 }
 
-                return NewSimpleResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
+                info = "鐢熸垚鍑哄簱鍗曟垚鍔�;
+                LogHelper.Info(info);
+                return NewSimpleResult(0, info);
             }
             catch (Exception ex) {
                 info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";

--
Gitblit v1.9.1