完善物料标签的补打标签和合并标签功能

wxw

7 天以前 bbeadfe2c0dd55405b83641751ad88874d0716f6

 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs

@@ -1769,7 +1769,11 @@
                }
                //标签信息
                var boxList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
                if (boxList.Count != 1)
                if (boxList.Count < 1)
                {
                    throw new Exception("该箱码信息错误，未查到此箱码信息");
                }
                if (boxList.Count > 1)
                {
                    throw new Exception("该箱码信息错误，存在多个此箱码信息");
                }
@@ -1833,14 +1837,14 @@
                    StoreTime = boxInfo.StoreTime,
                    ExpirationTime = boxInfo.ExpirationTime,

                    Origin = "WMS",
                    Origin = "WMS生成",
                    CreateUser = userId,
                    CreateTime = DateTime.Now,
                };
                Db.Insertable(boxModel).ExecuteCommand();

                //添加操作日志
                new OperationASNServer().AddLogOperationAsn("入库作业", "物料标签", boxNo, "编辑", $"拆分了箱码{boxInfo}数量{chaiQty}到新箱码{boxNoNew}", userId);
                new OperationASNServer().AddLogOperationAsn("入库作业", "物料标签", boxNo, "编辑", $"拆分了箱码{boxNo}数量{chaiQty}到新箱码{boxNoNew}", userId);
                //提交事务
                Db.CommitTran();
            }   
@@ -1867,7 +1871,11 @@
                }
                //标签信息
                var boxList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
                if (boxList.Count != 1)
                if (boxList.Count < 1)
                {
                    throw new Exception($"{boxNo}该箱码信息错误，未查到此箱码信息");
                }
                if (boxList.Count > 1)
                {
                    throw new Exception($"{boxNo}该箱码信息错误，存在多个此箱码信息");
                }
@@ -1877,7 +1885,11 @@
                    throw new Exception($"{boxNo}该箱码不是未组托状态，不允许合并！");
                }
                var boxList2 = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo2).ToList();
                if (boxList2.Count != 1)
                if (boxList2.Count < 1)
                {
                    throw new Exception($"{boxNo2}该箱码信息错误，未查到此箱码信息");
                }
                if (boxList2.Count > 1)
                {
                    throw new Exception($"{boxNo2}该箱码信息错误，存在多个此箱码信息");
                }
@@ -1888,11 +1900,11 @@
                }
                if (boxInfo.SkuNo != boxInfo2.SkuNo || boxInfo.LotNo != boxInfo2.LotNo)
                {
                    throw new Exception($"两个箱码不是物料批次信息不一致，不允许合并！");
                    throw new Exception($"两个箱码物料批次信息不一致，不允许合并！");
                }
                if (boxInfo.ASNNo != boxInfo2.ASNNo || boxInfo.ASNDetailNo != boxInfo2.ASNDetailNo)
                {
                    throw new Exception($"两个箱码不是所属入库单信息不一致，不允许合并！");
                    throw new Exception($"两个箱码所属入库单信息不一致，不允许合并！");
                }
                if (boxInfo.Qty + boxInfo2.Qty > boxInfo.FullQty)
                {