zhaowc
2025-01-17 533df0275a3090951af5d3bf8f5fdbeea2ce44b8
WCS出库完成接口修改,PDA的AGV转运调度小车修改
4个文件已修改
26 ■■■■ 已修改文件
Pda/View/SoSetting/palletOut.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/DownApiController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/SoSetting/palletOut.html
@@ -74,6 +74,8 @@
                                    <option value="044">044</option>
                                    <option value="051">051</option>
                                    <option value="059">059</option>
                                    <option value="440">440</option>
                                    <option value="443">443</option>
                                </select>
                                <!-- <img src="/assets/down_arraw.png" > -->
                            </div>
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -799,10 +799,10 @@
                    {
                        throw new Exception("托盘储位信息不存在,请检查!");
                    }
                    if (models.WareHouseNo != "W02")
                    {
                        throw new Exception("该托盘未在平库内,请检查!");
                    }
                    //if (models.WareHouseNo != "W02")
                    //{
                    //    throw new Exception("该托盘未在平库内,请检查!");
                    //}
                    var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
                    if (storageLocat == null)
                    {
@@ -1351,9 +1351,7 @@
                
                var IsTrue = false;
                while (IsTrue == true)
                {
                    // 正式运行程序放开
                    string str = "";
                    var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
@@ -1375,7 +1373,7 @@
                            //更改任务的发送返回时间//
                            new TaskServer().EditTaskIssueOk(list2, time1, time2);
                            str += "下发成功";
                            IsTrue = true;
                            //IsTrue = true;
                        }
                        if (agvModel.Code == "1")
                        {
@@ -1387,7 +1385,7 @@
                    {
                        throw new Exception(ex.Message);
                    }
                }
                #endregion
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2251,8 +2251,8 @@
                var outLine = "";
                if (userId == 0)
                {
                    TtaskNo = taskNo.Substring(0, taskNo.Length - 4);
                    outLine = taskNo.Substring(taskNo.Length - 4, 3);
                    TtaskNo = taskNo.Substring(0, taskNo.Length - 3);
                    outLine = taskNo.Substring(taskNo.Length - 3, 3);
                }
                //当前任务信息
                var task = Db.Queryable<LogTask>().First(m => m.TaskNo == TtaskNo && m.IsDel == "0");
Wms/Wms/Controllers/DownApiController.cs
@@ -364,8 +364,8 @@
                }
                //接收时间
                var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 判断单据类型入出移
                switch (orderType)
                //var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 判断单据类型入出移
                switch (model.TaskType)
                {
                    case "0"://入库完成任务
                        if (model.TaskType == "0")//0:入库 1:出库 2:移库