From 8347f2fbddbd25369359dcb2da1233ac48a19fdc Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期一, 19 七月 2021 15:29:46 +0800
Subject: [PATCH] 迁移至svn

---
 HH.WMS.BLL/Pda/ZCBLL.cs |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/HH.WMS.BLL/Pda/ZCBLL.cs b/HH.WMS.BLL/Pda/ZCBLL.cs
index afe1ceb..ec68809 100644
--- a/HH.WMS.BLL/Pda/ZCBLL.cs
+++ b/HH.WMS.BLL/Pda/ZCBLL.cs
@@ -245,6 +245,12 @@
             List<OperateResult> ors = new List<OperateResult>();
             if (transportReqs.Any())
             {
+                var xbqBitStr = JsonHelper.GetValue("xbqBit");
+                if (string.IsNullOrEmpty(xbqBitStr))
+                    throw new Exception("鏈壘鍒伴厤缃細xbqBit");
+
+                var xbqBits = JsonConvert.DeserializeObject<List<XBQBitDto>>(xbqBitStr);
+
                 foreach (var req in transportReqs)
                 {
                     string startBit = req.Location_From;
@@ -286,7 +292,20 @@
                         }
                         else if (section == TaskSectionConstants.BCP_KTCK)
                         {
+                            // 鍑哄簱
                             direction = Constants.Out;
+                            // 鍏ュ簱浠诲姟鐨勮捣鐐规槸婊℃墭浣嶏紝鏌ユ壘鍏剁浉閭荤殑绌烘墭浣�+                            var ktBit = xbqBits.FirstOrDefault(bit => bit.mtBit == inModel.startBit);
+                            if (ktBit == null)
+                            {
+                                Log.Error("鏌ユ壘绾胯竟鍖虹┖鎵樼偣澶辫触", "锛岀┖鎵樼偣=null锛屽叆搴撲换鍔$殑绾胯竟鍖烘弧鎵樼偣锛� + inModel.startBit);
+                                ors.Add(OperateResult.Error("鏌ユ壘绾胯竟鍖虹┖鎵樼偣澶辫触" + "锛岀┖鎵樼偣=null锛屽叆搴撲换鍔$殑绾胯竟鍖烘弧鎵樼偣锛� + inModel.startBit, req));
+                                continue;
+                            }
+                            // 淇敼鍑哄簱浠诲姟鐨勭粓鐐逛负绌烘墭浣�+                            outModel.endBit = ktBit.ktBit;
+                            outModel.startBit = "";
+                            outModel.remark += "锛屽崐鎴愬搧绌烘墭鍑哄簱";
                         }
                         else if (section == TaskSectionConstants.BCP_MTRK)
                         {
@@ -334,6 +353,12 @@
                                 {
                                     Log.Info("鍏ヤ綔涓氬尯寮�锛屼紶鍙傦細", JsonConvert.SerializeObject(inWorkAreaEntitys));
                                     externalRes = BLLCreator.Create<WmsApiBaseBLL>().InWorkArea(inWorkAreaEntitys);
+                                    if (!externalRes.success)
+                                    {
+                                        Log.Error("鍏ヤ綔涓氬尯澶辫触锛屼紶鍙傦細", JsonConvert.SerializeObject(inWorkAreaEntitys) + externalRes.errMsg);
+                                        ors.Add(OperateResult.Error("鍏ヤ綔涓氬尯澶辫触锛� + externalRes.errMsg, req));
+                                        continue;
+                                    }
                                     taskNo = inModel.taskNo;
                                 }
                                 catch (Exception ex)
@@ -353,6 +378,12 @@
                                 {
                                     Log.Info("鍑轰綔涓氬尯寮�锛屼紶鍙傦細", JsonConvert.SerializeObject(outWorkAreaEntitys));
                                     externalRes = BLLCreator.Create<WmsApiBaseBLL>().OutWorkArea(outWorkAreaEntitys);
+                                    if (!externalRes.success)
+                                    {
+                                        Log.Error("鍑轰綔涓氬尯澶辫触锛屼紶鍙傦細", JsonConvert.SerializeObject(outWorkAreaEntitys) + externalRes.errMsg);
+                                        ors.Add(OperateResult.Error("鍑轰綔涓氬尯澶辫触锛� + externalRes.errMsg, req));
+                                        continue;
+                                    }
                                     taskNo = outModel.taskNo;
                                 }
                                 catch (Exception ex)

--
Gitblit v1.9.1