Merge branch 'master' into csc

chengsc

2025-05-23 c34986a09e6f98fc8c031bd15f847a71efa18349

Merge branch 'master' into csc

 Pda/View/SoSetting/SampleOut2.html

@@ -818,7 +818,7 @@
                    return;
                }
                if ($('#bar2').val() == "") {
                    layer.msg("请选择出库单", {
                    layer.msg("请选择请验单", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }); return;

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -142,7 +142,11 @@
                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
                        {
                        throw Oops.Bah("新托盘信息不存在或已被使用！");
                        } 
                    }
                    //修改新托盘状态
                    newPalletInfo.Status = "1";
@@ -584,8 +588,12 @@
                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
                        {
                        throw Oops.Bah("新托盘信息不存在或已被使用！");
                    }
                    }
                    //修改新托盘状态
                    newPalletInfo.Status = "1";
                    await Db.Updateable(newPalletInfo).ExecuteCommandAsync();