Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 Wms/Wms/Controllers/BllSoController.cs

@@ -72,7 +72,7 @@
        {
            try
            {
                var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.Msg);
                var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);

                return Ok(new { code = 0, count=0, msg = "出库单信息", data = bolls });
            }
@@ -726,7 +726,7 @@
        /// <param name="taskNo">任务号</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult AgainSendSoTask(string taskNo)
        public IActionResult AgainSendSoTask(string taskNo, string Receiver)
        {
            try
            {
@@ -741,7 +741,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _exNoticeSvc.AgainSendSoTask(taskNo, int.Parse(userId),"");
                _exNoticeSvc.AgainSendSoTask(taskNo,Receiver, int.Parse(userId),"");

                return Ok(new { code = 0, msg = "成功下发任务", data = "" });