Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

6 天以前 756e6c531d49a4565e47949120cb33bae431566e

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -65,7 +65,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
@@ -83,7 +83,7 @@
                if (CurInvItem.IsNullOrEmpty())
                {
                    //解析条码
                    Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
                    Result<IInventory> result = GetInventory(input.SN, input.AuthOption, true);
                   if (!result.IsSuccessed)
                   {
                       action.IsSuccessed = false;
@@ -111,11 +111,7 @@

                    if (inv.Items.Count == 0)
                    {
                        List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
                        WMS_ITEM Item;
                        WMS_ITEM_PKG ItemPkgs;

                        Item = new()
                        var newItem = new WMS_ITEM()
                        {
                            SN = inv.Barcode.SN,
                            ITEM_CODE = inv.Barcode.ItemCode,
@@ -127,9 +123,8 @@
                            UNIT = inv.Barcode.Unit,
                        };

                        WMS_ITEM_HIS his = new(Item, $"标准上架入库");
                        ItemHistorys.Add(his);
                        ItemPkgs = new()
                        WMS_ITEM_HIS his = new(newItem, $"标准上架入库");
                        var newPkg = new WMS_ITEM_PKG()
                        {
                            SN = inv.Barcode.SN,
                            AUTH_ORG = input.AuthOption.CurOrg,
@@ -141,19 +136,19 @@

                        var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                        //扩展表不存在时新建
                        foreach (var item in noExt)
                        foreach (var ext in noExt)
                        {
                            inv.ItemsExt.Add(new()
                            {
                                SN = item.SN,
                                SN = ext.SN,
                                META_SN = inv.Barcode.MetaSn,
                                QR_CODE = inv.Barcode.MetaSn
                            });
                        }

                        inv.Items.Add(Item);
                        inv.Items.Add(newItem);
                        inv.History.Add(his);
                        inv.Packages.Add(ItemPkgs);
                        inv.Packages.Add(newPkg);
                    }
                    //雅达不从条码上更新数量
                    //else if (inv.Items.Count == 1)
@@ -190,7 +185,7 @@
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Code);
                            item.QTY = qty.WhQty;
                            item.SUPP_LOTNO = qty.Segment7;
                            item.SUPP_LOTNO = CurInvItem.Barcode.LotNo;
                        }
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
@@ -278,7 +273,7 @@
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
                    ResetScan();
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

@@ -288,12 +283,17 @@
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                }
                foreach (var item in CurInvItem.Packages)
                {
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                }
                Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = putonResult.LocaleMsg;
                    ResetScan();
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

@@ -303,7 +303,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{input.SN}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
@@ -394,7 +394,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描货架/储位[{0}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
            }
@@ -405,11 +405,16 @@
        /// 完成所有处理后使用事务保存数据
        /// </summary>
        /// <param name="action"></param>
        /// <param name="locale"></param>
        /// <param name="doAfterSave"></param>
        /// <returns></returns>
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
        {
            //保存数据库
            SaveCommitListToDB();

            //保存数据成功后执行
            doAfterSave?.Invoke();

            // 返回数据
            action.Data.Data = new DefaultInStoreOutput
@@ -437,11 +442,11 @@
        #endregion

        /// <summary>
        /// 重置当前操作，有需要则重写此方法
        /// 重置事务数据，有需要则重写此方法
        /// </summary>
        public override void ResetScan()
        public override void ResetTrans()
        {
            base.ResetScan();
            base.ResetTrans();
            ResetScanInfo();
            CurScanShelf = null;
        }