1

pulg

2025-06-30 f8e049e2a30f711a56b735361a230216d8808f0b

 HH.WCS.QingXiNongfu/core/TaskCore.cs

@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Configuration;
using System.Xml.Schema;
using static HH.WCS.QingXigongchang.api.ApiModel;

namespace HH.WCS.QingXigongchang.core
@@ -36,7 +34,7 @@
                    && wmsTask.S_B_STATE.Trim() != "强制完成"
                    && wmsTask.S_B_STATE.Trim() != "取消")
                {
                    if (model.State < 8 || model.State > 1000)
                    if (model.State < 10 || model.State > 1000)
                    {
                        if (model.State < 7 && string.IsNullOrEmpty(model.ForkliftNo))
                        {
@@ -98,6 +96,15 @@
                                r = TaskProcess.OperateStatus(wmsTask, 8);
                                if (r.ResultCode != -1)
                                    TaskHelper.BeEnd(wmsTask);
                                break;
                            case 9://强制取消  //起点解绑锁释放 终点锁释放

                                r = TaskProcess.OperateStatus(wmsTask, 9);
                                if (r.ResultCode != -1)
                                {
                                    wmsTask.T_END_TIME = DateTime.Now;
                                    TaskHelper.UpdateStatus(wmsTask, "取消");
                                }
                                break;


@@ -454,7 +461,7 @@
                                            var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2;  // 指定统计字段

                                            kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE;
                                            if(!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
                                            if (!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
                                                kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
                                            kr.MaxCapacity = total;
                                            kr.FilledCapacity = count;