Merge branch 'csc'

chengsc

2025-06-11 1c2541b283ce6ba855e67c476412dffe2c693480

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -194,6 +194,26 @@
        }

        /// <summary>
        /// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
        /// </summary>
        /// <param name="boxNo">BoxNo:箱号</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetWmsBoxInfos(string boxNo)
        {
            try
            {
                var models = _PdaAsnSvc.GetWmsBoxInfos(boxNo);

                return Ok(new { code = 0, msg = "标签箱码信息", data = models });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 判断托盘是否可用  公用方法
        /// </summary>
        /// <param name="model">PalletNo：托盘条码</param>
@@ -244,6 +264,40 @@
        }


        /// <summary>
        /// 绑定托盘
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost] 
        public IActionResult ChejianIn(PdaPalletBindVm model)
        {
            try
            {
                 
                if (_userManager.UserId ==0)
                {
                    throw new Exception("未获取到用户信息");
                }

                if (model.TableType == 0)
                {
                    _PdaAsnSvc.ChejianIn(model.PalletNo,model.BoxNo,model.SkuQty,model.AreaNo, _userManager.UserId);
                }
                else if (model.TableType == 1)
                {
                    _PdaAsnSvc.ChejianQtyIn(model.PalletNo,model.SkuNo,model.LotNo,model.SkuQty,model.AreaNo, _userManager.UserId);
                }

                return Ok(new { code = 0, msg = "绑定成功!" });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }


        //---------------------------------------------申请入库页面----------------------------------------------------------------------