1

pulg

2025-07-03 c7bf0a0a8d0177b8f7720cd8120295a581e238a6

 HH.WCS.QingXiNongfu/wms/LocationHelper.cs

@@ -1,17 +1,11 @@
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using static HH.WCS.QingXigongchang.dispatch.NDC;

namespace HH.WCS.QingXigongchang.wms
{
@@ -181,6 +175,13 @@
                    }
                }
            }
            return locs;
        }

        public static List<Location> GetAreaNormalLocListAll(string areeacode)
        {
            var locs = LocationHelper.GetLocList(x => x.S_AREA_CODE == areeacode && x.S_LOCK_STATE.Trim() == "无" && x.N_CURRENT_NUM == 0);

            return locs;
        }
        internal static List<Location> GetAllLocListByAreaCode(string _areacode, int minRow, int maxRow)
@@ -796,7 +797,7 @@
                        LogHelper.Info($"{plc.deviceName}-{workOrder.SQL_WorkNo}链接的产线号{LineTo} BolArea 未配置。");
                        goto ______label____end;
                    }
                    bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea, true, false);
                    bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea);

                    //var bits = Settings.GetInStockCacheList().Where(a => a.deviceName == _t)?.Select(x => x.location);
                    //bitslocs = LocationHelper.GetAllLocList().Where(x => bits.Contains(x.S_LOC_CODE.Trim())).ToList();