From 976d3ae1547b896cc5c7875408c09616d5c2ee55 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 26 十一月 2024 20:51:17 +0800
Subject: [PATCH] 箱数更新

---
 Tiger.Business.MES/Transaction/YadaPacking.cs |  229 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 207 insertions(+), 22 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index e1fef5d..5f40414 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -11,6 +11,8 @@
 using Tiger.Model;
 using Tiger.Model.Entitys.MES.Position;
 using Tiger.Business.MES.WorkAction;
+using Tiger.Model.MES.Yada;
+using System.Data;
 
 namespace Tiger.Business.MES.Transaction
 {
@@ -36,6 +38,9 @@
         public string NodeCmd { get; set; }
         public PackingAction TempPkgAction { get; set; }
         public bool IsPrintCustomerLabel { get; set; }
+        public string ShippingOrder { get; set; }
+        public DateTime curtime = DateTime.Now;
+        public DateTime prevtime = DateTime.Now;
         #endregion Propertys & Variables
 
         #region Functions
@@ -46,23 +51,29 @@
         /// <returns></returns>
         public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
         {
+            curtime = prevtime = DateTime.Now; Logger.Console.Info($"{CurSN} : ***** 1 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
             var action = new ApiAction<SubmitOutput>(new SubmitOutput());
             try
             {
-                if (input.Qty.ToInt32() <= 0)
-                {
-                    action.Data.ShortMsg = new("璇疯緭鍏ュ寘瑁呮暟閲�", ShortMessage.Types.Error);
-                    action.Data.OperInfo = new();
-                    action.Data.Data = "QtyError";
-                    action.IsSuccessed = false;
-                    action.LocaleMsg = new($"鍖呰鏁伴噺[{input.Qty}]涓嶆纭紝璇烽噸鏂拌緭鍏ユ暟閲忓悗缁х画鍖呰鎿嶄綔");
-                    //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.QtyError", input.Qty);
-                    return action;
-                }
+                //if (input.Qty.ToInt32() <= 0)
+                //{
+                //    action.Data.ShortMsg = new("璇疯緭鍏ュ寘瑁呮暟閲�", ShortMessage.Types.Error);
+                //    action.Data.OperInfo = new();
+                //    action.Data.Data = "QtyError";
+                //    action.IsSuccessed = false;
+                //    action.LocaleMsg = new($"鍖呰鏁伴噺[{input.Qty}]涓嶆纭紝璇烽噸鏂拌緭鍏ユ暟閲忓悗缁х画鍖呰鎿嶄綔");
+                //    //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.QtyError", input.Qty);
+                //    return action;
+                //}
                 if (input.Options.ContainsKey("IsPrintCustomerLabel"))
                 {
                     IsPrintCustomerLabel = input.Options["IsPrintCustomerLabel"].ToBoolean();
                 }
+          
+                //if (input.Options.ContainsKey("ShippingOrder"))
+                //{
+                //    ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";
+                //}
                 //PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝鎵嬪姩淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
                 if (NodeCmd == "PkgSubmit")
                 {
@@ -83,13 +94,13 @@
                         var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                                                 .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                                 .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
-
+                        curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 2 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                         //鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
                         if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
                         {
                             //鏇存柊CurBatch
                             CurBatch?.Update();
-
+                            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 3 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                             var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));
                             if (!wosn.IsNullOrEmpty())
                             {
@@ -103,6 +114,7 @@
                             {
                                 //鎻愪氦鏁版嵁
                                 action = NodeSubmit(action, input);
+                                curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 4 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                                 //鏇存柊宸ュ簭淇℃伅
                                 if (!action.IsSuccessed)
                                 {
@@ -223,20 +235,23 @@
                     {
                         //鏇存柊CurBatch
                         CurBatch?.Update();
-
+                        curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 5 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                         var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();
                         //濡傛灉瀹㈡埛绔繑鍥炵殑褰撳墠宸ユID鎵句笉鍒版湭瀹屾垚鐨勮涓哄伐姝ワ紝鍒欑洿鎺ュ紑濮嬩笅涓�涓涓哄伐姝�
                         if (submitStep.IsNullOrEmpty())
                         {
                             action = BeginNextActionStep(input);
+                            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 6 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                         }
                         else
                         {
                             action = submitStep.Submit(input);
+                            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 7 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                             //濡傛灉褰撳墠宸ユ宸插畬鎴愶紝寮�濮嬫墽琛屼笅涓�宸ユ
                             if (action.IsSuccessed && submitStep.IsFinished)
                             {
                                 action = BeginNextActionStep(input);
+                                curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 8 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                             }
                             //濡傛灉褰撳墠宸ユ鏈畬鎴�
                             else
@@ -281,6 +296,7 @@
                 //action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
                 action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
             }
+            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 9 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
             return action;
         }
 
@@ -292,6 +308,7 @@
         /// <returns></returns>
         public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
         {
+            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 10 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
             var curNode = CurBatch.GetNode(PostCode);
             try
             {
@@ -318,7 +335,7 @@
                         return woStatus;
                     }
 
-                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
+                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                     if (wipSNs.IsNullOrEmpty())
                     {
                         var wipSN = new MES_WIP_DATA()
@@ -375,7 +392,46 @@
 
                     //璁剧疆褰撳墠鎸囦护涓烘甯镐骇鍝佽繃绔�
                     NodeCmd = "NodeSubmit";
+                    curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 11 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
 
+                    //鑾峰彇鍑鸿揣鐘舵��
+                    DbClient db = Biz.DataSource["YadaU9C"].Client;
+                    var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
+                    int CurShipQty = 0;
+                    int WaitShipmentCarton = 0;
+                    if (ship.IsNullOrEmpty()) { IsPrintCustomerLabel = false; } else
+                    {
+                        CurShipQty = ship.ShipQty;
+                        SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = CurBatch.Batch.BATCH_NO, NodeIdOrName = curNode.NODE_NAME });
+                        var list = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars).AsEnumerable().ToList();
+                        if (!list.IsNullOrEmpty())
+                        {
+                            var batchCount = list.Where(q => q["ProdDate"].ToString() == "Whole").FirstOrDefault();
+                            WaitShipmentCarton = batchCount["WaitShipment"].ToInt32();
+                            IsPrintCustomerLabel = batchCount.IsNullOrEmpty() ? false : batchCount["WaitShipment"].ToInt32() >= ship.ShipQty ? false : true;
+                        }
+                    }
+                    ShippingOrder = IsPrintCustomerLabel ? ship?.ShipDoc ?? "" : "";
+                    //缂撳瓨鍑鸿揣鏁伴噺
+                    if (Context.ContainsKey("CurShipQty"))
+                    {
+                        Context["CurShipQty"] = CurShipQty;
+                    }
+                    else
+                    {
+                        Context.Add("CurShipQty", CurShipQty);
+                    }
+                    //缂撳瓨鍑鸿揣绠辨暟
+                    if (Context.ContainsKey("CurWaitShipmentCarton"))
+                    {
+                        Context["CurWaitShipmentCarton"] = WaitShipmentCarton;
+                    }
+                    else
+                    {
+                        Context.Add("CurWaitShipmentCarton", WaitShipmentCarton);
+                    }
+
+                    curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 12 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                     //缁戝畾鏉$爜鍒板伐鍗�
                     foreach (var wipSN in wipSNs)
                     {
@@ -418,6 +474,8 @@
                         wipSN.OPER_CODE = curNode.OPER_CODE;
                         wipSN.SEGMENT = curNode.SEGMENT;
                         wipSN.OPERATION_TIME = DateTime.Now;
+                        wipSN.SHIPPING_ORDER = ShippingOrder;
+                        wipSN.UNBIND_FLAG = "N";
                         var curShiftPeriod = GetShiftPeriodForNow();
                         if (!curShiftPeriod.IsNullOrEmpty())
                         {
@@ -438,7 +496,7 @@
                         {
                             var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
                             woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
-                            wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+                            wipSN.STATUS = MES_WIP_DATA.STATUSs.Output.GetValue();
                             wipSN.OUTLINE_DATE = DateTime.Now;
                         }
                         //濡傛灉鏈夋彁浜や笉鑹�
@@ -484,8 +542,16 @@
                                 OBA_BATCH = wipSN.OBA_BATCH,
                                 LOCK_BATCH = wipSN.LOCK_BATCH,
                             };
+                            wipSN.Defects.Add(defect);
                             CurDefects.Add(defect);
                         }
+                    }
+
+                    //浜у搧琚垽鏂笉鑹悗涓嬬嚎锛屽苟浠庡伐鍗曚腑绉婚櫎姝e湪鐢熶骇鐨勬潯鐮�
+                    if (CurDefects.Any() && curNodeSetting.IF_DFT_OFFLINE == "Y")
+                    {
+                        woStatus.Data.ShortMsg = new("浜у搧涓嬬嚎", ShortMessage.Types.Error);
+                        return OfflineIfDefect(action, wipSNs, input.Locale);
                     }
 
                     //宸ュ崟寮�宸�
@@ -509,6 +575,7 @@
                     var _curNodeSetting = curNodeSetting.Clone();
                     var _Batch = CurBatch.Batch.Clone();
 
+                    curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 13 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
                     //鍒濆鍖栧伐姝ュ垪琛�
                     Steps.Clear();
                     var curStep = new WorkStep(IWorkStep.NodeTypes.Node, this)
@@ -632,6 +699,7 @@
                 //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯革紝璇锋鏌ュ伐搴忚妭鐐硅缃�");
                 action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
             }
+            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 13.1 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
             return action;
         }
 
@@ -645,6 +713,7 @@
             var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
             var operInfo = SetOperNodeInfo(CurOperInfo(locale));
             Action endAction = null;
+            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 14 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
 
             //濡傛灉褰撳墠鏉$爜宸茬粡璧板埌娴佺▼缁堢偣鍒欒褰曟潯鐮佸畬宸�
             if (operInfo.IsReachedEndNode)
@@ -664,7 +733,7 @@
                 //鏉$爜瀹屽伐
                 foreach (var wipSN in CurWipSNs)
                 {
-                    wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+                    wipSN.FINISHED_FLAG = "Y";
                     wipSN.NODE_ID = curNode.ID;
                     wipSN.NODE_NAME = curNode.NODE_NAME;
                     wipSN.OPER_CODE = curNode.OPER_CODE;
@@ -684,7 +753,8 @@
                 var _woSns = woSNs.Clone();
                 var _wipSns = CurWipSNs.Clone();
                 var _wipHiss = wipHiss.Clone();
-                var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item) : new();
+                var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item).Clone() : new();
+                var _wipIDs = curPkg?.IsFinished == true ? curPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone() : new();
                 //淇濆瓨鏁版嵁
                 endAction = () =>
                 {
@@ -696,14 +766,14 @@
                     db.Storageable(_wipHiss, UserCode).ExecuteCommand();
                     if (_pkgList.Any())
                     {
-                        var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+                        //var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
                         var wo = _pkgList.First().WORK_ORDER;
                         //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
                         db.Updateable<MES_WIP_HIS>(UserCode)
                             .SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
                             .SetColumns(q => q.INNER_SN == q.CARTON_SN)
                             .SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
-                            .Where(q => q.WORK_ORDER == wo && q.OPER_CODE == "EndNode" && wipIDs.Contains(q.WIP_ID))
+                            .Where(q => q.WORK_ORDER == wo && q.OPER_CODE == "EndNode" && _wipIDs.Contains(q.WIP_ID))
                             .ExecuteCommand();
                     }
                 };
@@ -711,9 +781,9 @@
 
             //淇濆瓨鏁版嵁搴�
             SaveStepsCommitActionToDB(endAction);
-
+            
             //淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
-            CurOperInfo(locale).InputQty += CurWipSNs.Count;
+            operInfo.InputQty += CurWipSNs.Count;
             action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };
             action.Data.OperInfo = operInfo;
             action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
@@ -728,7 +798,76 @@
 
             //閲嶇疆宸ュ簭
             ResetNode();
+            curtime = DateTime.Now; Logger.Console.Info($"{CurSN} : ***** 15 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
+            return action;
+        }
 
+        /// <summary>
+        /// 浜у搧琚垽鏂笉鑹悗涓嬬嚎
+        /// </summary>
+        /// <param name="action"></param>
+        /// <returns></returns>
+        public ApiAction<SubmitOutput> OfflineIfDefect(ApiAction<SubmitOutput> action, List<MES_WIP_DATA> wipSNs, string locale)
+        {
+            var operInfo = SetOperNodeInfo(CurOperInfo(locale));
+            operInfo.CurNode = wipSNs.FirstOrDefault()?.NODE_NAME;
+            operInfo.NextNode = "涓嬬嚎閫�搴�";
+
+            //鏇存柊宸ュ崟鏉$爜鏄庣粏淇℃伅
+            var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
+            foreach (var woSN in woSNs)
+            {
+                woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Offline.GetValue();
+            }
+
+            //鏉$爜涓嬬嚎
+            foreach (var wipSN in wipSNs)
+            {
+                wipSN.STATUS = MES_WIP_DATA.STATUSs.Offline.GetValue();
+                wipSN.UNBIND_FLAG = "Y";
+            }
+
+            var wipHiss = new List<MES_WIP_HIS>();
+            foreach (var wipSN in wipSNs)
+            {
+                var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉$爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]宸ュ簭[{wipSN.NODE_NAME}]鍥犱笉鑹痆{wipSN.Defects.FirstOrDefault()?.DFT_NAME}]涓嬬嚎锛圱ransId锛� {TransID} 锛�");
+                wipSN.History.Add(his);
+                wipHiss.Add(his);
+            }
+
+            //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+            var _woSns = woSNs.Clone();
+            var _wipSns = wipSNs.Clone();
+            var _wipHiss = wipHiss.Clone();
+            var _defect = CurDefects.Clone();
+            //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+            var db = GetCommitDB();
+            //淇濆瓨鏁版嵁搴�
+            var dbTran = db.UseTran(() =>
+            {
+                //鏁版嵁淇濆瓨閫昏緫
+                db.Storageable(_woSns, UserCode).ExecuteCommand();
+                db.Storageable(_wipSns, UserCode).ExecuteCommand();
+                db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+                db.Storageable(_defect, UserCode).ExecuteCommand();
+            });
+            if (!dbTran.IsSuccess)
+            {
+                //鎶涘嚭寮傚父
+                throw dbTran.ErrorException;
+            }
+
+            //浠庡伐鍗曚腑绉婚櫎姝e湪鐢熶骇鐨勬潯鐮�
+            CurBatch.RemoveWipSn(wipSNs, UserCode);
+
+            //淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
+            action.Data.OperInfo = operInfo;
+            action.Data.ShortMsg = new("涓嬬嚎閫�搴�", ShortMessage.Types.Warning);
+            //action.LocaleMsg = new($"宸ュ崟[0]鐨勬潯鐮乕1]鍦ㄥ矖浣峓2]宸ュ簭[3]鍥犱笉鑹痆4]涓嬬嚎锛岀姸鎬乕5]");
+            action.LocaleMsg = new("MES.Transaction.TestNode.OfflineIfDefect", wipSNs.First().WORK_ORDER, CurSN, wipSNs.First().POST_CODE, wipSNs.First().NODE_NAME, wipSNs.First().Defects.FirstOrDefault()?.DFT_NAME, wipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+
+            //閲嶇疆宸ュ簭
+            ResetNode();
             return action;
         }
 
