Merge branch 'master' into djp

test

4 天以前 e9c1fb1cae94c52d2a634f6e21a3a87354b52716

 Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs

@@ -35,7 +35,7 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, 
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
            string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
        {
            string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
                "LotText,ProductionTime,ExpirationTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";