wxw
4 小时以前 40ed954d9d351005b7e353de31e51ababb90b4ce
托盘明细增加到期日期
2个文件已修改
9 ■■■■■ 已修改文件
HTML/views/StatisticalReport/BoxInfor.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/BoxInfor.html
@@ -407,6 +407,7 @@
                { field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus', width: 100, },
                { field: 'ProductionTime', title: '生产日期', align: 'center', templet: '#templetProductionTime' },
                { field: 'ExpirationTime', title: '过期日期', align: 'center', templet: '#templetExpirationTime' },
                { field: 'OwnerNo', title: '货主编码', align: 'center', width: 100, },
                { field: 'OwnerName', title: '货主名称', align: 'center', width: 100, },
                { field: 'SupplierNo', title: '供应商编码', align: 'center', width: 100, },
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -325,6 +325,14 @@
                            CreateUser = 0,
                            CreateTime = comTime
                        };
                        if (!string.IsNullOrEmpty(detail.Lot1))
                        {
                            sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//生产日期
                        }
                        if (!string.IsNullOrEmpty(detail.Lot2))
                        {
                            sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//到期日期
                        }
                        var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
                        if (palletData != null)
                        {