From 7d331e13fef4abcec306745dbe9721bafbaf1821 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 30 六月 2025 19:10:14 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/core/TaskCore.cs | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 3b399fb..a62c5bc 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -3,11 +3,10 @@
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
+using Newtonsoft.Json;
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
@@ -35,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))
{
@@ -97,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;
@@ -200,16 +208,16 @@
var list = TaskHelper.GetTaskListByState("鏈墽琛�);
if (list.Count > 0)
{
- foreach (var mst in list)
- {
- var dinfo = Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 13);
- if (dinfo.Find(x => x.location.Contains(mst.S_START_LOC)) != null)
- mst.N_PRIORITY = 99;
- else
- if (dinfo.Find(x => x.location.Contains(mst.S_END_LOC)) != null)
- mst.N_PRIORITY = 98;
- }
- list = list.OrderByDescending(x => x.N_PRIORITY).ToList();
+ //foreach (var mst in list)
+ //{
+ // var dinfo = Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 13);
+ // if (dinfo.Find(x => x.location.Contains(mst.S_START_LOC)) != null)
+ // mst.N_PRIORITY = 99;
+ // else
+ // if (dinfo.Find(x => x.location.Contains(mst.S_END_LOC)) != null)
+ // mst.N_PRIORITY = 98;
+ //}
+ //list = list.OrderByDescending(x => x.N_PRIORITY).ToList();
list.ForEach(task =>
{
@@ -386,12 +394,14 @@
var totalRows = 0;
var list = new List<KuRong>();
var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
+ LogHelper.Info($"KurRongCalc List {JsonConvert.SerializeObject(areas)}");
areas.ForEach(area =>
{
totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X"));
totalRows += db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")).Select(b => b.N_ROW).Distinct().Count();
var aresList = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_")).Select(b => b.S_AREA_CODE).Distinct().ToList();
aresList = aresList.Select(a => a.Split('_')[0]).Distinct().ToList();
+ LogHelper.Info($"KurRongCalc aresList {JsonConvert.SerializeObject(aresList)}");
aresList.ForEach(a =>
{
//b => b.S_AREA_CODE == a + "_X"
@@ -406,26 +416,53 @@
var kr = new KuRong() { StorageLoc = a.Split('-')[1] + "-" + b, T_MODIFY = DateTime.Now };
Console.WriteLine(kr.StorageLoc);
//姣忎竴鎺掕鏌ヤ竴涓嬫湁娌℃湁鎵樼洏
- var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(c.S_AREA_CODE) && c.N_ROW == b && c.N_CURRENT_NUM > 0).ToList();
- if (!listLoc.Any())
+ var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(a) && c.N_ROW == b).ToList();//&& c.N_CURRENT_NUM > 0
+
+ //濡傛灉鏈夋甯哥墿鏂欐帓锛屽氨鐢紝 娌℃湁鎴栬� 绌烘帓 锛屽氨鐢ㄥ皬鏉�+ var norAreacode = "";
+ foreach (var arl in listLoc.GroupBy(x => x.S_AREA_CODE))
{
+ if (arl.ToList().Find(x => x.S_LOCK_STATE.Contains("绌洪棿閿�)) == null)
+ {
+ if (arl.ToList().Find(x => x.N_CURRENT_NUM > 0) != null)
+ {
+ norAreacode = arl.Key;
+ break;
+ }
+ }
+ }
+ LogHelper.Info($"KurRongCalc [{a}]-{b} 缁熻鏄惁姝ｅ父{norAreacode}");
+ if (string.IsNullOrEmpty(norAreacode))
+ {
+ norAreacode = a + "_X";
//娌℃墭鐩橈紝榛樿鏈�ぇ瀹归噺鏄皬鏉跨殑鏁伴噺
- var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == a + "_X" && c.N_ROW == b) * 2 * 2;//2灞�鎵�+ var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * 2 * 2;//2灞�鎵� kr.MaxCapacity = count;
kr.AvailableCapacity = count;
kr.ProductItem = "";
}
else
{
+ var locode = listLoc.Find(x => x.S_AREA_CODE == norAreacode && x.N_CURRENT_NUM > 0);
//鏈夋墭鐩�鍒ゆ柇鏄彔2灞傝繕鏄�灞傦紝瑕佽幏鍙栫墿鏂欎俊鎭�- var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == listLoc[0].S_LOC_CODE).First();
+ var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == locode.S_LOC_CODE).First();
+ LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}-鑾峰彇鍒版墭鐩樼墿鏂欎俊鎭紵锛歿lcr != null}");
if (lcr != null && lcr.CntrItemRel != null)
{
- var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? listLoc[0].N_CAPACITY;
- var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b) * maxLayer * 2;
- var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁
+ var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? 0;
+
+ //LogHelper.Info($"KurRongCalc {norAreacode}-{lcr.CntrItemRel.S_ITEM_NAME}-{lcr.CntrItemRel.S_ITEM_CODE}-maxlayer:{maxLayer}-{locode.S_LOC_CODE}-{locode.N_CAPACITY}");
+ if (maxLayer <= 0)
+ {
+ maxLayer = locode.N_CAPACITY;
+ }
+ var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * maxLayer * 2;
+ //LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}");
+ 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))
+ kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
kr.MaxCapacity = total;
kr.FilledCapacity = count;
kr.AvailableCapacity = total - count;
--
Gitblit v1.9.1