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

Rodney Chen

2024-09-24 4c31b73d05c2518723a4263c02344bfce3afc210

Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

 Tiger.Business.MES/Transaction/Position.cs

@@ -64,7 +64,7 @@
        public WorkStep CurStep { get; set; }
        public List<WorkStep> NextSteps { get; set; } = new();
        public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
        public bool IsFinishAllSteps => !Steps.Any() || !Steps.Any(q => !q.IsFinished);
        public bool IsFinishAllSteps => Steps.Any() && !Steps.Any(q => !q.IsFinished);
        //public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
        private DbClient CommitDB;
        /// <summary>
@@ -364,6 +364,11 @@
                    }
                    return result;
                }
                //工序被重置
                else if(Steps.IsNullOrEmpty())
                {
                    return canBegin;
                }
            }

            //没有可以直接开始的后续工步，根据后续工步返回ApiAction

 Tiger.Business.WMS/Transaction/OtherInLocation.cs

@@ -168,17 +168,28 @@
                            res.Data.History.Add(his);
                            res.Data.Packages.Add(ItemPkgs);
                        }
                        else if (res.Data.Items.Count == 1)
                        {
                            res.Data.Items.First().QTY = res.Data.Barcode.Qty.ToDecimal();
                            res.Data.Items.First().ERP_WH = WarehouseCode;
                            res.Data.Items.First().AUTH_ORG = input.AuthOption.CurOrg;

                            res.Data.Packages.First().QTY = res.Data.Barcode.Qty.ToDecimal();
                            res.Data.Packages.First().ERP_WH = WarehouseCode;
                            res.Data.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        //如果扫描外箱的不能更新数量 2024-09-23 Ben Lin
                        else
                        {
                            foreach (var item in res.Data.Items)
                            {
                                item.QTY = res.Data.Barcode.Qty.ToDecimal();
                                //item.QTY = res.Data.Barcode.Qty.ToDecimal();
                                item.ERP_WH = WarehouseCode;
                                item.AUTH_ORG = input.AuthOption.CurOrg;
                            }
                            foreach (var item in res.Data.Packages)
                            {
                                item.QTY = res.Data.Barcode.Qty.ToDecimal();
                                //item.QTY = res.Data.Barcode.Qty.ToDecimal();
                                item.ERP_WH = WarehouseCode;
                                item.AUTH_ORG = input.AuthOption.CurOrg;
                            }