Merge branch 'wxw'

wxw

2 天以前 61c3051ac62f6bc15c885403a0b9bd53f0d1b7e0

Merge branch 'wxw'

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -2235,8 +2235,8 @@
                    if (boxNoList.Count > 0)
                    {
                        data.BoxNoList = boxNoList;
                        data.Date1 = item.ProductionTime.ToString();
                        data.Date2 = item.ExpirationTime.ToString();
                        data.Date1 = item.ProductionTime == null ? "" : Convert.ToDateTime(item.ProductionTime).ToString("yyyy-MM-dd");
                        data.Date2 = item.ExpirationTime == null ? "" : Convert.ToDateTime(item.ExpirationTime).ToString("yyyy-MM-dd");

                        break;
                    }