@@ -751,7 +890,7 @@
                         TempPkgAction.Init(this);
 
                         int shipQty = input.Data.ToInt32();
-                        int curQty = CurPkg.Item.TotalQty;
+                        double curQty = CurPkg.Item.TotalQty;
                         int ruleQty = TempPkgAction.PkgRule.GetTotalQty();
                         //鏈夊~鍑鸿揣鏁伴噺鍒欓獙璇佸綋鍓嶅寘瑁呮暟閲忓繀椤荤瓑浜庯紙鍑鸿揣鏁伴噺/鍖呰瑙勫垯鏁伴噺锛夌殑浣欐暟
                         if (shipQty > 0 && curQty != shipQty % ruleQty)
@@ -795,6 +934,52 @@
             return action;
         }
 
+        /// <summary>
+        /// 鎵撳嵃娴嬭瘯鏍囩
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<ApiAction<PackingActionOutput>> TestPrint()
+        {
+            var action = new ApiAction<PackingActionOutput>();
+            try
+            {
+                var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
+                var LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+                var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
+                var printLb =  SetLabelVariables(LabelPV, label, new PackingAction(), CurPkg);
+                action.Data = new PackingActionOutput()
+                {
+                    ExecCode = "PrintTest",
+                    PkgInfo = CurPkg,
+                    PrintLable = printLb,
+                };
+            }
+            catch (Exception ex)
+            {
+                action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭墦鍗版祴璇曟爣绛惧紓甯�");
+            }
+            return action;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏄惁鎵撳嵃瀹㈡埛鏍囩杩樻槸鍏ュ簱鏍囩
+        /// </summary>
+        /// <returns></returns>
+        public async Task<ApiAction<ShipingInfo>> GetIsCustomerLabelAndShipQty()
+        {
+            var action = new ApiAction<ShipingInfo>();
+            try
+            {
+                action.Data = new ShipingInfo() { IsPrintCustomerLabel= IsPrintCustomerLabel,ShipQty = Context["CurShipQty"].ToInt32() };
+            }
+            catch (Exception ex)
+            {
+                action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氳幏鍙栨槸鍚︽墦鍗板鎴锋爣绛捐繕鏄叆搴撴爣绛惧紓甯�");
+            }
+            return action;
+        }
+
         #endregion Functions
 
         /// <summary>

--
Gitblit v1.9.3