diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
index 69d95c77..f6c5ca72 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
@@ -5,123 +5,123 @@ public class ModuleConsts
public const string Tag = "WarehouseMgr";
public const string Area = "wms";
///
- /// 任务操作-PDA异常取消
+ /// 模块标识-PDA异常取消
///
public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
///
- /// 任务操作-PDA异常重新执行
+ /// 模块标识-PDA异常重新执行
///
public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
///
- /// 任务操作-PDA异常完成
+ /// 模块标识-PDA异常完成
///
public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
///
- /// 任务操作-PDA投料操作
+ /// 模块标识-PDA投料操作
///
public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
///
- /// 任务操作-PDA绑定操作
+ /// 模块标识-PDA绑定操作
///
public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
///
- /// 任务操作-PDA载具解绑
+ /// 模块标识-PDA载具解绑
///
public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
///
- /// 任务操作-PDA载具绑定
+ /// 模块标识-PDA载具绑定
///
public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
///
- /// 任务操作-PDA载具移出
+ /// 模块标识-PDA载具移出
///
public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
///
- /// 任务操作-PDA载具移入
+ /// 模块标识-PDA载具移入
///
public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
///
- /// 任务操作-PDA载具更换
+ /// 模块标识-PDA载具更换
///
public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
///
- /// 任务操作-PDA配送申请
+ /// 模块标识-PDA配送申请
///
public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
///
- /// 任务操作-PDA库内转移
+ /// 模块标识-PDA库内转移
///
public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
///
- /// 任务操作-PDA寄存捆包
+ /// 模块标识-PDA寄存捆包
///
public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
///
- /// 任务操作-PDA寄存入库
+ /// 模块标识-PDA寄存入库
///
public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
///
- /// 任务操作-PDA齐套入库
+ /// 模块标识-PDA齐套入库
///
public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
///
- /// 任务操作-PDA一般入库
+ /// 模块标识-PDA一般入库
///
public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
///
- /// 任务操作-寄存出库
+ /// 模块标识-寄存出库
///
public const string MODULE_WMSOUTBALE_ID = "26192638001445";
///
- /// 任务操作-寄存捆包
+ /// 模块标识-寄存捆包
///
public const string MODULE_WMSINBALE_ID = "26192480520485";
///
- /// 任务操作-出库申请
+ /// 模块标识-出库申请
///
public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
///
- /// 任务操作-入库申请
+ /// 模块标识-入库申请
///
public const string MODULE_WMSINSTOCK_ID = "26191326300453";
///
- /// 任务操作-载具更换
+ /// 模块标识-载具更换
///
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
///
- /// 任务操作-齐套分拣
+ /// 模块标识-齐套分拣
///
public const string MODULE_WMSSETSORTING_ID = "26172520979237";
///
- /// 任务操作-齐套出库
+ /// 模块标识-齐套出库
///
public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
///
- /// 任务操作-齐套入库
+ /// 模块标识-齐套入库
///
public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
///
- /// 任务操作-配送申请
+ /// 模块标识-配送申请
///
public const string MODULE_WMSDELIVERY_ID = "26126388337189";
///
- /// 任务操作-库内转移
+ /// 模块标识-库内转移
///
public const string MODULE_WMSTRANSFER_ID = "26125750270757";
///
- /// 任务操作-载具移出
+ /// 模块标识-载具移出
///
public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
///
- /// 任务操作-空载具出库
+ /// 模块标识-空载具出库
///
public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
///
- /// 任务操作-载具移入
+ /// 模块标识-载具移入
///
public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
///
- /// 任务操作-空载具入库
+ /// 模块标识-空载具入库
///
public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs
new file mode 100644
index 00000000..e09709c2
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells.Drawing;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Extension;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+ ///
+ /// 配送申请服务
+ ///
+ [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+ [Route("api/[area]/[controller]/[action]")]
+ [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERYPDA_ID)]
+ [ServiceModule(BizTypeId)]
+ public class PdaWmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
+ {
+ private const string BizTypeId = "26125644258853";
+ private readonly ISqlSugarClient _db;
+ private readonly IRunService _runService;
+ private readonly IVisualDevService _visualDevService;
+ private readonly IBasLocationService _basLocationService;
+ private readonly IWareHouseService _wareHouseService;
+ private readonly IBillRullService _billRullService;
+ private readonly IUserManager _userManager;
+ public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+ public PdaWmsDeliveryService(
+ ISqlSugarRepository repository,
+ IRunService runService,
+ IVisualDevService visualDevService,
+ IBasLocationService basLocationService
+ )
+ {
+ _db = repository.AsSugarClient();
+ _runService = runService;
+ _visualDevService = visualDevService;
+ _basLocationService = basLocationService;
+ //OverideFuncs.CreateAsync = Create;
+ }
+ ///
+ /// 根据载具编号获取起始库位点
+ ///
+ ///
+ ///
+ [HttpGet]
+ public async Task GetUnStoreLocationListByCarryId([FromRoute] string carryId)
+ {
+ var items = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id)
+ .Where(a => a.id == carryId)
+ .Select((a, b) => new
+ {
+ carry_code = a.carry_code,
+ location_code = b.location_code,
+ })
+ .ToListAsync();
+ return items;
+ }
+
+ private async Task Create(VisualDevModelDataCrInput input)
+ {
+ try
+ {
+ //startlocation_id
+ //endlocation_id
+ string startLocationId = "", endLocationId = "";
+ if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)))
+ {
+ startLocationId = input.data[nameof(WmsDelivery.startlocation_id)]?.ToString()!;
+ }
+ if (input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)))
+ {
+ endLocationId = input.data[nameof(WmsDelivery.endlocation_id)]?.ToString()!;
+ }
+ var locIds = new[] { startLocationId, endLocationId };
+ var locs = await _basLocationService.GetLocationInfobyIds(locIds);
+ if (locs?.Count > 0)
+ {
+ var isStoreLoc = locs.Where(x => !x.IsNullOrEmpty()).Select(x => x.is_type.ParseToInt()).Any(x => x == (int)EnumLocationType.存储库位);
+ if (isStoreLoc) throw new AppFriendlyException("起始库位不能为存储库位", 500);
+ }
+ VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSDELIVERYPDA_ID, true);
+ await _runService.Create(templateEntity, input);
+
+ // 计算路径，插入预任务申请
+ WmsPointH sPoint = null;
+ WmsPointH ePoint = null;
+ if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)))
+ {
+ sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+ }
+ if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+ {
+ ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+ }
+
+ if (sPoint != null && ePoint != null)
+ {
+ var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
+ //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+ if (points?.Count > 0)
+ {
+ if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
+ var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
+ {
+ var sPoint = it.FirstOrDefault();
+ var ePoint = it.LastOrDefault();
+
+ WmsPretaskH preTask = new();
+ preTask.org_id = _userManager.User.OrganizeId;
+ preTask.startlocation_id = sPoint?.location_id;
+ preTask.startlocation_code = sPoint?.location_code;
+ preTask.endlocation_id = ePoint?.location_id;
+ preTask.endlocation_code = ePoint?.location_code;
+ preTask.start_floor = sPoint?.floor.ToString();
+ preTask.end_floor = ePoint?.floor.ToString();
+ preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
+ preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID;
+ preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID;
+ preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
+ preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
+ preTask.area_id = sPoint?.area_id;
+ preTask.area_code = it.Key;
+ preTask.require_id = input.data["ReturnIdentity"].ToString();
+ preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
+ preTask.create_id = _userManager.UserId;
+ preTask.create_time = DateTime.Now;
+ return preTask;
+ }).ToList();
+ var isOk = await _wareHouseService.GenPreTask(preTasks);
+ if (isOk)
+ {
+ //不需要插入操作表
+ /* var preTaskUpInput = new GenPreTaskUpInput();
+ preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+ preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+ preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+ preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+ preTaskUpInput.PreTaskRecords = preTasks.Adapt>();
+ preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+ await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+ }
+ }
+
+ }
+
+ await _db.Ado.CommitTranAsync();
+ }
+ catch (Exception)
+ {
+ return await Task.FromResult(false);
+ }
+ return await Task.FromResult(true);
+ }
+ }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs
new file mode 100644
index 00000000..49bdd59d
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Security;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Interfaces;
+namespace Tnb.WarehouseMgr
+{
+
+ ///
+ /// 库内转移
+ ///
+ [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)]
+ [ServiceModule(BizTypeId)]
+ public class PdaWmsTransferService : BaseWareHouseService
+ {
+ private const string BizTypeId = "26585291847957";
+ private readonly ISqlSugarClient _db;
+ private readonly IRunService _runService;
+ private readonly IVisualDevService _visualDevService;
+ private readonly IWareHouseService _wareHouseService;
+ private readonly IBillRullService _billRullService;
+ private readonly IUserManager _userManager;
+ public PdaWmsTransferService(
+ ISqlSugarRepository repository,
+ IRunService runService,
+ IVisualDevService visualDevService,
+ IWareHouseService wareHouseService,
+ IUserManager userManager,
+ IBillRullService billRullService)
+ {
+ _db = repository.AsSugarClient();
+ _runService = runService;
+ _visualDevService = visualDevService;
+ _wareHouseService = wareHouseService;
+ _userManager = userManager;
+ _billRullService = billRullService;
+ OverideFuncs.CreateAsync = CarryTransfer;
+ }
+
+ private async Task CarryTransfer(VisualDevModelDataCrInput input)
+ {
+
+ try
+ {
+ await _db.Ado.BeginTranAsync();
+
+ VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true);
+ await _runService.Create(templateEntity, input);
+ // 计算路径，插入预任务申请
+ WmsPointH sPoint = null;
+ WmsPointH ePoint = null;
+ if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id)))
+ {
+ sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+ }
+ if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+ {
+ ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+ }
+
+ if (sPoint != null && ePoint != null)
+ {
+ var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
+ //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+ if (points?.Count > 0)
+ {
+ if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
+ var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
+ {
+ var sPoint = it.FirstOrDefault();
+ var ePoint = it.LastOrDefault();
+
+ WmsPretaskH preTask = new();
+ preTask.org_id = _userManager.User.OrganizeId;
+ preTask.startlocation_id = sPoint?.location_id;
+ preTask.startlocation_code = sPoint?.location_code;
+ preTask.endlocation_id = ePoint?.location_id;
+ preTask.endlocation_code = ePoint?.location_code;
+ preTask.start_floor = sPoint?.floor.ToString();
+ preTask.end_floor = ePoint?.floor.ToString();
+ preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
+ preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID;
+ preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID;
+ preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
+ preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
+ preTask.area_id = sPoint?.area_id;
+ preTask.area_code = it.Key;
+ preTask.require_id = input.data["ReturnIdentity"].ToString();
+ preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
+ preTask.create_id = _userManager.UserId;
+ preTask.create_time = DateTime.Now;
+ return preTask;
+ }).ToList();
+ var isOk = await _wareHouseService.GenPreTask(preTasks);
+ if (isOk)
+ {
+ //不需要插入操作表
+ /* var preTaskUpInput = new GenPreTaskUpInput();
+ preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+ preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+ preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+ preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+ preTaskUpInput.PreTaskRecords = preTasks.Adapt>();
+ preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+ await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+ }
+ }
+
+ }
+
+ await _db.Ado.CommitTranAsync();
+ }
+ catch (Exception ex)
+ {
+ await _db.Ado.RollbackTranAsync();
+ throw;
+ }
+ return Task.FromResult(true);
+ }
+
+ public override async Task ModifyAsync(WareHouseUpInput input)
+ {
+ if (input == null) throw new ArgumentNullException(nameof(input));
+ var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+ if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+ }
+ }
+
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
index 8545386c..82fff8ec 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
@@ -34,7 +35,7 @@ namespace Tnb.WarehouseMgr
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERY_ID)]
[ServiceModule(BizTypeId)]
- public class WmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
+ public class WmsDeliveryService : BaseWareHouseService,IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
{
private const string BizTypeId = "26125644258853";
private readonly ISqlSugarClient _db;
@@ -136,7 +137,7 @@ namespace Tnb.WarehouseMgr
preTask.end_floor = ePoint?.floor.ToString();
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
- preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID;
preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID;
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
@@ -174,5 +175,11 @@ namespace Tnb.WarehouseMgr
}
return await Task.FromResult(true);
}
+ public override async Task ModifyAsync(WareHouseUpInput input)
+ {
+ if (input == null) throw new ArgumentNullException(nameof(input));
+ var isOk = await _db.Updateable().SetColumns(it => new WmsDelivery { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+ if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+ }
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
index bcd69b27..772127de 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
///
/// 库内转移
///
- [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)]
+ [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)]
[ServiceModule(BizTypeId)]
public class WmsTransferService : BaseWareHouseService
{
@@ -64,7 +64,7 @@ namespace Tnb.WarehouseMgr
{
await _db.Ado.BeginTranAsync();
- VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true);
+ VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true);
await _runService.Create(templateEntity, input);
// 计算路径，插入预任务申请
WmsPointH sPoint = null;
@@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr
public override async Task ModifyAsync(WareHouseUpInput input)
{
if (input == null) throw new ArgumentNullException(nameof(input));
- var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+ var isOk = await _db.Updateable().SetColumns(it => new WmsTransfer { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}
}