Merge branch 'master' into wxw

Administrator

2024-02-04 719ef250e88b8628ba5cbaeb4973b7c693e01694

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1800,6 +1800,10 @@
                        IsBelt = "0",
                        CreateUser = userId
                    };
                    if (model.SkuQty > pNum)
                    {
                        throw new Exception($"绑定失败，{model.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
                    }
                    // 插入托盘绑定表
                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
                }
@@ -1893,6 +1897,10 @@
                {
                    bind.BitPalletMark = "0";
                }
                if (bind.Qty > pNum)
                {
                    throw new Exception($"绑定失败，{bind.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
                }
                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();

                // 更改入库单明细已组数量
@@ -1922,7 +1930,7 @@
                //添加托盘记录表数据
                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
                Db.Ado.ExecuteCommand(sqlStr);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定1", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);

                Db.CommitTran();
            }