Merge branch 'csc'

chengsc

2025-01-17 fee75dfd690506efb6bb67e1a91a545efb527c1a

 Wms/Wms/Controllers/DownApiController.cs

@@ -364,14 +364,14 @@
                }
                //接收时间
                var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 判断单据类型入出移
                switch (model.TaskType)
                var orderType = _taskSvc.GetTaskOrderType(model.TaskNo,model.TaskType);// 判断单据类型入出移
                switch (orderType)
                {
                    case "0"://入库完成任务
                        if (model.TaskType == "0")//0：入库 1：出库 2：移库
                        {
                            _asnPalletBindSvc.ArrivalSuccess(model.TaskNo, 0);
                            return Ok(new WcsModel { StatusCode = 0, Msg = "入库完成" });
                            return Ok(new WcsModel { StatusCode = 0, Msg = "入库完成" });                                               
                        }
                        break;
                    case "1"://出库完成任务
@@ -774,7 +774,7 @@
                var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

                //测试接口用
                var orderType = _taskSvc.GetTaskOrderType(model.TaskCode);// 判断单据类型入出移
                var orderType = _taskSvc.GetTaskOrderType(model.TaskCode,"0");// 判断单据类型入出移

                var taskType = _taskSvc.GetTaskType(model.TaskCode);//根据任务号获取任务类型
                switch (orderType)