From e974c93c984188524f15964529203db25ede3170 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 15 三月 2025 16:07:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
index 858737d..f4369ea 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -442,6 +442,7 @@
tasks.ForEach(x =>
{
x.TargetAddress = model.Line;
+ x.OrderNo = mesOutboundOrder.TaskNo;
});
_unitOfWorkManage.BeginTran();
@@ -501,7 +502,7 @@
EffectiveDate = model.ExpirationDate,
MaterielCode = model.MaterialCode,
InboundOrderRowNo = stockInfoDetail_Hty?.InboundOrderRowNo ?? 0,
- MaterielName = model.MaterialCode,
+ MaterielName = stockInfoDetail_Hty.MaterielName,
ProductionDate = model.ProductionDate,
OrderNo = stockInfoDetail_Hty?.OrderNo ?? "",
OutboundQuantity = 0,
@@ -1033,28 +1034,23 @@
StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
proStockInfoDetails = proStockInfoDetails
};
- //鍒嗛厤璐т綅
- locationInfo = _basicService.LocationInfoService.AssignLocation(locationInfo.RoadwayNo, ((PalletTypeEnum)proStockInfo.PalletType).ObjToInt(), proStockInfo.WarehouseId);
Dt_Task newTask = new Dt_Task()
{
CurrentAddress = bagInfoModel.WorkCenter,
Grade = 0,
- NextAddress = locationInfo.LocationCode,
+ NextAddress = "",
PalletCode = proStockInfo.PalletCode,
Roadway = locationInfo.RoadwayNo,
SourceAddress = bagInfoModel.WorkCenter,
- TargetAddress = locationInfo.LocationCode,
+ TargetAddress = "",
TaskType = TaskTypeEnum.InProduct.ObjToInt(),
TaskStatus = TaskStatusEnum.New.ObjToInt(),
WarehouseId = warehouse.WarehouseId,
PalletType = proStockInfo.PalletType
};
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
-
_unitOfWorkManage.BeginTran();
int taskId = BaseDal.AddData(newTask);
newTask.TaskId = taskId;
- _basicRepository.LocationInfoRepository.UpdateData(locationInfo);
Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand();
Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
_unitOfWorkManage.CommitTran();
@@ -1069,6 +1065,7 @@
}
return content;
}
+ //澶栧寘淇℃伅鎺ユ敹
public MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel)
{
MesResponseContent content = new MesResponseContent();
--
Gitblit v1.9.3