From d9c99e0480b4910cdb134778dd5c314b35ec4cf2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 九月 2025 10:05:23 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ShuttleCar/ShuttleCarService.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ShuttleCar/ShuttleCarService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ShuttleCar/ShuttleCarService.cs"
index 10c78b7..54ac555 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ShuttleCar/ShuttleCarService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ShuttleCar/ShuttleCarService.cs"
@@ -1,7 +1,11 @@
锘縰sing AutoMapper;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Const;
+using WIDESEAWCS_Core.DB;
+using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IShuttleCar;
using WIDESEAWCS_IShuttleCarInfoRepository;
using WIDESEAWCS_Model.Models;
@@ -25,11 +29,11 @@
/// <returns></returns>
public Dt_ShuttleCar QueryShuttleCar(string Address)
{
- return BaseDal.QueryFirst(x => x.ShuttleCarPosition == Address);
+ return BaseDal.QueryFirst(x => x.ShuttleCarPosition == Address || x.ShuttleCarPosition1 == Address);
}
/// <summary>
- /// 鏍规嵁ID鏌ヨ绌挎杞︿俊鎭�
+ /// 鏍规嵁绌挎杞︾紪鍙锋煡璇㈢┛姊溅淇℃伅
/// </summary>
/// <param name="ShuttleCarId"></param>
/// <returns></returns>
@@ -37,5 +41,43 @@
{
return BaseDal.QueryFirst(x => x.ShuttleCarCode == ShuttleCarCode);
}
+ /// <summary>
+ /// 鏍规嵁绌挎杞︾紪鍙锋煡璇㈠叾浠栫┛姊溅淇℃伅
+ /// </summary>
+ /// <param name="ShuttleCarCode"></param>
+ /// <returns></returns>
+ public Dt_ShuttleCar QueryNoCode(string ShuttleCarCode)
+ {
+ return BaseDal.QueryFirst(x => x.ShuttleCarCode != ShuttleCarCode);
+ }
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ WebResponseContent responseContent = new WebResponseContent().OK();
+ try
+ {
+ Dt_ShuttleCar shuttleCar = BaseDal.QueryFirst(x => x.ShuttleCarId == saveModel.MainData["shuttleCarId"].ObjToInt());
+ var Position = saveModel.MainData["shuttleCarPosition"].ToString();
+ if (BaseDal.QueryData(x => x.ShuttleCarPosition == Position && x.ShuttleCarId != shuttleCar.ShuttleCarId).Any())
+ throw new Exception($"浣嶇疆銆恵Position}銆戝凡瀛樺湪绌挎杞�");
+ SqlSugarClient WMSsugarClient = new SqlSugarClient(new ConnectionConfig
+ {
+ ConfigId = MainDb.CurrentDbConnId,
+ ConnectionString = AppSettings.Get("WMSConnectionString").DecryptDES(AppSecret.DB),
+ IsAutoCloseConnection = true,
+ DbType = DbType.SqlServer,
+ });
+
+ var getLocation = WMSsugarClient.Queryable("Dt_LocationInfo", "x").Where("LocationCode", "=", Position).Any();
+ if (!getLocation) throw new Exception($"鏈壘鍒颁綅缃�恵Position}銆�");
+ shuttleCar.ShuttleCarPosition = Position;
+ shuttleCar.ShuttleCarPosition1 = Position;
+ BaseDal.UpdateData(shuttleCar);
+ }
+ catch (Exception ex)
+ {
+ responseContent.Error(ex.Message);
+ }
+ return responseContent;
+ }
}
}
--
Gitblit v1.9.3