Merge branch 'master' into Liudl

bklLiudl

16 小时以前 d3e81088f1afdc01b14af6bdac533116ab0cdb60

 Wms/Wms/Controllers/StatisticalController.cs

@@ -106,12 +106,13 @@
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, 
            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, 
            string startTime, string endTIme,string WareHouseNo,string AreaNo)
        {
            try
            {
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, 
                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)
@@ -137,11 +138,12 @@
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBoxInfo(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)
        {
            try
            {
                List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus);
                List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo,
                    lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus, WareHouseNo, AreaNo);
                return Ok(new { data = boxInfo, code = 0, msg = "获取箱码明细成功" });
            }
            catch (Exception e)