From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 92d02fb..af36c1b 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"
@@ -258,7 +258,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_TestToolSync.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_MaterialLotaAcept.ToString());
MESRoot<MesMaterialLotaAceptModel> root = new MESRoot<MesMaterialLotaAceptModel>()
{
From = "WMS",
@@ -438,7 +438,7 @@
PalletCode = model.CarrierCode,
PalletType = palletTypeInfo.PalletType,
WarehouseId = warehouse.WarehouseId,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt()
+ StockStatus = StockStatusEmun.MES閫�搴�.ObjToInt()
};
Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.BatchNo == model.MaterialLot && x.MaterielCode == model.MaterialCode);
@@ -455,27 +455,27 @@
OutboundQuantity = 0,
SerialNumber = stockInfoDetail_Hty?.SerialNumber ?? "0",
StockQuantity = model.Quantity,
- Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
+ Status = StockStatusEmun.MES閫�搴�.ObjToInt(),
Unit = model.Unit
};
- Dt_Task task = new Dt_Task()
- {
- PalletCode = stockInfo.PalletCode,
- CurrentAddress = "",
- NextAddress = "",
- PalletType = stockInfo.PalletType,
- Roadway = "",
- SourceAddress = "",
- TargetAddress = "",
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- TaskType = TaskTypeEnum.MesMatReturn.ObjToInt(),
- WarehouseId = warehouse.WarehouseId
- };
+ //Dt_Task task = new Dt_Task()
+ //{
+ // PalletCode = stockInfo.PalletCode,
+ // CurrentAddress = "",
+ // NextAddress = "",
+ // PalletType = stockInfo.PalletType,
+ // Roadway = "RGV01_BC",
+ // SourceAddress = "RGV01_BC",
+ // TargetAddress = "",
+ // TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ // TaskType = TaskTypeEnum.MesMatReturn.ObjToInt(),
+ // WarehouseId = warehouse.WarehouseId
+ //};
_unitOfWorkManage.BeginTran();
Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
- BaseDal.AddData(task);
+ //BaseDal.AddData(task);
_unitOfWorkManage.CommitTran();
return MesResponseContent.Instance.OK();
--
Gitblit v1.9.3