Merge branch 'wxw'

Administrator

2024-03-11 b478031d19c13092dc5f86e6d4f7fc114ea9a85d

 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs

@@ -264,7 +264,7 @@
                  .AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
                  .AndIF(!string.IsNullOrWhiteSpace(model.InspectMark), it => it.InspectMark == model.InspectMark.Trim())
                  .AndIF(!string.IsNullOrWhiteSpace(model.BitBoxMark), it => it.BitBoxMark == model.BitBoxMark.Trim())
                  .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => it.Origin == model.Origin.Trim())
                  .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => model.Origin.Trim().Contains(it.Origin))
                  .And(m => m.SkuNo != "100099" && m.IsDel == "0" && m.Status == "0")
                  .ToExpression();//注意 这一句 不能少
                var total = 0;
@@ -605,7 +605,7 @@
                    zNum = Convert.ToInt32(pack.L1Num);
                }

                if (packLevel <= 1)//包装等级小于1，按照1级标签打印
                if (packLevel < 1)//包装等级小于1，按照1级标签打印
                {
                    throw new Exception("包装信息有误，小于一级");
                }
@@ -614,9 +614,9 @@
                var modelList = new List<BllBoxInfo>();

                var addLotNo = "";
                if (arriveQty < 0)
                if (arriveQty <= 0)
                {
                    throw new Exception("到货数量不能小于0!");
                    throw new Exception("到货数量不能小于等于0!");
                }
                Db.BeginTran();
                if (packLevel == 1)