From 91fc6f65c712505f0b13e45d66e917e2645ae1c3 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 10 七月 2025 18:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/api/ApiHelper.cs | 175 +++++++++++++++++++++++++++-------------------------------
1 files changed, 82 insertions(+), 93 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/api/ApiHelper.cs b/HH.WCS.QingXiNongfu/api/ApiHelper.cs
index 02e1d75..1972bd6 100644
--- a/HH.WCS.QingXiNongfu/api/ApiHelper.cs
+++ b/HH.WCS.QingXiNongfu/api/ApiHelper.cs
@@ -3,21 +3,12 @@
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
using Newtonsoft.Json;
-using NLog.Fluent;
using System;
using System.Collections.Generic;
-using System.Data.SqlClient;
using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Runtime.ConstrainedExecution;
-using System.Security.Cryptography;
using System.Threading;
-using System.Threading.Tasks;
using System.Web.Http;
-using System.Web.Security;
using static HH.WCS.QingXigongchang.api.ApiModel;
-using static HH.WCS.QingXigongchang.dispatch.NDC;
namespace HH.WCS.QingXigongchang.api
{
@@ -789,20 +780,20 @@
}
}
}
- if (!string.IsNullOrEmpty(item.Trim()))
- if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
- {
- if (locd.S_AREA_CODE.StartsWith("PP"))
- {
- SQL_UsingNow = "F";
- }
- else if (locd.S_AREA_CODE.Contains("JCJY"))
- {
- SQL_UsingNow = "J";
- }
- else
- return SimpleResult.Error("鎸囨槑 鍗充骇鍜岄潪鍗充骇鐨勫弬鏁�JF 娌℃湁鏄庣‘" + SQL_UsingNow);
- }
+ //if (!string.IsNullOrEmpty(item.Trim()))
+ // if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
+ // {
+ // if (locd.S_AREA_CODE.StartsWith("PP"))
+ // {
+ // SQL_UsingNow = "F";
+ // }
+ // else if (locd.S_AREA_CODE.Contains("JCJY"))
+ // {
+ // SQL_UsingNow = "J";
+ // }
+ // else
+ // return SimpleResult.Error("鎸囨槑 鍗充骇鍜岄潪鍗充骇鐨勫弬鏁�JF 娌℃湁鏄庣‘" + SQL_UsingNow);
+ // }
result.resultCode = 0;
//LocationHelper.BindingLoc(loc.Trim(), "1".Split(',').ToList());
@@ -820,77 +811,75 @@
{
return SimpleResult.Error(loc + " 璐т綅 arco a,r,c,o 鎸囧畾涓嶆槑");
}
-
+ var row = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.S_LOCK_STATE != "鏃� && x.S_LOCK_STATE != "鎶ュ簾");
+ //var rowloc = row.Find(x => x.S_LOCK_STATE != "鏃�);
+ if (row.Any())
{
- var row = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.S_LOCK_STATE != "鏃� && x.S_LOCK_STATE != "鎶ュ簾");
- //var rowloc = row.Find(x => x.S_LOCK_STATE != "鏃�);
- if (row.Any())
- {
- result.resultCode = -1;
- result.resultMsg = $"鎵��鍖哄煙{row.FirstOrDefault().S_LOC_CODE}鎺掓湁{row.FirstOrDefault().S_LOCK_STATE}鐘舵�, 涓嶈兘杩涜缁戝畾";
- return result;
- }
- if (BindORUnbind)
- {
- Location e = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.N_CURRENT_NUM > 0).LastOrDefault();//浠庡乏寰�彸鏈�悗涓�釜婊′綅銆�
- if (e != null)
- {
- var rel = LocationHelper.GetLocCntrRel(e.S_LOC_CODE);
- if (rel.FirstOrDefault()?.S_TYPE != item)
- {
- LogHelper.Info($"{e.S_LOC_CODE} 浣嶇疆鐨�鐗╂枡{rel.FirstOrDefault()?.S_TYPE} 涓庢湰娆＄粦瀹歿item} 涓嶇銆�缁堟缁戝畾");
- result.resultCode = -1;
- result.resultMsg = $"{e.S_LOC_CODE} 浣嶇疆鐨�鐗╂枡{rel.FirstOrDefault()?.S_TYPE} 涓庢湰娆＄粦瀹歿item} 涓嶇銆�缁堟缁戝畾";
- return result;
- }
- }
- LocationHelper.DoAction(db =>
- {
- var s = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
- int li = 0;
- foreach (var __loc in _locs)
- {
- if (__loc.N_CAPACITY <= __loc.N_CURRENT_NUM)
- continue;
- if (li >= s.Length)
- li = 0;
- string end = s[li].ToString();
- db.Insertable<LocCntrRel>(new LocCntrRel
- {
- S_LOC_CODE = __loc.S_LOC_CODE.Trim(),
- S_CNTR_CODE = SQL_UsingNow + Settings.GetTimeStamp() + end,
- S_TYPE = item
- }).ExecuteCommand();
- __loc.N_CURRENT_NUM++;
- if (__loc.N_CURRENT_NUM > __loc.N_CAPACITY)
- __loc.N_CURRENT_NUM = __loc.N_CAPACITY;
- __loc.T_FULL_TIME = DateTime.Now;
-
- db.Updateable<Location>(__loc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.T_FULL_TIME }).ExecuteCommand();
- li++;
- }
- return true;
- });
- }
- else
- {
- LocationHelper.DoAction(db =>
- {
- foreach (var __loc in _locs)
- {
- if (0 == __loc.N_CURRENT_NUM)
- continue;
- db.Deleteable<LocCntrRel>().Where(it => it.S_LOC_CODE == __loc.S_LOC_CODE.Trim()).ExecuteCommand();
-
- __loc.N_CURRENT_NUM = 0;
- __loc.T_FULL_TIME = null;
- __loc.T_EMPTY_TIME = DateTime.Now;
- db.Updateable<Location>(__loc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.T_EMPTY_TIME, it.T_FULL_TIME }).ExecuteCommand();
- }
- return true;
- });
- }
+ result.resultCode = -1;
+ result.resultMsg = $"鎵��鍖哄煙{row.FirstOrDefault().S_LOC_CODE}鎺掓湁{row.FirstOrDefault().S_LOCK_STATE}鐘舵�, 涓嶈兘杩涜缁戝畾";
+ return result;
}
+ if (BindORUnbind)
+ {
+ Location e = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.N_CURRENT_NUM > 0).LastOrDefault();//浠庡乏寰�彸鏈�悗涓�釜婊′綅銆�
+ if (e != null)
+ {
+ var rel = LocationHelper.GetLocCntrRel(e.S_LOC_CODE);
+ if (rel.FirstOrDefault()?.S_TYPE != item)
+ {
+ LogHelper.Info($"{e.S_LOC_CODE} 浣嶇疆鐨�鐗╂枡{rel.FirstOrDefault()?.S_TYPE} 涓庢湰娆＄粦瀹歿item} 涓嶇銆�缁堟缁戝畾");
+ result.resultCode = -1;
+ result.resultMsg = $"{e.S_LOC_CODE} 浣嶇疆鐨�鐗╂枡{rel.FirstOrDefault()?.S_TYPE} 涓庢湰娆＄粦瀹歿item} 涓嶇銆�缁堟缁戝畾";
+ return result;
+ }
+ }
+ LocationHelper.DoAction(db =>
+ {
+ var s = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+ int li = 0;
+ foreach (var __loc in _locs)
+ {
+ if (__loc.N_CAPACITY <= __loc.N_CURRENT_NUM)
+ continue;
+ if (li >= s.Length)
+ li = 0;
+ string end = s[li].ToString();
+ db.Insertable<LocCntrRel>(new LocCntrRel
+ {
+ S_LOC_CODE = __loc.S_LOC_CODE.Trim(),
+ S_CNTR_CODE = SQL_UsingNow + Settings.GetTimeStamp() + end,
+ S_TYPE = item
+ }).ExecuteCommand();
+ __loc.N_CURRENT_NUM++;
+ if (__loc.N_CURRENT_NUM > __loc.N_CAPACITY)
+ __loc.N_CURRENT_NUM = __loc.N_CAPACITY;
+ __loc.T_FULL_TIME = DateTime.Now;
+
+ db.Updateable<Location>(__loc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.T_FULL_TIME }).ExecuteCommand();
+ li++;
+ }
+ return true;
+ });
+ }
+ else
+ {
+ LocationHelper.DoAction(db =>
+ {
+ foreach (var __loc in _locs)
+ {
+ if (0 == __loc.N_CURRENT_NUM)
+ continue;
+ db.Deleteable<LocCntrRel>().Where(it => it.S_LOC_CODE == __loc.S_LOC_CODE.Trim()).ExecuteCommand();
+
+ __loc.N_CURRENT_NUM = 0;
+ __loc.T_FULL_TIME = null;
+ __loc.T_EMPTY_TIME = DateTime.Now;
+ db.Updateable<Location>(__loc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.T_EMPTY_TIME, it.T_FULL_TIME }).ExecuteCommand();
+ }
+ return true;
+ });
+ }
+
}
lable_end:
return result;
@@ -1240,7 +1229,7 @@
}
}
if (startBit == null)
- return SimpleResult.Error("") ;
+ return SimpleResult.Error("");
locList = LocationHelper.GetAreaNormalLocList("鍏ュ簱鍖�);
foreach (var item in locList.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(x => x.Key))
{
--
Gitblit v1.9.1