Merge branch 'csc'

chengsc

2025-06-11 1c2541b283ce6ba855e67c476412dffe2c693480

 Wms/Wms/Controllers/PdaSoController.cs

@@ -81,6 +81,19 @@
            return await _pdaSoSvc.GetSoSkuLotNoListBySo(model.SoNo);
        }


        /// <summary>
        /// 获取物料-批次信息
        /// </summary>
        /// <param name="model">PalletNo:托盘码、SoNo:单据号</param> 
        /// <returns></returns>
        [HttpPost]
        public async Task<List<string>> GetPalletListBySo(PdaSoVm model)
        {
            return await _pdaSoSvc.GetPalletListBySo(model.SoNo,model.SoDetailId);
        }


        /// <summary>
        /// 获取物料-批次信息
        /// </summary>
@@ -161,6 +174,25 @@
            await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
        }

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

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

        /// <summary>
        /// 空托出库
@@ -285,6 +317,18 @@
        {
            await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
        }

        /// <summary>
        /// 车间pda拣货-标签
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task ChejianPick(PdaSoVm model)
        {
            await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
        }

        #endregion

        #region JC23版取样