diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs index 49d5bfc..70d2de3 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs @@ -2896,7 +2896,7 @@ namespace ICSSoft.DataProject (SELECT ID FROM ICSContainer WHERE ContainerCode='{1}' AND WorkPoint='{2}') END "; - sql = string.Format(sql, LotNo, ContainerCode, WorkPoint, User, ContainerType, LocationCode); + sql = string.Format(sql, LotNo, ContainerCode, WorkPoint, User, LocationCode); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { @@ -2925,7 +2925,7 @@ namespace ICSSoft.DataProject (SELECT ID FROM ICSContainer WHERE ContainerCode='{1}' AND WorkPoint='{2}') END "; - sql = string.Format(sql, LotNo, ContainerCode, WorkPoint, User, ContainerType, LocationCode); + sql = string.Format(sql, LotNo, ContainerCode, WorkPoint, User, LocationCode); if (!DBHelper.ExecuteNonQuery(sql, cmd)) { @@ -3234,15 +3234,10 @@ namespace ICSSoft.DataProject { try { - string sql = @"Insert into ICSAGVTaskLog - (ID,TaskCode,ContainerCode,LocationCode,UserCode,MTIME,WorkPoint) - select NEWID(),'{0}','{1}','{2}','{3}',GETDATE(),'{4}'"; - sql = string.Format(sql, TaskCode, ContainerCode, Location, User, WorkPoint); + #region 根据任务ID查询是否需要超托入库 + string sql = @""; DataTable dt = DBHelper.SQlReturnData(sql, cmd); - if (dt.Rows.Count == 0) - { - throw new Exception("已存在相同的任务ID,请勿重复下任务!"); - } + #endregion } catch (Exception ex) { diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/AGVResult.cs b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/AGVResult.cs index f767f43..7ae084e 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/AGVResult.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/AGVResult.cs @@ -11,6 +11,7 @@ namespace ICSSoft.Entity { public AGVResult() { + } public AGVResult(string Code, string Message, string ReqCode) {