From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Inbound/Partial/Dt_boxing_headService.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Inbound/Partial/Dt_boxing_headService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Inbound/Partial/Dt_boxing_headService.cs"
index d969f1a..81bec05 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Inbound/Partial/Dt_boxing_headService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Services/Inbound/Partial/Dt_boxing_headService.cs"
@@ -6,31 +6,32 @@
*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
*Dt_boxing_headService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
*/
-using WIDESEA.Core.BaseProvider;
-using WIDESEA.Core.Extensions.AutofacManager;
-using WIDESEA.Entity.DomainModels;
-using System.Linq;
-using WIDESEA.Core.Utilities;
-using System.Linq.Expressions;
-using WIDESEA.Core.Extensions;
+using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Http;
-using WIDESEA.Services.IRepositories;
using Newtonsoft.Json;
-using System.Text;
-using System.Net;
-using System.IO;
using System;
-using WIDESEA.Services.Repositories;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Net;
+using System.Text;
using System.Threading;
using WIDESEA.Common;
-using WIDESEA_Services;
-using WIDESEA.Core.Services;
+using WIDESEA.Core.BaseProvider;
using WIDESEA.Core.Enums;
+using WIDESEA.Core.Extensions;
+using WIDESEA.Core.Extensions.AutofacManager;
using WIDESEA.Core.ManageUser;
-using System.Collections.Generic;
+using WIDESEA.Core.Services;
+using WIDESEA.Core.Utilities;
+using WIDESEA.Entity.DomainModels;
+using WIDESEA.Services.IRepositories;
+using WIDESEA.Services.Repositories;
using WIDESEA.Services.Services.ToMes;
+using WIDESEA_Common.LogEnum;
+using WIDESEA_Services;
namespace WIDESEA.Services.Services
{
@@ -148,7 +149,9 @@
Dt_boxing_detailRepository.Instance.Add(newBoxDetail, true);
//鑾峰彇绌鸿揣浣�
- Dt_locationinfo emptyLocation = CommonFunction.GetEmptyLocationAction();
+ Dt_locationinfo emptyLocation = CommonFunction.GetEmptyLocationAction(1);
+ LogRecord.WriteLog((int)LogEnum.InBound, $"鎵樼洏鏉＄爜锛歿rfid},鍒嗛厤鐨勮揣浣嶅彿{emptyLocation.location_id}锛岃揣浣嶇姸鎬侊細{emptyLocation.location_state}");
+
//鑾峰彇浠诲姟
Dt_taskinfo tmpTaskInfo = CommonFunction.AddWMSTask_BoxPalletIn(emptyLocation,
rfid, mesInfo.mesInfo_carType, mesInfo.mesInfo_qrCode,"");
@@ -185,6 +188,10 @@
try
{
string barcode = saveModel.MainData["barcode"].ToString();
+ lock (barcode)
+ {
+
+ }
Dt_taskinfo oldTask = Dt_taskinfoRepository.Instance.FindFirst(r => r.task_barcode == barcode);
if (null != oldTask)
@@ -195,7 +202,18 @@
throw new Exception($"搴撳瓨涓瓨鍦ㄦ墭鐩樺彿锛氥�恵barcode}銆戠殑銆愮┖鎵樸�戝簱瀛橈紝璇蜂汉宸ユ牳瀹烇紝鎵�鍦ㄨ揣浣嶏細{emptyCon.location_id}");
//璇存槑鏄┖鎵樺叆搴�
- Dt_locationinfo emptyLocation = CommonFunction.GetEmptyLocationAction();
+ Dt_locationinfo emptyLocation = CommonFunction.GetEmptyLocationAction(1);
+ LogRecord.WriteLog((int)LogEnum.InBound, $"鎵樼洏鏉＄爜锛歿barcode},鍒嗛厤鐨勮揣浣嶅彿{emptyLocation.location_id}锛岃揣浣嶇姸鎬侊細{emptyLocation.location_state}");
+
+
+ VV_ContainerInfo_EmptyPallet SelectLocation = VV_ContainerInfo_EmptyPalletRepository.Instance.FindFirst(x => x.location_id == emptyLocation.location_id);
+ VV_ContainerInfo conInfohw = VV_ContainerInfoRepository.Instance.FindFirst(x => x.location_id == emptyLocation.location_id);
+ if (SelectLocation != null || conInfohw != null)
+ {
+ LogRecord.WriteLog((int)LogEnum.InBound, $"鍒嗛厤鐨勮揣浣嶅凡鏈夎揣,璐т綅鍙穥emptyLocation.location_id}");
+ throw new Exception($"鍒嗛厤鐨勮揣浣嶅凡鏈夎揣,璐т綅鍙穥SelectLocation.location_id}");
+ }
+
//鍦ㄦ澶勭敓鎴怶MS浠诲姟鍜屼笅鍙慦CS浠诲姟---------绌烘墭鍏ュ簱
Dt_taskinfo tmpTaskInfo = null;
content = Dt_taskinfoRepository.Instance.DbContextBeginTransaction(() =>
@@ -222,6 +240,8 @@
}
+
+
/// <summary>
/// 鏌ヨ涓�涓墭鐩樺彿瀵瑰簲鐨勭粍鐩樹俊鎭�
/// </summary>
--
Gitblit v1.9.3