Revert "修改问题"

chengsc

2024-10-13 332b3bd991a4c973e23793f473b9617f008def04

Revert "修改问题"

This reverts commit 4b2a864dfba4038feb6a3887724f6446f72a83a3.

 HTML/views/ASNSetting/RequestLocation.html

@@ -33,14 +33,6 @@
                        <option value=""></option>
                        <option value="R01">1巷道</option>
                        <option value="R02">2巷道</option>
                        <option value="R03">3巷道</option>
                        <option value="R04">4巷道</option>
                        <option value="R05">5巷道</option>
                        <option value="R06">6巷道</option>
                        <option value="R07">7巷道</option>
                        <option value="R08">8巷道</option>
                        <option value="R09">9巷道</option>
                        <option value="R10">10巷道</option>
                    </select>
                </div>
            </div>

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -373,49 +373,48 @@
                    rowDetailCount = Db.Ado.ExecuteCommand(sqlDetailStr);
                }
                Db.Ado.CommitTran();
                //if (rowCount > 0 && rowDetailCount > 0)  判断需要添加上单据类型
                //{
                //    new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", model.ASNNo, "添加", $"添加了单据号为{model.ASNNo}的单据信息", Convert.ToInt32(model.CreateUser));
                if (rowCount > 0 && rowDetailCount > 0)
                {
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", model.ASNNo, "添加", $"添加了单据号为{model.ASNNo}的单据信息", Convert.ToInt32(model.CreateUser));

                //    if (addOder.Count > 0)
                //    {
                //        // 正式运行程序放开
                //        var jsonData = JsonConvert.SerializeObject(addOder);
                //        string response = "";
                    if (addOder.Count > 0)
                    {
                        // 正式运行程序放开
                        var jsonData = JsonConvert.SerializeObject(addOder);
                        string response = "";

                //        try
                //        {
                //            var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                //            //给WCS下发入库单信息
                //            response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                        try
                        {
                            var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            //给WCS下发入库单信息
                            response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");

                //            //////解析返回数据 
                //            var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                //            if (wcsModel.StatusCode == 0)
                //            {
                            //////解析返回数据 
                            var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                            if (wcsModel.StatusCode == 0)
                            {
                                
                //            }
                //            if (wcsModel.StatusCode == -1)
                //            {
                            }
                            if (wcsModel.StatusCode == -1)
                            {

                //            }
                //        }
                //        catch (Exception ex)
                //        {
                //            throw new Exception(ex.Message);
                //        }
                //    }
                            }
                        }
                        catch (Exception ex)
                        {
                            throw new Exception(ex.Message);
                        }
                    }
                    return strMessage;
                //}
                //else
                //{
                //    Db.Ado.RollbackTran();
                //    return "-2:添加失败数据回滚!";
                //}
                }
                else
                {
                    Db.Ado.RollbackTran();
                    return "-2:添加失败数据回滚!";
                }
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                throw new Exception(ex.Message);
            }
        }

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -868,8 +868,7 @@
                {
                    throw new Exception("请选择出库单号！");
                }
                //var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
                var palletNoList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
                var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
                return palletNoList;
            }
            catch (Exception ex)
@@ -1238,41 +1237,41 @@

                

                //var IsTrue = false;
                //while (IsTrue == true)
                //{
                //    // 正式运行程序放开
                //    string str = "";
                //    var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
                //    var jsonData = JsonConvert.SerializeObject(agvTaskList);
                //    string response = "";
                var IsTrue = false;
                while (IsTrue == true)
                {
                    // 正式运行程序放开
                    string str = "";
                    var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
                    var jsonData = JsonConvert.SerializeObject(agvTaskList);
                    string response = "";

                //    try
                //    {
                //        var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                //        response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运取货命令", "AGV");
                //        var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    try
                    {
                        var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                        response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运取货命令", "AGV");
                        var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

                //        //////解析返回数据 
                //        var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
                //        if (agvModel.Code == "0")
                //        {
                //            //更改任务的发送返回时间//
                //            new TaskServer().EditTaskIssueOk(list2, time1, time2);
                //            str += "下发成功";
                //            IsTrue = true;
                //        }
                //        if (agvModel.Code == "1")
                //        {
                //            new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
                //            throw new Exception(agvModel.Message);
                //        }
                //    }
                //    catch (Exception ex)
                //    {
                //        throw new Exception(ex.Message);
                //    }
                //}
                        //////解析返回数据 
                        var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
                        if (agvModel.Code == "0")
                        {
                            //更改任务的发送返回时间//
                            new TaskServer().EditTaskIssueOk(list2, time1, time2);
                            str += "下发成功";
                            IsTrue = true;
                        }
                        if (agvModel.Code == "1")
                        {
                            new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
                            throw new Exception(agvModel.Message);
                        }
                    }
                    catch (Exception ex)
                    {
                        throw new Exception(ex.Message);
                    }
                }

                #endregion