3 Commits f622b8e660 ... 8e36e1d611

Author SHA1 Message Date
  1693994901 8e36e1d611 Merge branch 'master' of http://120.77.11.229:3000/ZTGT/WEBUI 2 months ago
  1693994901 f00b925bf8 Merge branch 'master' of http://120.77.11.229:3000/ZTGT/WEBUI 6 months ago
  1693994901 0e7658728b 业务类型添加,缓存超时 7 months ago

+ 12 - 1
WMS.BZModels/EnumClass.cs

@@ -343,7 +343,18 @@ namespace WMS.BZModels
         ///  皮盘入库
         /// </summary>
         [Description("皮盘入库")]
-        皮盘入库 = 16
+        皮盘入库 = 16,
+            /// <summary>
+            ///  重绕满托入库
+            /// </summary>
+        [Description("重绕满托入库")]
+        重绕满托入库 = 17,
+
+        /// <summary>
+        ///  帘线退料重绕
+        /// </summary>
+        [Description("帘线退料重绕")]
+        帘线退料重绕 = 18
     }
 
     //public enum FJTaskBusType

+ 18 - 0
WMS.BZServices/FJ/WCSCachelineService.cs

@@ -75,5 +75,23 @@ namespace WMS.BZServices.FJ
             }
            
         }
+
+        public bool UpdateOvertime(List<int> ids)
+        {
+            if (ids == null || !ids.Any()) throw new ArgumentException("参数错误!");
+            var list = _WCSCachelineRepository.Queryable().Where(o => ids.Contains(o.Id)).ToList();
+            if (!list.Any())
+            {
+                throw new ArgumentException("没有找到该缓存信息!");
+            }
+            list.ForEach(o =>
+            {
+                o.AddTime = o.AddTime.AddHours(-12);               
+                o.EditTime = DateTime.Now;                
+            });
+            var result = _WCSCachelineRepository.UpdateRange(list.ToArray());
+            return result;
+
+        }
     }
 }

+ 14 - 0
WMS.BZWeb/Areas/FJManager/Controllers/WCSCachelineController.cs

@@ -70,5 +70,19 @@ namespace WMS.BZWeb.Areas.FJManager.Controllers
  
             return Success("删除成功。");
         }
+
+        [HttpPost]
+        public ActionResult UpdateOvertime(string ids)
+        {
+            if (string.IsNullOrEmpty(ids))
+            {
+                return Fail("没有选择数据!");
+            }
+            var lists = JsonConvert.DeserializeObject<List<int>>(ids);
+
+            _WCSCachelineService.UpdateOvertime(lists);
+
+            return Success("更新成功。");
+        }
     }
 }

+ 3 - 0
WMS.BZWeb/Areas/FJManager/Views/WCSCacheline/Index.cshtml

@@ -95,6 +95,9 @@
                     <div class=" btn-group btn-group-sm" wms-authorize="yes">
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlg">删除</span></a>
                     </div>
+                    <div class=" btn-group btn-group-sm" wms-authorize="yes">
+                        <a id="lr_overtime" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlg">超时</span></a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

+ 19 - 0
WMS.BZWeb/Areas/FJManager/Views/WCSCacheline/Index.js

@@ -138,6 +138,25 @@ var bootstrap = function ($, learun) {
                 });
 
             });
+            // 超时
+            $('#lr_overtime').on('click', function () {
+                let postData = $('#gridtable').jfGridGet("rowdata");
+
+                if (postData.length == 0) {
+                    learun.alert.error('未选择行!');
+                    return false;
+                }
+                learun.layerConfirm('是否确认执行超时操作!', function (res) {
+                    if (res) {
+                        learun.deleteForm(top.$.rootUrl + '/FJManager/WCSCacheline/UpdateOvertime', {
+                            ids: JSON.stringify(postData.map((item) => item.Id))
+                        }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+
+            });
         },
         // 初始化列表 
         initGird: function () {