修改问题

DESKTOP-9BNTV8O

2024-12-25 20a792b07666f14494e29e847f1ee5a9979b7567

修改问题

 Wms/WMS.BLL/BllTransServer/RcsServer.cs

@@ -71,7 +71,7 @@
                    case "0"://接料设备叫净桶
                        {
                            //叫桶目标储位地址信息
                            endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
                            endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);
                            if (endLoction == null)
                            {
                                throw new Exception("叫桶设备目标储位信息不存在");
@@ -95,7 +95,7 @@
                    case "1"://混料设备叫料桶（混料）
                        {
                            //叫桶目标储位地址信息
                            endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
                            endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);
                            if (endLoction == null)
                            {
                                throw new Exception("叫桶设备目标储位信息不存在");
@@ -126,7 +126,7 @@
                            if (houseNo == "M04")//除了喷干车间下料口都是2个储位（投料储位、投完料储位）
                            {
                                //叫桶目标储位地址信息
                                endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo);
                                endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);
                            }
                            else
                            {
@@ -249,7 +249,7 @@
                                    SendDate = DateTime.Now,  //发送时间
                                                              //BackDate = DateTime.Now,  //返回时间
                                    StartLocat = item.LocatNo,//起始位置
                                    EndLocat = model.Location,//目标位置
                                    EndLocat = endLoction.LocatNo,//目标位置
                                    PalletNo = item.PalletNo,//托盘码
                                    IsSend = 1,//是否可再次下发
                                    IsCancel = 1,//是否可取消
@@ -265,7 +265,7 @@
                                {
                                    Taskno = taskNo,//任务号
                                    Startport = item.LocatNo,
                                    Endport = model.Location,
                                    Endport = endLoction.LocatNo,
                                    Pallno = item.PalletNo,
                                    Crtype = "1",//叫桶
                                    WareHouseNo = houseNo
@@ -322,7 +322,7 @@
                    SendDate = DateTime.Now,  //发送时间
                    //BackDate = DateTime.Now,  //返回时间
                    StartLocat = pallet.LocatNo,//起始位置
                    EndLocat = model.Location,//目标位置
                    EndLocat = endLoction.LocatNo,//目标位置
                    PalletNo = pallet.PalletNo,//托盘码
                    IsSend = 1,//是否可再次下发
                    IsCancel = 1,//是否可取消
@@ -339,7 +339,7 @@
                {
                    Taskno = taskNo,//任务号
                    Startport = pallet.LocatNo,//起始位置
                    Endport = model.Location,//目标位置
                    Endport = endLoction.LocatNo,//目标位置
                    Pallno = pallet.PalletNo,//桶号
                    Crtype = "1",//叫桶
                    WareHouseNo = houseNo//车间编码
@@ -399,7 +399,7 @@
                    throw new Exception($"该桶有正在执行的任务，PalletNo:{model.PalletNo}");
                }
                //通过设备号查找到所属设备（区域）
                var deviceInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode == model.Location);
                var deviceInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode.Contains(model.Location));
                if (deviceInfo == null)
                {
                    throw new Exception("设备信息不存在");
@@ -549,7 +549,7 @@
                    //IsSuccess = 1, //是否下发成功 0失败 1成功
                    SendDate = DateTime.Now,  //发送时间
                    //BackDate = DateTime.Now,  //返回时间
                    StartLocat = model.Location,//起始位置
                    StartLocat = deviceLocatInfo.LocatNo,//起始位置
                    EndLocat = loction.LocatNo,//目标位置
                    PalletNo = model.PalletNo,//桶号
                    IsSend = 1,//是否可再次下发
@@ -564,7 +564,7 @@
                var task = new TaskDetial
                {
                    Taskno = taskNo,//任务号
                    Startport = model.Location,
                    Startport = deviceLocatInfo.LocatNo,
                    Endport = loction.LocatNo,
                    Pallno = model.PalletNo,
                    Crtype = "0",//入库

 Wms/Wms/appsettings.json

@@ -15,7 +15,8 @@
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
    //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC23-2;User Id=sa;Password=admin2023@;" // SqlServer 库连接字符串
    "ConnectionString": "Server=172.16.105.10;Database=WMS_JC23-2;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=172.16.105.10;Database=WMS_JC23-2;User ID=sa;Password=sql2019;Integrated Security=False;"
    "ConnectionString": "Server=172.16.105.2;Database=WMS_JC23-2;User ID=sa;Password=boxline@2024;Integrated Security=False;"
  },
  "JWTConfig": {
    "Issuer": "WYY", //Token������