Merge branch 'csc'

Demo

2024-03-07 48b7b9a800ea38b69706c2eb595b79afcf9d08ac

 Wms/Wms/Controllers/BllAsnController.cs

@@ -78,6 +78,25 @@
            }
        }

        /// <summary>
        /// 获取入库单明细剩余打印数量
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetAsnDetailQtyList(int id)
        {
            try
            {
                var models = _arrivalNoticeSvc.GetAsnDetailQtyList(id);

                return Ok(new { code = 0, msg = "入库单明细信息", data = models });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        [HttpPost]
        public IActionResult GetMaterialsList(GetMaterialsVm model)
        {
@@ -484,7 +503,7 @@
        {
            try
            {
                var models = _PalletBindSvc.GetLocateList("W01",model.RoadwayNo,model.Row,model.Column,model.Layer,model.LocateNo,model.Page,model.Limit, out int count);
                var models = _PalletBindSvc.GetLocateList("W01",model.RoadwayNo,model.Row,model.Column,model.Layer,model.LocateNo,model.BindId,model.Page,model.Limit, out int count);

                return Ok(new { code = 0, count, msg = "获取指定储位信息", data = models });
            }