blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pulg
2025-07-01 8bc688f992f70815084e958a728a696871294672 
 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;






@@ -382,6 +389,9 @@


                var info = db.Queryable<KuRong>().First();


                if (info == null || DateTime.Now.Subtract(info.T_MODIFY).TotalMinutes > min)


                {


                    db.Deleteable<KuRong>().ExecuteCommand();


                    info = null;




                    //1、查到小板库区下面所有的库位


                    var totalX = 0;


                    var totalRows = 0;


@@ -454,7 +464,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;


@@ -479,9 +489,21 @@


                    }


                    var totalDesiredCapacity = ordersCount * 4 * 3 * (totalX / totalRows);


                    LogHelper.Error($"成品小板区总货位是{totalX},总排数是{totalRows},当前执行工单数量是{ordersCount}", new Exception("Kurong"));


                    var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity);


                    var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity;


                    list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; });


                    //var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity);


                    //var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity;


                    //list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; });


                    var totalAvailableCapacity = list.Sum(a => a.MaxCapacity);// AvailableCapacity);


                    var DRC = list.Sum(x => x.FilledCapacity);


                    var totalAssignableCapacity = totalAvailableCapacity - DRC - totalDesiredCapacity;


                    var BAC = list.Sum(x => x.AvailableCapacity);


                    list.ForEach(a =>


                    {


                        a.DesiredCapacity = totalDesiredCapacity;


                        a.CRC = totalAvailableCapacity;


                        a.RAC = totalAssignableCapacity;


                        a.BAC = BAC;


                        a.DRC = DRC;


                    });


                    if (info == null)


                    {


                        /*​SQL Server​   1000 条/批次   单个 INSERT 语句最多支持 1000 条 VALUES 子句，超出会报语法错误。*/