Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

bklLiudl

2 天以前 1459bff44fdebf9d909a1ce1623ea182171909fe

Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

 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;
                    }