Merge branch 'yyk'

yuyou_x

2024-02-20 f0bc6eeb8c93f7ce71155123db45beae46ea735c

Merge branch 'yyk'

 Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs

@@ -197,7 +197,7 @@
                                    {
                                        if (demo2.Origin != "WMS")
                                        {
                                            if (notice.Type != "1" || notice.Type != "4")
                                            if (notice.Type != "1" && notice.Type != "4")
                                            {
                                                demo2.ASNNo = null;
                                                demo2.ASNDetailNo = null;

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1250,7 +1250,7 @@

                            #region 库存 
                            var dataStock = Db.Queryable<DataStock>().First(m =>
                                m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo && m.LotNo == noticeDetail.LotNo);
                                m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo && m.LotNo == item.LotNo);
                            if (dataStock != null)
                            {
                                dataStock.Qty += item.Qty;