Epost.BLL/OrderControlBLL.cs

@@ -206,6 +206,28 @@ namespace Epost.BLL
 
         }
         #endregion
+
+        #region 
+        public ResultModel Forcedend(string orderid)
+        {
+            try
+            {
+                ResultModel resultModel = comBLL.Forcedend(orderid);
+
+                return resultModel;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogInfo("强制结束熄灭标签异常" + ex.ToString());
+                ResultModel resultModel = new ResultModel();
+                resultModel.result = "-1";
+                resultModel.msg = "强制结束熄灭标签异常：" + ex.ToString() + "";
+                return resultModel;
+            }
+
+        }
+        #endregion.
+
         #endregion
 
         #region 查询波次通道列表
@@ -418,7 +440,7 @@ namespace Epost.BLL
                 List<JobModel> downlist = new List<JobModel>();
                 JobModel model = job.FirstOrDefault();
                 downlist.Add(model);
-
+                model.State = 3;
                 List<JobModel> manyList = job.FindAll(m => m.ManyState == 1 && m.Tolocation == model.Tolocation && m.Sku == model.Sku);
                 #region 处理合并数据
                 //int endcount = 1;
@@ -436,16 +458,17 @@ namespace Epost.BLL
 
                 orderbll.UpdateOrderState_Car(downlist, model, truequantity, checkquantity);
                 LogHelper.WriteLogInfo("标记------" + data.Address + "------" + model.Sku + "----" + model.State + "");
-                bool skuInish = dal.IsFinishWork(1, block, "", area, model.Sku, "", model.OrderID);
+                bool skuInish = dal.IsFinishWork(1, block, "", area, "", "", model.OrderID);
                 if (skuInish)
                 {
                     LogHelper.WriteLogInfo(data.Address + "=========------------------" + data.Parameter);
-                    
+
+                    comBLL.DISPLAY_LIGHT_BLOCK(model.Block, data.Area, "0");
 
                     LogHelper.WriteLogInfo("区SKU拣选完成--------------");
                     //删除sku缓存信息
-                    List<JobModel> rjob = jobList.FindAll(m => m.Block == data.Block && m.Area == data.Area && m.Sku == model.Sku);
-                    JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
+                    //List<JobModel> rjob = jobList.FindAll(m => m.Block == data.Block && m.Area == data.Area && m.Sku == model.Sku);
+                    //JobCache.UpdateJobModelList(rjob, EcommendType.Execute);
 
                     bool allfinish = dal.IsFinishWork_box("", 0, model.OrderID);
                     if (allfinish)
@@ -461,7 +484,7 @@ namespace Epost.BLL
 
                         //修改订单状态
                         dal.UpdateStateByCar(model.OrderID);
-                        comBLL.DISPLAY_LIGHT_BLOCK(model.Block, data.Area, "0");
+
                     }
                 }
             }