From fbc6fae6c793220d0b67ac603ce9bbf22837de79 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 17:50:47 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 96 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 14 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 5bab84e..03b36b5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -17,6 +17,7 @@
using AutoMapper;
using MailKit.Search;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
@@ -38,6 +39,7 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.WCSInfo;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
@@ -249,6 +251,72 @@
return WebResponseContent.Instance.OK();
}
+ public WebResponseContent ModifyBarcode(string barcode, string newBarcode)
+ {
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ Dt_Task? dt_Task = BaseDal.QueryFirst(x => x.PalletCode == barcode);
+ if (dt_Task == null) throw new Exception($"鏈壘鍒版墭鐩樺彿涓恒�恵barcode}銆戠殑浠诲姟锛�");
+ if (TaskEnumHelper.GetTaskTypeGroup(dt_Task.TaskType) != TaskTypeGroup.InboundGroup)
+ throw new Exception($"鍙彲淇敼鍏ュ簱浠诲姟,濡傞渶淇敼鍏朵粬浠诲姟绫诲瀷璇疯仈绯荤鐞嗗憳锛�");
+ var stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == newBarcode);
+ if (stock != null) throw new Exception($"鎵樼洏鍙枫�恵newBarcode}銆戝凡瀛樺湪搴撳瓨淇℃伅锛�");
+ stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == barcode);
+ if (stock == null) throw new Exception($"鎵樼洏鍙枫�恵barcode}銆戞湭鎵惧埌搴撳瓨淇℃伅锛�");
+ stock.PalletCode = newBarcode;
+ dt_Task.PalletCode = newBarcode;
+ Db.Ado.BeginTran();
+ WMSTaskDTO wMSTaskDTOs = _mapper.Map<WMSTaskDTO>(dt_Task);
+ var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ModifyBarcode, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
+ if (ResultData.Result == null) throw new Exception($"WCS鍝嶅簲瓒呮椂");
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
+ if (content == null) throw new Exception($"WCS鏃犲搷搴�");
+ if (!content.Status) throw new Exception(content.Message);
+ BaseDal.UpdateData(dt_Task);
+ _stockService.StockInfoService.Repository.UpdateData(stock);
+ Db.Ado.CommitTran();
+ webResponseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ webResponseContent.Error(ex.Message);
+ }
+ return webResponseContent;
+ }
+ public WebResponseContent CancelTask(WMSTaskDTO WMStask)
+ {
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == WMStask.TaskNum && x.TaskType == WMStask.TaskType);
+ if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ Dt_StockInfo? _StockInfo = _stockService.StockInfoService.GetStockByPalletCode(task.PalletCode);
+ if (_StockInfo != null)
+ {
+ Dt_StockInfoDetail? detail = _StockInfo.Details.FirstOrDefault();
+ if (detail != null)
+ {
+ Dt_InboundOrder dt_InboundOrder = _inboundService.InbounOrderService.GetInboundOrder(detail.OrderNo);
+ Dt_InboundOrderDetail? inboundOrderDetail = dt_InboundOrder.Details.FirstOrDefault(x => x.BatchNo == detail.BatchNo);
+ if (inboundOrderDetail != null)
+ {
+ inboundOrderDetail.ReceiptQuantity--;
+ _inboundService.InboundOrderDetailService.Repository.UpdateData(inboundOrderDetail);
+ }
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(_StockInfo.Details, OperateType.AGV鍒犻櫎);
+ }
+ _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(_StockInfo, OperateType.AGV鍒犻櫎);
+ }
+ BaseDal.DeleteAndMoveIntoHty(task, /*App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 :*/ OperateType.AGV鍒犻櫎);
+ }
+ catch (Exception ex)
+ {
+ webResponseContent.Error(ex.Message);
+ }
+ return webResponseContent;
+ }
/// <summary>
/// 鍚屾浠诲姟鐘舵��
/// </summary>
@@ -300,7 +368,7 @@
else if (task.TaskType == (int)TaskTypeEnum.Relocation)
{
task.TaskState = WMStask.TaskState;
- if (task.TaskState == (int)WIDESEA_Core.Enums.TaskRelocationStatusEnum.RelocationFinish)
+ if (task.TaskState == (int)WIDESEA_Core.Enums.TaskRelocationStatusEnum.SC_RelocationFinish)
content = UpdateTaskStatusRelocationCarFinish(task);
else
content = UpdateData(task);
@@ -333,22 +401,14 @@
if (Sourcelocation != null)
{
/*if (task.TaskType == TaskOutboundTypeEnum.Outbound.ObjToInt())*/
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.SourceAddress && x.TaskState < TaskOutStatusEnum.SC_OutFinish.ObjToInt()) == null)
+ Sourcelocation.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
Sourcelocation.CurrentQty--;
- if (Sourcelocation.CurrentQty <= 0 && Sourcelocation.Row != 2)
+ if (Sourcelocation.CurrentQty <= 0)
{
Sourcelocation.CurrentQty = 0;
Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
Sourcelocation.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
- }
- if (Sourcelocation.Row == 1 && Sourcelocation.LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Column == Sourcelocation.Column && x.Layer == Sourcelocation.Layer);
- if (locationInfo.CurrentQty == 0 /*&& locationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt()*/)
- {
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- locationInfo.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- }
}
_basicService.LocationInfoService.Repository.UpdateData(Sourcelocation);
}
@@ -378,10 +438,11 @@
{
Dt_OutStockLockInfo? outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
Dt_OutboundOrder? outboundOrder = null;
+ Dt_OutboundOrderDetail? outboundOrderDetail = null;
int overCount = 0;
if (outStockLockInfo != null)
{
- Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfo.OrderDetailId);
+ outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfo.OrderDetailId);
if (outboundOrderDetail != null)
{
outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outboundOrderDetail.OrderId).Includes(x => x.Details).First();
@@ -400,8 +461,14 @@
if (outboundOrder != null && outboundOrder.Details.Count == overCount)
{
outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
- _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
_outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(outboundOrder.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ outboundOrder.Details = null;
+ _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ if (outboundOrderDetail != null)
+ _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetail);
}
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
if (outStockLockInfo != null) _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
@@ -430,6 +497,7 @@
Targetlocation.CurrentQty++;
stockInfo.LocationCode = Targetlocation.LocationCode;
stockInfo.SerialNumber = Targetlocation.CurrentQty;
+ stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
if (Sourcelocation.CurrentQty == 0) Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
Dt_Task _Task = BaseDal.QueryFirst(x => x.TaskNum != task.TaskNum && x.TaskType == task.TaskType && x.SourceAddress == Sourcelocation.LocationCode && x.TargetAddress == Targetlocation.LocationCode);
if (_Task == null)
--
Gitblit v1.9.3