| HTML/views/HouseWithinSetting/CRLogTask.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/Login.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/WareHouseSetting/FlatLibraryLegend.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/WareHouseSetting/Pallets.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HTML/views/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/BllTransServer/RcsServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/SysServer/PalletsServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.Entity/SysEntity/SysStorageArea.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/Wms/appsettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HTML/views/HouseWithinSetting/CRLogTask.html
@@ -60,13 +60,7 @@ class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">关键信息</label> <div class="layui-input-inline"> <input type="text" id="Msg" name="Msg" placeholder="关键信息" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 60px;">任务类型</label> <div class="layui-input-inline"> @@ -330,11 +324,6 @@ align: 'center', templet: '#StatusButton', }, { field: 'Msg', title: '关键信息', width: 210, align: 'center', }, { field: 'Information', title: '异常信息', minWidth: 100, @@ -412,7 +401,6 @@ Type: $("#Type").val(), Status: $("#Status").val(), PalletNo: $("#PalletNo").val(), Msg: $("#Msg").val(), IsSuccess: parseInt($("#IsSuccess").val()), }; tableIns=table.render({ HTML/views/Login.html
@@ -30,7 +30,7 @@ </ul> --> </div> <div class="elight-login-box animated fadeInRight"> <div class="elight-login-header">博柯莱·AGV转运系统</div> <div class="elight-login-header">博柯莱·料斗搬运系统</div> <div class="elight-login-body"> <form class="layui-form"> <div class="layui-form-item"> HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -528,6 +528,7 @@ <p>湿法制粒3</p> <div id="C16" class="flesDiv" style="height:85%; justify-content: space-around;"> <button id="C1600101" value="C1700101" class="btnShow " ></button> <button id="C1600201" value="C1700201" class="btnShow " ></button> </div> </div> </div> @@ -698,12 +699,12 @@ <tr> <td class="btnShow"></td> <td><button id="C4300202" value="C4300202" class="btnShow " ></button></td> <td><button id="C4300302" value="C4300302" class="btnShow " ></button></td> <!-- <td><button id="C4300302" value="C4300302" class="btnShow " ></button></td> --> </tr> <tr> <td><button id="C4300101" value="C4300101" class="btnShow " ></button></td> <td><button id="C4300201" value="C4300201" class="btnShow " ></button></td> <td><button id="C4300301" value="C4300301" class="btnShow " ></button></td> <!-- <td><button id="C4300301" value="C4300301" class="btnShow " ></button></td> --> </tr> </table> @@ -714,15 +715,15 @@ <p>投料区2</p> <div id="C44" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C4400102" value="C4400102" class="btnShow " ></button></td> <td><button id="C4400202" value="C4400202" class="btnShow " ></button></td> <td><button id="C4400302" value="C4400302" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C4400101" value="C4400201" class="btnShow " ></button></td> <td><button id="C4400101" value="C4400101" class="btnShow " ></button></td> <td><button id="C4400201" value="C4400201" class="btnShow " ></button></td> <td><button id="C4400301" value="C4400301" class="btnShow " ></button></td> <!-- <td><button id="C4400301" value="C4400301" class="btnShow " ></button></td> --> </tr> </table> @@ -733,15 +734,15 @@ <p>投料区3</p> <div id="C45" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C4500102" value="C4500102" class="btnShow " ></button></td> <td><button id="C4500202" value="C4500202" class="btnShow " ></button></td> <td><button id="C4500302" value="C4500302" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C4500101" value="C4500101" class="btnShow " ></button></td> <td><button id="C4500201" value="C4500201" class="btnShow " ></button></td> <td><button id="C4500301" value="C4500301" class="btnShow " ></button></td> <!-- <td><button id="C4500301" value="C4500301" class="btnShow " ></button></td> --> </tr> </table> @@ -752,15 +753,15 @@ <p>投料区4</p> <div id="C46" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C4600102" value="C4600102" class="btnShow " ></button></td> <td><button id="C4600202" value="C4600202" class="btnShow " ></button></td> <td><button id="C4600302" value="C4600302" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C4600101" value="C4600101" class="btnShow " ></button></td> <td><button id="C4600201" value="C4600201" class="btnShow " ></button></td> <td><button id="C4600301" value="C4600301" class="btnShow " ></button></td> <!-- <td><button id="C4600301" value="C4600301" class="btnShow " ></button></td> --> </tr> </table> @@ -771,7 +772,7 @@ <p>投料区5</p> <div id="C47" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C4700104" value="C4700104" class="btnShow " ></button></td> <td><button id="C4700204" value="C4700204" class="btnShow " ></button></td> </tr> @@ -782,7 +783,7 @@ <tr> <td><button id="C4700102" value="C4700102" class="btnShow " ></button></td> <td><button id="C4700202" value="C4700202" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C4700101" value="C4700101" class="btnShow " ></button></td> <td><button id="C4700201" value="C4700201" class="btnShow " ></button></td> @@ -798,12 +799,12 @@ <tr> <td><button id="C4800102" value="C4800102" class="btnShow " ></button></td> <td><button id="C4800202" value="C4800202" class="btnShow " ></button></td> <td><button id="C4800302" value="C4800302" class="btnShow " ></button></td> <!-- <td><button id="C4800302" value="C4800302" class="btnShow " ></button></td> --> </tr> <tr> <td><button id="C4800101" value="C4800101" class="btnShow " ></button></td> <td><button id="C4800201" value="C4800201" class="btnShow " ></button></td> <td><button id="C4800301" value="C4800301" class="btnShow " ></button></td> <!-- <td><button id="C4800301" value="C4800301" class="btnShow " ></button></td> --> </tr> </table> @@ -817,12 +818,12 @@ <tr> <td><button id="C4900102" value="C4900102" class="btnShow " ></button></td> <td><button id="C4900202" value="C4900202" class="btnShow " ></button></td> <td><button id="C4900302" value="C4900302" class="btnShow " ></button></td> <!-- <td><button id="C4900302" value="C4900302" class="btnShow " ></button></td> --> </tr> <tr> <td><button id="C4900101" value="C4900101" class="btnShow " ></button></td> <td><button id="C4900201" value="C4900201" class="btnShow " ></button></td> <td><button id="C4900301" value="C4900301" class="btnShow " ></button></td> <!-- <td><button id="C4900301" value="C4900301" class="btnShow " ></button></td> --> </tr> </table> @@ -836,12 +837,12 @@ <tr> <td><button id="C5000102" value="C5000102" class="btnShow " ></button></td> <td><button id="C5000202" value="C5000202" class="btnShow " ></button></td> <td><button id="C5000302" value="C5000302" class="btnShow " ></button></td> <!-- <td><button id="C5000302" value="C5000302" class="btnShow " ></button></td> --> </tr> <tr> <td><button id="C5000101" value="C5000101" class="btnShow " ></button></td> <td><button id="C5000201" value="C5000201" class="btnShow " ></button></td> <td><button id="C5000301" value="C5000301" class="btnShow " ></button></td> <!-- <td><button id="C5000301" value="C5000301" class="btnShow " ></button></td> --> </tr> </table> @@ -852,14 +853,14 @@ <p>投料区9</p> <div id="C51" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C5100102" value="C5100102" class="btnShow " ></button></td> <td><button id="C5100202" value="C5100202" class="btnShow " ></button></td> <td><button id="C5100302" value="C5100302" class="btnShow " ></button></td> <td><button id="C5100402" value="C5100402" class="btnShow " ></button></td> <td><button id="C5100502" value="C5100502" class="btnShow " ></button></td> <td><button id="C5100602" value="C5100602" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C5100101" value="C5100101" class="btnShow " ></button></td> <td><button id="C5100201" value="C5100201" class="btnShow " ></button></td> @@ -876,15 +877,15 @@ <p>投料区10</p> <div id="C52" class="flesDiv" style="height:85%; justify-content: space-around;"> <table class=""> <tr> <!-- <tr> <td><button id="C5200102" value="C5200102" class="btnShow " ></button></td> <td><button id="C5200202" value="C5200202" class="btnShow " ></button></td> <td><button id="C5200302" value="C5200302" class="btnShow " ></button></td> </tr> </tr> --> <tr> <td><button id="C5200101" value="C5200101" class="btnShow " ></button></td> <td><button id="C5200201" value="C5200201" class="btnShow " ></button></td> <td><button id="C5200301" value="C5200301" class="btnShow " ></button></td> <!-- <td><button id="C5200301" value="C5200301" class="btnShow " ></button></td> --> </tr> </table> @@ -898,12 +899,12 @@ <tr> <td><button id="C5300102" value="C5300102" class="btnShow " ></button></td> <td><button id="C5300202" value="C5300202" class="btnShow " ></button></td> <td><button id="C5300302" value="C5300302" class="btnShow " ></button></td> <!-- <td><button id="C5300302" value="C5300302" class="btnShow " ></button></td> --> </tr> <tr> <td><button id="C5300101" value="C5300101" class="btnShow " ></button></td> <td><button id="C5300201" value="C5300201" class="btnShow " ></button></td> <td><button id="C5300301" value="C5300301" class="btnShow " ></button></td> <!-- <td><button id="C5300301" value="C5300301" class="btnShow " ></button></td> --> </tr> </table> @@ -940,7 +941,7 @@ </tr> <tr> <td><button id="C2408301" value="C2408301" class="btnShow1 " ></button></td> <td><button id="C2408302" value="C2408302" class="btnShow1 " ></button></td> <!-- <td><button id="C2408302" value="C2408302" class="btnShow1 " ></button></td> --> </tr> <tr> <td><button id="C2408501" value="C2408501" class="btnShow1 " ></button></td> @@ -952,7 +953,7 @@ </tr> <tr> <td><button id="C2408701" value="C2408701" class="btnShow1 " ></button></td> <td><button id="C2408702" value="C2408702" class="btnShow1 " ></button></td> <!-- <td><button id="C2408702" value="C2408702" class="btnShow1 " ></button></td> --> </tr> <tr> <td class="btnShow"></td> @@ -962,7 +963,7 @@ </tr> <tr> <td><button id="C2408801" value="C2408801" class="btnShow1 " ></button></td> <td><button id="C2408802" value="C2408802" class="btnShow1 " ></button></td> <!-- <td><button id="C2408802" value="C2408802" class="btnShow1 " ></button></td> --> </tr> <tr> <td><button id="C2408901" value="C2408901" class="btnShow1 " ></button></td> @@ -982,13 +983,13 @@ </tr> <tr> <td><button id="C2409301" value="C2409301" class="btnShow1 " ></button></td> <td><button id="C2409302" value="C2409302" class="btnShow1 " ></button></td> <!-- <td><button id="C2409302" value="C2409302" class="btnShow1 " ></button></td> --> </tr> <tr> <td><button id="C2409401" value="C2409401" class="btnShow1 " ></button></td> <td><button id="C2409402" value="C2409402" class="btnShow1 " ></button></td> <!-- <td><button id="C2409402" value="C2409402" class="btnShow1 " ></button></td> --> </tr> <tr> <!-- <tr> <td><button id="C2409501" value="C2409501" class="btnShow1 " ></button></td> <td class="btnShow"></td> </tr> @@ -1007,14 +1008,14 @@ <tr> <td><button id="C2409901" value="C2409901" class="btnShow1 " ></button></td> <td><button id="C2409902" value="C2409902" class="btnShow1 " ></button></td> </tr> </tr> --> </table> </div> <div style="width: 80%; height: 100%;"> <div class="flesDiv" style="width: 100%; height: 25%;"> <table> <tr> <!-- <tr> <td><button id="C2400104" value="C2400104" class="btnShow1 " ></button></td> <td><button id="C2400204" value="C2400204" class="btnShow1 " ></button></td> <td><button id="C2400304" value="C2400304" class="btnShow1 " ></button></td> @@ -1035,7 +1036,7 @@ <td><button id="C2401804" value="C2401804" class="btnShow1 " ></button></td> <td><button id="C2401904" value="C2401904" class="btnShow1 " ></button></td> </tr> </tr> --> <tr> <td><button id="C2400103" value="C2400103" class="btnShow1 " ></button></td> <td><button id="C2400203" value="C2400203" class="btnShow1 " ></button></td> @@ -1170,7 +1171,7 @@ </div> <div class="flesDiv" style="width: 100%; height: 25%;"> <table> <tr> <!-- <tr> <td><button id="C2403904" value="C2403904" class="btnShow1 " ></button></td> <td><button id="C2404004" value="C2404004" class="btnShow1 " ></button></td> <td><button id="C2404104" value="C2404104" class="btnShow1 " ></button></td> @@ -1190,7 +1191,7 @@ <td><button id="C2405604" value="C2405604" class="btnShow1 " ></button></td> <td><button id="C2405704" value="C2405704" class="btnShow1 " ></button></td> <td><button id="C2405804" value="C2405804" class="btnShow1 " ></button></td> </tr> </tr> --> <tr> <td><button id="C2403903" value="C2403903" class="btnShow1 " ></button></td> <td><button id="C2404003" value="C2404003" class="btnShow1 " ></button></td> HTML/views/WareHouseSetting/Pallets.html
@@ -29,13 +29,13 @@ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top"> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label" style="width: 70px;">桶条码：</label> <label class="layui-form-label" style="width: 70px;">桶号：</label> <div class="layui-input-inline"> <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘条码" autocomplete="off" class="layui-input"> <input type="text" id="PalletNo" name="PalletNo" placeholder="桶号" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">条码状态</label> <label class="layui-form-label">桶状态</label> <div class="layui-input-inline"> <select name="Status" id="Status" lay-verify="" lay-search> <option value=""></option> HTML/views/index.html
@@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> <title>AGV转运系统</title> <title>博柯莱·料斗搬运系统</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> @@ -72,7 +72,7 @@ <div class="layui-side layui-side-menu" id="leftmenu"> <div class="layui-side-scroll"> <div class="layui-logo" lay-href="home/console.html" style="background-color: #FFFFFF;"> <span>博柯莱·AGV转运系统</span> <span>博柯莱·料斗搬运系统</span> </div> <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -506,7 +506,7 @@ BitPalletMark = "0", InspectStatus = "1", }; Db.Insertable(stockDetailNew).ExecuteCommand(); Db.Updateable(stockDetailNew).ExecuteCommand(); } else { @@ -588,7 +588,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); } } @@ -596,7 +596,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = "货架与货位绑定失败，原因："+agvBindMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); } @@ -1125,7 +1125,7 @@ //logTaskEntry.IsCancel = 0; logTaskEntry.BackDate = DateTime.Now; logTaskEntry.Status = "1";//正在执行 Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); //修改移出储位状态 locatInfo.Status = "5";//移出中 @@ -1139,7 +1139,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{palletInfoYi.PalletNo}"); } @@ -1148,7 +1148,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvBindMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{palletInfoYi.PalletNo}"); } @@ -1239,7 +1239,7 @@ //logTaskEntry.IsCancel = 0; logTaskInfoZ.BackDate = DateTime.Now; logTaskInfoZ.Status = "1";//正在执行 Db.Insertable(logTaskInfoZ).ExecuteCommand(); Db.Updateable(logTaskInfoZ).ExecuteCommand(); //修改移出储位状态 startLocatInfoZ.Status = "5";//移出中 @@ -1253,7 +1253,7 @@ { logTaskInfoZ.IsSuccess = 0; logTaskInfoZ.Information = agvMsg; Db.Insertable(logTaskInfoZ).ExecuteCommand(); Db.Updateable(logTaskInfoZ).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{logTaskInfoZ.PalletNo}"); } @@ -1262,7 +1262,7 @@ { logTaskInfoZ.IsSuccess = 0; logTaskInfoZ.Information = agvBindMsg; Db.Insertable(logTaskInfoZ).ExecuteCommand(); Db.Updateable(logTaskInfoZ).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{logTaskInfoZ.PalletNo}"); } @@ -1371,7 +1371,7 @@ //logTaskEntry.IsCancel = 0; logTaskEntry.BackDate = DateTime.Now; logTaskEntry.Status = "1";//正在执行 Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); //修改移出储位状态 locatModel.Status = "5";//移出中 @@ -1385,7 +1385,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{detailInfo.PalletNo}"); } @@ -1394,7 +1394,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvBindMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{detailInfo.PalletNo}"); } @@ -1442,15 +1442,15 @@ if (zonghong == "M12" || zonghong == "M13") { //先查到同物料的组 string sql = $@"select Row from SysStorageLocat where LocatNo in( string sql = $@"select Row,AreaNo from SysStorageLocat where LocatNo in( select LocatNo from DataStockDetail where SkuNo='{skuNo}' and LotNo = '{lotNo}' and Standard='{standard}' and AreaNo in ('C02','C25') ) group by Row"; ) group by Row,AreaNo"; var RowList = Db.Ado.SqlQuery<TableMan>(sql).ToList(); List<int> RowList = Db.Ado.SqlQuery<int>(sql).ToList(); foreach (var rowItem in RowList) { endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.Row == rowItem) endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.Row == rowItem.Row && w.AreaNo == rowItem.AreaNo && (w.WareHouseNo == "M01"||w.WareHouseNo == "M16")) .OrderByDescending(o => o.Column).First(); if (endLocatInfo.LocatNo != null) { @@ -1472,15 +1472,15 @@ areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "1").Select(s => s.AreaNo).First(); //分配储位 //先查到同物料的组 string sql = $@"select Row from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and Status = '0' and LocatNo in( string sql = $@"select Row,AreaNo from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and Status = '0' and LocatNo in( select LocatNo from DataStockDetail where SkuNo='{skuNo}' and LotNo = '{lotNo}' and Standard='{standard}' and WareHouseNo='{houseNo}' and AreaNo='{areaNo}' ) group by Row"; ) group by Row,AreaNo"; List<int> RowList = Db.Ado.SqlQuery<int>(sql).ToList(); var RowList = Db.Ado.SqlQuery<TableMan>(sql).ToList(); foreach (var rowItem in RowList) { endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.WareHouseNo == houseNo && w.AreaNo == areaNo && w.Row == rowItem) && w.WareHouseNo == houseNo && w.AreaNo == areaNo && w.Row == rowItem.Row && w.AreaNo == rowItem.AreaNo && (w.WareHouseNo == "M01" || w.WareHouseNo == "M16")) .OrderByDescending(o => o.Column).First(); if (endLocatInfo.LocatNo != null) @@ -1508,13 +1508,13 @@ //分配储位 //料斗清洗暂存间 endLocatInfo = ztLocat.Where(w => w.AreaNo == "C54").FirstOrDefault(); if (string.IsNullOrEmpty(endLocatInfo.LocatNo)) if (endLocatInfo == null) { endLocatInfo = ztLocat.Where(w => w.AreaNo == "C26").FirstOrDefault(); if (string.IsNullOrEmpty(endLocatInfo.LocatNo)) if (endLocatInfo == null) { endLocatInfo = ztLocat.Where(w => w.AreaNo == "C03").FirstOrDefault(); if (string.IsNullOrEmpty(endLocatInfo.LocatNo)) if (endLocatInfo == null) { throw new Exception("无可用脏桶库位"); } Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -338,7 +338,7 @@ //logTaskEntry2.IsCancel = 0; logTaskEntry2.BackDate = DateTime.Now; logTaskEntry2.Status = "1"; Db.Insertable(logTaskEntry2).ExecuteCommand(); Db.Updateable(logTaskEntry2).ExecuteCommand(); startLoction2.Status = "3";//出库中 Db.Updateable(startLoction2).ExecuteCommand(); @@ -350,7 +350,7 @@ { logTaskEntry2.IsSuccess = 0; logTaskEntry2.Information = agvMsg; Db.Insertable(logTaskEntry2).ExecuteCommand(); Db.Updateable(logTaskEntry2).ExecuteCommand(); } //提交事务 @@ -414,7 +414,7 @@ //logTaskEntry.IsCancel = 0; logTaskEntry.BackDate = DateTime.Now; logTaskEntry.Status = "1";//正在执行 Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); startLoction.Status = "3";//出库中 Db.Updateable(startLoction).ExecuteCommand(); @@ -426,7 +426,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); } //提交事务 @@ -706,7 +706,7 @@ //logTaskEntry.IsCancel = 0; logTaskEntry.BackDate = DateTime.Now; logTaskEntry.Status = "1";//正在执行 Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); deviceLocatInfo.Status = "3";//出库中 Db.Updateable(deviceLocatInfo).ExecuteCommand(); @@ -718,7 +718,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); } //提交事务 Db.CommitTran(); @@ -1458,7 +1458,7 @@ //logTaskEntry.IsCancel = 0; logTaskEntry.BackDate = DateTime.Now; logTaskEntry.Status = "1";//正在执行 Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); locatInfo.Status = "5";//移出中 @@ -1471,7 +1471,7 @@ { logTaskEntry.IsSuccess = 0; logTaskEntry.Information = agvMsg; Db.Insertable(logTaskEntry).ExecuteCommand(); Db.Updateable(logTaskEntry).ExecuteCommand(); throw new Exception($"给小车下发移库任务失败，桶号：{palletInfoYi.PalletNo}"); } Wms/WMS.BLL/SysServer/PalletsServer.cs
@@ -159,26 +159,7 @@ { throw new Exception("新添加的桶只能绑定净桶区"); } //if (!string.IsNullOrEmpty(deviceCode)) //{ // var areaInfo = db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode.Contains(deviceCode)); // if (areaInfo == null) // { // throw new Exception("未查到设备所属区域信息"); // } // //125设备是接料和混料一体机 // if (deviceCode != "125") // { // if (!areaInfo.AreaName.Contains("接料设备")) // { // throw new Exception("只能绑定接料设备"); // } // if (areaInfo.WareHouseNo != "M03") // { // throw new Exception("只有大单体车间才能绑定设备"); // } // } //} if (!string.IsNullOrEmpty(deviceCode)) { switch (deviceCode) Wms/WMS.Entity/SysEntity/SysStorageArea.cs
@@ -77,4 +77,9 @@ [Navigate(NavigateType.OneToOne, nameof(UpdateUser))] public SysUserInfor UpdateUserInfo { get; set; } } public class TableMan { public string AreaNo { get; set; } public int Row { get; set; } } } Wms/Wms/appsettings.json
@@ -11,8 +11,8 @@ //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;", //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;", //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;", // "ConnectionString": "Server=192.168.62.200;Database=WMS_JC37;User ID=sa;Password=sql2019;Integrated Security=False;" "ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" "ConnectionString": "Server=192.168.62.200;Database=WMS_JC37;User ID=sa;Password=sql2019;Integrated Security=False;" //"ConnectionString": "Server=.;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" //"ConnectionString": "Data Source=192.168.10.201\\WMSSQLSERVER;Database=WMS_JC37;User ID=sa;Password=sa@123456;Integrated Security=False;" //"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;"
