bklLiudl
2024-03-09 85f6fe8f419a7dc04ae2e2e8d2314162bd0cfb6e
修复bug
2个文件已修改
28 ■■■■ 已修改文件
HTML/views/ASNSetting/PalletBind.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/PalletBind.html
@@ -929,7 +929,12 @@
                        colsJson2 = DetailColsArr
                    }
                    var param = {
                        BindNo: parseInt(BindNo)
                        BindNo: parseInt(BindNo),
                        ASNNo: $("#ASNNo").val(),
                        PalletNo: $("#PalletNo").val(),
                        SkuNo: $("#SkuNo").val(),
                        SkuName: $("#SkuName").val(),
                        LotNo: $("#LotNo").val(),
                    };
                    table.render({
                        id: 'BoxInfo',
@@ -1042,8 +1047,9 @@
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () {
                                        bindPalletBind();
                                        bindBoxInfo(quanSkuNo);
                                    });
                                } else { //不成功
                                    layer.msg(res.msg, {
                                        icon: 2,
@@ -1138,7 +1144,7 @@
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () {
                                        bindPalletBind();
                                        bindBoxInfo("0");
                                        bindBoxInfo(quanSkuNo);
                                    });
                                } else { //不成功
                                    layer.msg(res.msg, {
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -114,8 +114,19 @@
        {
            try
            {
                Expression<Func<BllBoxInfo, bool>> item1 = Expressionable.Create<BllBoxInfo>()
                  .AndIF(!string.IsNullOrWhiteSpace(model.ASNNo), it => it.ASNNo.Contains(model.ASNNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.PalletNo), it => it.PalletNo.Contains(model.PalletNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
                  .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())),it=>it.BindNo == model.BindNo)
                  .And(m => m.IsDel == "0")
                  .ToExpression();
                var total = 0;
                var data = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == model.BindNo)
                DbHelper<BllBoxInfo> helper = new DbHelper<BllBoxInfo>(Db);
                var data = helper.GetAllWhereAsync(item1).Where(m => m.IsDel == "0")
                    .LeftJoin<BllPalletBind>((a, b) => a.BindNo == b.Id)
                    .GroupBy((a, b) => new
                    {
@@ -380,7 +391,8 @@
                Db.Updateable(boxInfos).ExecuteCommand();
                //修改托盘绑定信息
                bind.Qty -= qty;
                bind.Qty -= qty;                    // 数量变更
                bind.BitPalletMark = "1";           // 零托标记变更
                if (bind.Qty == 0)
                {