wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
张涛
2023-06-20 20:18:30 +08:00
parent 99d89cc12d 9eca3d558e
commit 4ad5cca7ab
28 changed files with 608 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BasicData/Tnb.BasicData.Entities/Dto/SubBomListOutput.cs
View File

@@ -64,5 +64,10 @@ namespace Tnb.BasicData.Entities.Dto
/// 工序排序序号 /// 工序排序序号
/// </summary> /// </summary>
public long? ordinal { get; set; } public long? ordinal { get; set; }
/// <summary>
/// 生产bom工序id
/// </summary>
public string? mbom_process_id { get; set; }
} }
} }

5
BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
View File

@@ -248,5 +248,10 @@ public partial class BasMaterial : BaseEntity<string>
/// 是否包含入库数 /// 是否包含入库数
/// </summary> /// </summary>
public int? is_contain_into_num { get; set; } public int? is_contain_into_num { get; set; }
/// <summary>
/// 是否创建子工单
/// </summary>
public string? is_create_sub_work_order { get; set; }
} }

13
BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs
View File

@@ -4,6 +4,19 @@ namespace Tnb.BasicData.Interfaces
{ {
public interface IBasMaterialService public interface IBasMaterialService
{ {
/// <summary>
/// 获取本物料清单及其所有子集物料信息
/// </summary>
/// <param name="queryInput"></param>
/// <returns></returns>
public Task<dynamic> GetMaterialSelectInfo(MaterialSelectQueryInput queryInput); public Task<dynamic> GetMaterialSelectInfo(MaterialSelectQueryInput queryInput);
/// <summary>
/// 获取可创建子工单的物料
/// </summary>
/// <param name="queryInput"></param>
/// <returns></returns>
public Task<dynamic> GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput);
} }
} }

32
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -128,6 +128,38 @@ namespace Tnb.BasicData
} }
} }
[HttpPost]
public async Task<dynamic> GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput)
{
var db = _repository.AsSugarClient();
if (!string.IsNullOrEmpty(queryInput.ebom_id))
{
List<string> ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0);
var result = await db.Queryable<BasMaterial>()
.LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
.WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
.WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id))
.Where((a,b,c)=>a.is_create_sub_work_order=="1")
.Select((a, b, c) => new MaterialSelectOutput()
{
id = a.id,
code = a.code,
name = a.name,
descrip = a.descrip,
unit_id = a.unit_id,
unit_name = c.FullName,
}).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);
}
else
{
return PageResult<MaterialSelectOutput>.SqlSugarPageResult(new SqlSugarPagedList<MaterialSelectOutput>());
}
}
/// <summary> /// <summary>
/// 获取物料清单下所子集物料id /// 获取物料清单下所子集物料id
/// </summary> /// </summary>

121
PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -4,125 +4,4 @@ public class ModuleConsts
{ {
public const string Tag = "PerMgr"; public const string Tag = "PerMgr";
public const string Area = "per"; public const string Area = "per";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣ȡ<ECB3A3><C8A1>
/// </summary>
public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>
/// </summary>
public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAͶ<41>ϲ<EFBFBD><CFB2><EFBFBD>
/// </summary>
public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>󶨲<EFBFBD><F3B6A8B2><EFBFBD>
/// </summary>
public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߽<D8BE><DFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߰<D8BE><DFB0><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߸<D8BE><DFB8><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
/// </summary>
public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAһ<41><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSOUTBALE_ID = "26192638001445";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALE_ID = "26192480520485";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINSTOCK_ID = "26191326300453";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ߸<D8BE><DFB8><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׷ּ<D7B7>
/// </summary>
public const string MODULE_WMSSETSORTING_ID = "26172520979237";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׳<EFBFBD><D7B3><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSDELIVERY_ID = "26126388337189";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
/// </summary>
public const string MODULE_WMSTRANSFER_ID = "26125750270757";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ߳<D8BE><DFB3><EFBFBD>
/// </summary>
public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
} }

20
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs
View File

@@ -53,5 +53,25 @@ public partial class PrdFeedingD : BaseEntity<string>
/// 物料签收单子表id /// 物料签收单子表id
/// </summary> /// </summary>
public string? material_receipt_detail_id { get; set; } public string? material_receipt_detail_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 状态 0 未消耗 1 部分消耗 2 消耗完
/// </summary>
public string? status { get; set; }
/// <summary>
/// 使用数量
/// </summary>
public decimal use_num { get; set; } = 0;
} }

5
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs
View File

@@ -177,4 +177,9 @@ public partial class PrdMoTask : BaseEntity<string>
/// 工序id /// 工序id
/// </summary> /// </summary>
public string process_id { get; set; } public string process_id { get; set; }
/// <summary>
/// 生产bom工序id
/// </summary>
public string? mbom_process_id { get; set; }
} }

2
ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
View File

@@ -91,6 +91,8 @@ namespace Tnb.ProductionMgr
batch = item["batch"], batch = item["batch"],
unit_id = item["unit_id"], unit_id = item["unit_id"],
carry_id = input.carry_id, carry_id = input.carry_id,
status = "0",
use_num = 0,
}); });
if (detail != null) if (detail != null)

79
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -39,6 +39,7 @@ using System.Dynamic;
using Tnb.EquipMgr.Entities.Dto; using Tnb.EquipMgr.Entities.Dto;
using JNPF.Common.Filter; using JNPF.Common.Filter;
using JNPF.Systems.Entitys.System; using JNPF.Systems.Entitys.System;
using Microsoft.ClearScript.Util.Web;
using Newtonsoft.Json; using Newtonsoft.Json;
using Tnb.BasicData.Entities.Dto; using Tnb.BasicData.Entities.Dto;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
@@ -369,7 +370,8 @@ namespace Tnb.ProductionMgr
workline_code = b.EnCode, workline_code = b.EnCode,
workline_name = b.FullName, workline_name = b.FullName,
mo_task_status = a.mo_task_status, mo_task_status = a.mo_task_status,
scheduled_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(it => it.mo_id == a.mo_id).Sum(it => it.scheduled_qty), // scheduled_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(it => it.mo_id == a.mo_id).Sum(it => it.scheduled_qty),
scheduled_qty = a.scheduled_qty,
plan_qty = SqlFunc.Subqueryable<PrdMo>().Where(it => it.id == a.mo_id).Select(it => it.plan_qty), plan_qty = SqlFunc.Subqueryable<PrdMo>().Where(it => it.id == a.mo_id).Select(it => it.plan_qty),
estimated_start_date = a.estimated_start_date, estimated_start_date = a.estimated_start_date,
estimated_end_date = a.estimated_end_date, estimated_end_date = a.estimated_end_date,
@@ -824,6 +826,7 @@ namespace Tnb.ProductionMgr
material_id = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.id), material_id = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.id),
num = e.num, num = e.num,
ordinal = d.ordinal, ordinal = d.ordinal,
mbom_process_id = b.id,
}) })
.Mapper(it => it.output_qty = it.num.ParseToInt()) .Mapper(it => it.output_qty = it.num.ParseToInt())
.ToListAsync(); .ToListAsync();
@@ -839,6 +842,7 @@ namespace Tnb.ProductionMgr
subMoTask.parent_id = moTask.id; subMoTask.parent_id = moTask.id;
subMoTask.bom_id = input.bom_id; subMoTask.bom_id = input.bom_id;
subMoTask.process_id = item.process_id; subMoTask.process_id = item.process_id;
subMoTask.mbom_process_id = item.mbom_process_id;
subMoTask.mo_task_status = DictConst.ToBeScheduledEncode; subMoTask.mo_task_status = DictConst.ToBeScheduledEncode;
subMoTask.workroute_id = item.route_id; subMoTask.workroute_id = item.route_id;
subMoTask.workline_id = input.workline_id; subMoTask.workline_id = input.workline_id;
@@ -1229,7 +1233,80 @@ namespace Tnb.ProductionMgr
await db.Updateable(master).ExecuteCommandAsync(); await db.Updateable(master).ExecuteCommandAsync();
} }
//扣除生产投料 按最先投入的依次扣除
List<PrdFeedingD> prdFeedingDs = await db.Queryable<PrdFeedingH>()
.LeftJoin<PrdFeedingD>((a,b)=>a.id==b.feeding_id)
.Where((a,b) => a.workline_id == prdMoTask.workline_id && (b.status=="0" || b.status=="1"))
.OrderBy((a,b) => b.create_time)
.Select((a,b)=>b)
.ToListAsync();
if (prdFeedingDs != null && prdFeedingDs.Count>0)
{
BasMbom basMbom = await db.Queryable<BasMbom>().SingleAsync(x => x.id == prdMoTask.bom_id);
List<BasMbomInput> basMbomInputs = await db.Queryable<BasMbomInput>().Where(x =>
x.mbom_id == prdMoTask.bom_id && x.mbom_process_id == prdMoTask.mbom_process_id).ToListAsync();
foreach (var item in basMbomInputs)
{
var details = prdFeedingDs.Where(x => x.material_id == item.material_id).OrderBy(x=>x.create_time).ToList();
if (details?.Count>0)
{
decimal deductNum = input.reported_qty * item.num / basMbom.num;
decimal? notUseNum = details.Sum(x => x.num - x.use_num);
if (notUseNum > deductNum)
{
foreach (var detail in details)
{
if (deductNum - (detail.num - detail.use_num) < 0)
{
await db.Updateable<PrdFeedingD>().SetColumns(x => x.use_num == x.use_num+deductNum)
.SetColumns(x=>x.status=="1")
.Where(x => x.id == detail.id).ExecuteCommandAsync();
}
else
{
await db.Updateable<PrdFeedingD>().SetColumns(x => x.use_num == x.num)
.SetColumns(x=>x.status=="2")
.Where(x => x.id == detail.id).ExecuteCommandAsync();
}
deductNum = deductNum - (detail.num - detail.use_num);
}
if (deductNum > 0)
{
throw new Exception("投入物料不足");
}
}
else if(notUseNum == deductNum)
{
foreach (var detail in details)
{
db.Updateable<PrdFeedingD>().SetColumns(x => x.use_num == x.num)
.SetColumns(x=>x.status=="2")
.Where(x => x.id == detail.id);
}
}
else
{
throw new Exception("投入物料不足");
}
}
}
}
}); });
if (!result.IsSuccess) throw Oops.Bah(result.ErrorMessage);
return result.IsSuccess; return result.IsSuccess;
} }

3
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -69,7 +69,8 @@ namespace Tnb.ProductionMgr
plan_start_date = a.estimated_start_date, plan_start_date = a.estimated_start_date,
plan_end_date = a.estimated_end_date, plan_end_date = a.estimated_end_date,
plan_qty = c.plan_qty, plan_qty = c.plan_qty,
complete_qty = SqlFunc.Subqueryable<PrdReport>().Where(it => it.mo_task_code == a.mo_task_code).Sum(it => it.reported_work_qty), // complete_qty = SqlFunc.Subqueryable<PrdReport>().Where(it => it.mo_task_code == a.mo_task_code).Sum(it => it.reported_work_qty),
complete_qty = a.reported_work_qty+a.scrap_qty,
mo_task_status = a.mo_task_status, mo_task_status = a.mo_task_status,
}) })

9
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -94,9 +94,16 @@ public class ModuleConsts
/// </summary> /// </summary>
public const string MODULE_WMSINSTOCK_ID = "26191326300453"; public const string MODULE_WMSINSTOCK_ID = "26191326300453";
/// <summary> /// <summary>
/// 模块标识-载具解绑
public const string MODULE_WMSCARRYUNBIND_ID = "26106270092325";
/// <summary>
/// 模块标识-载具绑定
/// </summary>
public const string MODULE_WMSCARRYBIND_ID = "26105163614501";
/// <summary>
/// 模块标识-载具更换 /// 模块标识-载具更换
/// </summary> /// </summary>
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557
/// <summary> /// <summary>
/// 模块标识-齐套分拣 /// 模块标识-齐套分拣
/// </summary> /// </summary>

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs
View File

@@ -28,6 +28,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// 任务执行条码表 /// 任务执行条码表
/// </summary> /// </summary>
public List<WmsDistaskCode> distaskCodes { get; set; } public List<WmsDistaskCode> distaskCodes { get; set; }
/// <summary>
/// 载具
/// </summary>
public List<String> carryIds { get; set; }

6
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -433,10 +433,10 @@ namespace Tnb.WarehouseMgr
//更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位 //更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位
if (disTasks?.Count > 0) if (disTasks?.Count > 0)
{ {
var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList(); var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id, it.endlocation_code)).ToList();
for (int i = 0; i < multiList.Count; i++) for (int i = 0; i < multiList.Count; i++)
{ {
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync(); await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id, location_code = multiList[i].endlocation_code }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
} }
} }
//更新库位信息，使用状态为 使用，锁定状态为未锁定 //更新库位信息，使用状态为 使用，锁定状态为未锁定
@@ -459,7 +459,7 @@ namespace Tnb.WarehouseMgr
foreach (var dt in disTasks) foreach (var dt in disTasks)
{ {
var disTaskCodes = await _db.Queryable<WmsDistaskCode>().Where(it => it.bill_id == dt.id).ToListAsync(); var disTaskCodes = await _db.Queryable<WmsDistaskCode>().Where(it => it.bill_id == dt.id).ToListAsync();
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id, distaskCodes = disTaskCodes }; var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id, distaskCodes = disTaskCodes, carryIds = disTasks.Select(x => x.carry_id).ToList() };
upInput.loginType = !_userManager.LoginType.IsNullOrEmpty() ? "app" : "web"; upInput.loginType = !_userManager.LoginType.IsNullOrEmpty() ? "app" : "web";
if (dt.is_sign == 1) //区分出入库操作 if (dt.is_sign == 1) //区分出入库操作
{ {

35
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具绑定 /// 载具绑定
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBIND_ID)]
public class WmsCarryBindService : BaseWareHouseService public class WmsCarryBindService : BaseWareHouseService
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
@@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -67,18 +67,21 @@ namespace Tnb.WarehouseMgr
var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId); var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
WmsCarrybindH wmsCarrybindH = carry.Adapt<WmsCarrybindH>(); WmsCarryD wmsCarryD = new()
{
id = SnowflakeIdHelper.NextId(),
carry_id = carry.id,
org_id = carry?.org_id!,
membercarry_id = subCarry.id,
membercarry_code = subCarry.carry_code,
loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
//WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
wmsCarrybindH.id = SnowflakeIdHelper.NextId(); var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
wmsCarrybindH.org_id = carry.org_id;
wmsCarrybindH.carry_id = carry.id;
wmsCarrybindH.membercarry_id = subCarry.id;
wmsCarrybindH.membercarry_code = subCarry.carry_code;
wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1);
wmsCarrybindH.create_id = _userManager.UserId;
wmsCarrybindH.create_time = DateTime.Now;
var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
carry.carry_status = "1"; carry.carry_status = "1";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "1"; subCarry.carry_status = "1";
@@ -88,15 +91,15 @@ namespace Tnb.WarehouseMgr
{ {
WmsCarrybindCode wmsCarrybindCode = new(); WmsCarrybindCode wmsCarrybindCode = new();
wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); wmsCarrybindCode.id = SnowflakeIdHelper.NextId();
wmsCarrybindCode.org_id = subCarry.id; wmsCarrybindCode.org_id = subCarry?.org_id!;
wmsCarrybindCode.carrybind_id = wmsCarrybindH.id; wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarrybindCode.material_id = items[i].material_id; wmsCarrybindCode.material_id = items[i].material_id;
wmsCarrybindCode.material_code = items[i].material_code; wmsCarrybindCode.material_code = items[i].material_code;
wmsCarrybindCode.barcode = items[i].barcode; wmsCarrybindCode.barcode = items[i].barcode;
wmsCarrybindCode.code_batch = items[i].code_batch; wmsCarrybindCode.code_batch = items[i].code_batch;
wmsCarrybindCode.codeqty = items[i].codeqty; wmsCarrybindCode.codeqty = items[i].codeqty;
wmsCarrybindCode.membercarry_id = subCarry.id; wmsCarrybindCode.membercarry_id = subCarry?.id;
wmsCarrybindCode.membercarry_code = subCarry.carry_code; wmsCarrybindCode.membercarry_code = subCarry?.carry_code;
wmsCarrybindCode.unit_id = items[i].unit_id; wmsCarrybindCode.unit_id = items[i].unit_id;
wmsCarrybindCode.unit_code = items[i].unit_code; wmsCarrybindCode.unit_code = items[i].unit_code;
wmsCarrybindCode.create_id = _userManager.UserId; wmsCarrybindCode.create_id = _userManager.UserId;

175
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs
View File

@@ -1,175 +0,0 @@
using JNPF.Common.Contracts;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.Common.Utils;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 载具服务
/// </summary>
[OverideVisualDev(ModuleId)]
public class WmsCarryReplaceService : BaseWareHouseService, IWmsCarryService
{
private const string ModuleId = "26188532491557";
private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsCarryReplaceService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_userManager = userManager;
_billRullService = billRullService;
OverideFuncs.CreateAsync = CarryReplace;
}
/// <summary>
/// 更换载具
/// </summary>
/// <param name="input">
/// 输入参数:
/// <br/>{
/// <br/> old_carry_id:老载具id
/// <br/> new_carry_id：新载具ID
/// <br/>}
/// </param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
[HttpPost]
public async Task<dynamic> CarryReplace(VisualDevModelDataCrInput input)
{
var isOk = false;
try
{
await _db.Ado.BeginTranAsync();
var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == oldCarryId);
var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == newCarryId);
if (oldCarry != null && newCarry != null)
{
ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id };
isOk = await _updateSubCarry<WmsCarryD>(carryInput);
isOk = await _updateSubCarry<WmsCarryMat>(carryInput);
isOk = await _updateSubCarry<WmsCarryCode>(carryInput);
newCarry.status = oldCarry.status;
newCarry.carry_status = oldCarry.carry_status;
newCarry.location_id = oldCarry.location_id;
newCarry.location_code = oldCarry.location_code;
newCarry.is_lock = oldCarry.is_lock;
newCarry.out_status = oldCarry.out_status;
newCarry.is_check = oldCarry.is_check;
newCarry.bale_num = oldCarry.bale_num;
newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id;
newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code;
newCarry.source_id = oldCarry.source_id;
newCarry.source_code = oldCarry.source_code;
newCarry.create_id = _userManager.UserId;
newCarry.create_time = DateTime.Now;
var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
wmsCarryReplaceH.id = SnowflakeIdHelper.NextId();
wmsCarryReplaceH.org_id = oldCarry.org_id;
wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE);
wmsCarryReplaceH.carry_id = oldCarry.id;
wmsCarryReplaceH.carry_code = oldCarry.carry_code;
wmsCarryReplaceH.newcarry_id = newCarry.id;
wmsCarryReplaceH.newcarry_code = newCarry.carry_code;
row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();
row = await UpdateNullCarry(oldCarry);
isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}
else
{
if (oldCarry == null)
{
throw new AppFriendlyException("没有可用的旧载具", 500);
}
if (newCarry == null)
{
throw new AppFriendlyException("没有可用的新载具", 500);
}
}
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)
{
Log.Error("载具更换失败", ex);
await _db.Ado.RollbackTranAsync();
throw;
}
return isOk;
}
public async Task<int> UpdateNullCarry(WmsCarryH carryObj)
{
var row = -1;
try
{
carryObj.status = 0;
carryObj.carry_status = "0";
carryObj.location_id = null;
carryObj.location_code = null;
carryObj.out_status = "0";
carryObj.is_check = 0;
carryObj.status = 1;
carryObj.bale_num = null;
carryObj.collocation_scheme_id = null;
carryObj.collocation_scheme_code = null;
carryObj.source_id = null;
carryObj.source_code = null;
row = await _db.Updateable(carryObj).ExecuteCommandAsync();
}
catch (Exception ex)
{
}
return row;
}
private async Task<bool> _updateSubCarry<T>(ExChangeCarryInput input) where T : BaseEntity<string>, IWmsCarryEntity, new()
{
var row = -1;
var items = await _db.Queryable<T>().Where(it => it.carry_id == input.old_carry_id).ToListAsync();
if (items?.Count > 0)
{
List<T> newItems = DeepCopyHelper<T>.DeepCopyList(items);
if (newItems?.Count > 0)
{
newItems.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
x.carry_id = input.new_carry_id;
});
row = await _db.Insertable(newItems).ExecuteCommandAsync();
}
if (row > 0)
{
row = await _db.Deleteable(items).ExecuteCommandAsync();
}
}
return (row > 0);
}
}
}

7
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -24,14 +24,12 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具服务 /// 载具服务
/// </summary> /// </summary>
[OverideVisualDev(ModuleId)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)]
public class WmsCarryService : BaseWareHouseService, IWmsCarryService public class WmsCarryService : BaseWareHouseService, IWmsCarryService
{ {
private const string ModuleId = "26188532491557";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsCarryService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService) public WmsCarryService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
@@ -52,8 +50,7 @@ namespace Tnb.WarehouseMgr
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
[HttpPost] private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
public async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
{ {
var isOk = false; var isOk = false;
try try

26
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs
View File

@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具解绑 /// 载具解绑
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBIND_ID)]
public class WmsCarryUnbindService : BaseWareHouseService public class WmsCarryUnbindService : BaseWareHouseService
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
@@ -58,7 +58,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBIND_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -69,7 +69,27 @@ namespace Tnb.WarehouseMgr
//WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>(); //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync(); var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
WmsCarryunbindCode wmsCarryUnbindCode = new();
for (int i = 0; i < items.Count; i++)
{
wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId();
wmsCarryUnbindCode.org_id = subCarry?.org_id!;
wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarryUnbindCode.material_id = items[i].material_id;
wmsCarryUnbindCode.material_code = items[i].material_code;
wmsCarryUnbindCode.barcode = items[i].barcode;
wmsCarryUnbindCode.code_batch = items[i].code_batch;
wmsCarryUnbindCode.codeqty = items[i].codeqty;
wmsCarryUnbindCode.membercarry_id = subCarry?.id;
wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code;
wmsCarryUnbindCode.unit_id = items[i].unit_id;
wmsCarryUnbindCode.unit_code = items[i].unit_code;
wmsCarryUnbindCode.create_id = _userManager.UserId;
wmsCarryUnbindCode.create_time = DateTime.Now;
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
}
carry.carry_status = "0"; carry.carry_status = "0";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "0"; subCarry.carry_status = "0";

44
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
View File

@@ -88,12 +88,12 @@ namespace Tnb.WarehouseMgr
ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
} }
int i = 0; int i = 0;
//根据每个载具的起始库位做路径运算 //根据每个载具的起始库位做路径运算
for (i = 0; i < setQty.qty; i++) for (i = 0; i < setQty.qty; i++)
{ {
if (carrys?.Count > 0) if (carrys?.Count > 0)
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[i].location_id); sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[i].location_id);
var isOk = false; var isOk = false;
@@ -133,12 +133,12 @@ namespace Tnb.WarehouseMgr
}).ToList(); }).ToList();
//更新页面 //更新页面
//赋值签收状态 //赋值签收状态
if (loc.is_sign == 0) if (loc.is_sign == 0)
{ {
preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值 preTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
} }
isOk = await _wareHouseService.GenPreTask(preTasks, null); isOk = await _wareHouseService.GenPreTask(preTasks, null);
} }
if (isOk) if (isOk)
{ {
@@ -150,12 +150,12 @@ namespace Tnb.WarehouseMgr
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
//更新明细表 //更新明细表
WmsEmptyOutstockD wmsEmptyOutstockD = new (); WmsEmptyOutstockD wmsEmptyOutstockD = new();
wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId(); wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId();
wmsEmptyOutstockD.bill_id = input.data[nameof(WmsEmptyOutstockH.bill_code)]?.ToString()!; wmsEmptyOutstockD.bill_id = preTaskUpInput.RquireId;
wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID; wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID;
wmsEmptyOutstockD.location_id = ePoint.location_id; wmsEmptyOutstockD.location_id = ePoint.location_id;
wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_ON_ID;
wmsEmptyOutstockD.carry_id = carrys[i].id; wmsEmptyOutstockD.carry_id = carrys[i].id;
wmsEmptyOutstockD.carry_code = carrys[i].carry_code; wmsEmptyOutstockD.carry_code = carrys[i].carry_code;
wmsEmptyOutstockD.create_id = _userManager.UserId; wmsEmptyOutstockD.create_id = _userManager.UserId;
@@ -166,11 +166,11 @@ namespace Tnb.WarehouseMgr
//根据空载具出库Id，回更单据状态 //根据空载具出库Id，回更单据状态
await _db.Updateable<WmsEmptyOutstockH>().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); await _db.Updateable<WmsEmptyOutstockH>().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
it => new WmsCarryH { is_lock = 1}, it => new WmsCarryH { is_lock = 1 },
it => new BasLocation { is_lock = 1 }); it => new BasLocation { is_lock = 1 });
} }
} }
} }
await _db.Ado.CommitTranAsync(); await _db.Ado.CommitTranAsync();
@@ -186,8 +186,28 @@ namespace Tnb.WarehouseMgr
public async override Task ModifyAsync(WareHouseUpInput input) public async override Task ModifyAsync(WareHouseUpInput input)
{ {
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
var isOk = await _db.Updateable<WmsEmptyInstock>().SetColumns(it => new WmsEmptyInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); try
if (!isOk) throw Oops.Oh(ErrorCode.COM1001); {
await _db.Ado.BeginTranAsync();
//根据载具更新明细表状态
var isOk = await _db.Updateable<WmsEmptyOutstockD>().SetColumns(it => new WmsEmptyOutstockD { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.bill_id == input.requireId && input.carryIds.Contains(it.carry_id)).ExecuteCommandHasChangeAsync();
var emptyCarrys = await _db.Queryable<WmsEmptyOutstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
// 判断所有明细是否都完成
if (emptyCarrys?.Count > 0 && emptyCarrys.All(x => x.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
{
isOk = await _db.Updateable<WmsEmptyOutstockH>().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
}
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
await _db.Ado.CommitTranAsync();
}
catch (Exception)
{
await _db.Ado.RollbackTranAsync();
throw;
}
} }
} }
} }

11
WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs → WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
View File

@@ -24,15 +24,14 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具服务 /// 载具服务
/// </summary> /// </summary>
[OverideVisualDev(ModuleId)] [OverideVisualDev(ModuleConsts.MODULE_WMSBINDINGPDA_ID)]
public class WmsBindService : BaseWareHouseService, IWmsCarryService public class WmsPDABindService : BaseWareHouseService, IWmsCarryService
{ {
private const string ModuleId = "26496560237333"; //private const string ModuleId = "26496560237333";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsPDABindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
public WmsBindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
@@ -52,7 +51,7 @@ namespace Tnb.WarehouseMgr
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
public async Task<dynamic> WmsBind(VisualDevModelDataCrInput input) private async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
{ {
var isOk = false; var isOk = false;
try try

135
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs Normal file
View File

@@ -0,0 +1,135 @@
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 NPOI.SS.Formula;
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
{
/// <summary>
/// 载具绑定
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID)]
public class WmsPDACarryBindService : BaseWareHouseService
{
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService;
public WmsPDACarryBindService(
ISqlSugarRepository<WmsCarryH> repository,
IRunService runService,
IVisualDevService visualDevService,
IUserManager userManager,
IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_userManager = userManager;
_billRullService = billRullService;
OverideFuncs.CreateAsync = PDACarryBind;
}
private async Task<dynamic> PDACarryBind(VisualDevModelDataCrInput input)
{
var isOk = false;
try
{
await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID, true);
await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input));
var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
WmsCarryD wmsCarryD = new()
{
id = SnowflakeIdHelper.NextId(),
carry_id = carry.id,
org_id = carry?.org_id!,
membercarry_id = subCarry.id,
membercarry_code = subCarry.carry_code,
loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
//WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
if (carry != null && subCarry != null)
{
var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
carry.carry_status = "1";
row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "1";
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
for (int i = 0; i < items.Count; i++)
{
WmsCarrybindCode wmsCarrybindCode = new();
wmsCarrybindCode.id = SnowflakeIdHelper.NextId();
wmsCarrybindCode.org_id = subCarry?.org_id!;
wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarrybindCode.material_id = items[i].material_id;
wmsCarrybindCode.material_code = items[i].material_code;
wmsCarrybindCode.barcode = items[i].barcode;
wmsCarrybindCode.code_batch = items[i].code_batch;
wmsCarrybindCode.codeqty = items[i].codeqty;
wmsCarrybindCode.membercarry_id = subCarry?.id;
wmsCarrybindCode.membercarry_code = subCarry?.carry_code;
wmsCarrybindCode.unit_id = items[i].unit_id;
wmsCarrybindCode.unit_code = items[i].unit_code;
wmsCarrybindCode.create_id = _userManager.UserId;
wmsCarrybindCode.create_time = DateTime.Now;
row = await _db.Insertable(wmsCarrybindCode).ExecuteCommandAsync();
}
isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}
else
{
if (carry == null || subCarry == null)
{
throw new AppFriendlyException("没有可用的主载具", 500);
}
}
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<WmsCarryReplaceH>().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}*/
}
}

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
View File

@@ -26,9 +26,9 @@ using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
/// <summary> /// <summary>
/// 载具移入 /// 载具移出
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID)]
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsPDACarryMoveOutStockService : BaseWareHouseService, IPdaStroage public class WmsPDACarryMoveOutStockService : BaseWareHouseService, IPdaStroage
{ {
@@ -63,7 +63,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
//入库取终点 //入库取终点
//var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
View File

@@ -28,11 +28,9 @@ namespace Tnb.WarehouseMgr
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)]
public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage
{ {
//private const string ModuleId = "26188532491557";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsPDACarryReplaceService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService) public WmsPDACarryReplaceService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
@@ -53,8 +51,8 @@ namespace Tnb.WarehouseMgr
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
[HttpPost]
public async Task<dynamic> PDACarryReplace(VisualDevModelDataCrInput input) private async Task<dynamic> PDACarryReplace(VisualDevModelDataCrInput input)
{ {
var isOk = false; var isOk = false;
try try

128
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs Normal file
View File

@@ -0,0 +1,128 @@
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 NPOI.SS.Formula;
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
{
/// <summary>
/// 载具解绑
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID)]
public class WmsPDACarryUnbindService : BaseWareHouseService
{
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IUserManager _userManager;
private readonly IWareHouseService _wareHouseService;
public WmsPDACarryUnbindService(
ISqlSugarRepository<WmsCarryH> repository,
IRunService runService,
IVisualDevService visualDevService,
IWareHouseService wareHouseService,
IUserManager userManager)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_userManager = userManager;
_wareHouseService = wareHouseService;
OverideFuncs.CreateAsync = PDACarryUnbind;
}
private async Task<dynamic> PDACarryUnbind(VisualDevModelDataCrInput input)
{
var isOk = false;
try
{
await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID, true);
await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input));
var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == subCarryId);
//WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
if (carry != null && subCarry != null)
{
var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
WmsCarryunbindCode wmsCarryUnbindCode = new();
for (int i = 0; i < items.Count; i++)
{
wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId();
wmsCarryUnbindCode.org_id = subCarry?.org_id!;
wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarryUnbindCode.material_id = items[i].material_id;
wmsCarryUnbindCode.material_code = items[i].material_code;
wmsCarryUnbindCode.barcode = items[i].barcode;
wmsCarryUnbindCode.code_batch = items[i].code_batch;
wmsCarryUnbindCode.codeqty = items[i].codeqty;
wmsCarryUnbindCode.membercarry_id = subCarry?.id;
wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code;
wmsCarryUnbindCode.unit_id = items[i].unit_id;
wmsCarryUnbindCode.unit_code = items[i].unit_code;
wmsCarryUnbindCode.create_id = _userManager.UserId;
wmsCarryUnbindCode.create_time = DateTime.Now;
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
}
carry.carry_status = "0";
row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "0";
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}
else
{
if (carry == null)
{
throw new AppFriendlyException("没有可用的主载具", 500);
}
if (subCarry == null)
{
throw new AppFriendlyException("没有可用的子载具", 500);
}
}
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<WmsCarryReplaceH>().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
}*/
}
}

30
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 空载具出库 /// 空载具出库
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID)]
public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
/*//入库取终点 /*//入库取终点
@@ -151,7 +151,7 @@ namespace Tnb.WarehouseMgr
//更新明细表 //更新明细表
WmsEmptyOutstockD wmsEmptyOutstockD = new(); WmsEmptyOutstockD wmsEmptyOutstockD = new();
wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId(); wmsEmptyOutstockD.id = SnowflakeIdHelper.NextId();
wmsEmptyOutstockD.bill_id = input.data[nameof(WmsEmptyOutstockH.bill_code)]?.ToString()!; wmsEmptyOutstockD.bill_id = preTaskUpInput.RquireId;
wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID; wmsEmptyOutstockD.biz_type = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID;
wmsEmptyOutstockD.location_id = ePoint.location_id; wmsEmptyOutstockD.location_id = ePoint.location_id;
wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; wmsEmptyOutstockD.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
@@ -198,9 +198,29 @@ namespace Tnb.WarehouseMgr
public override async Task ModifyAsync(WareHouseUpInput input) public override async Task ModifyAsync(WareHouseUpInput input)
{ {
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
var isOk = await _db.Updateable<WmsEmptyInstock>().SetColumns(it => new WmsEmptyInstock { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); //根据载具更新明细表状态
if (!isOk) throw Oops.Oh(ErrorCode.COM1001); try
{
await _db.Ado.BeginTranAsync();
var isOk = await _db.Updateable<WmsEmptyOutstockD>().SetColumns(it => new WmsEmptyOutstockD { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.bill_id == input.requireId && input.carryIds.Contains(it.carry_id)).ExecuteCommandHasChangeAsync();
var emptyCarrys = await _db.Queryable<WmsEmptyOutstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
// 判断所有明细是否都完成
if (emptyCarrys?.Count > 0 && emptyCarrys.All(x => x.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
{
await _db.Updateable<WmsEmptyOutstockH>().SetColumns(it => new WmsEmptyOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
}
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
await _db.Ado.CommitTranAsync();
}
catch (Exception)
{
await _db.Ado.RollbackTranAsync();
throw;
}
} }
} }
} }

93
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
View File

@@ -11,6 +11,7 @@ using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev; using JNPF.VisualDev;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.Common.Utils; using Tnb.Common.Utils;
@@ -25,17 +26,16 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具服务 /// 载具服务
/// </summary> /// </summary>
[OverideVisualDev(ModuleId)] [OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)]
public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService
{ {
private const string ModuleId = "26188532491557"; //private const string ModuleId = "26496913096981";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly WmsCarryService _wmsCarryService; private readonly WmsCarryService _wmsCarryService;
private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>(); private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>();
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService, WmsCarryService wmsCarryService)
public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
@@ -43,60 +43,67 @@ namespace Tnb.WarehouseMgr
_wmsCarryService = wmsCarryService; _wmsCarryService = wmsCarryService;
OverideFuncs.CreateAsync = WmsPDAFeeding; OverideFuncs.CreateAsync = WmsPDAFeeding;
} }
private async Task<dynamic> WmsPDAFeeding(VisualDevModelDataCrInput input) private async Task<dynamic> WmsPDAFeeding(VisualDevModelDataCrInput input)
{ {
var isOk = false;
try try
{ {
var isOk = false;
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : "";
var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == oldCarryId); var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == newCarryId); var feedBox = await _db.Queryable<WmsFeedbox>().FirstAsync(it => it.feedbox_code == feedBoxCode);
if (oldCarry != null && newCarry != null) var citem = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
if (carry != null && feedBox != null)
{ {
ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id }; feedBox.material_id = citem.material_id;
isOk = await _updateSubCarry<WmsCarryD>(carryInput); feedBox.material_code = citem.material_code;
isOk = await _updateSubCarry<WmsCarryMat>(carryInput); feedBox.qty = citem.qty;
isOk = await _updateSubCarry<WmsCarryCode>(carryInput); feedBox.batch = citem?.code_batch!;
var row = await _db.Updateable(feedBox).UpdateColumns(it => new
{
it.material_id,
it.material_code,
it.qty,
it.batch
}).ExecuteCommandAsync();
/* var row = await _db.Updateable(feedBox).SetColumns(it => new
{
it.material_id == item.material_id,it.material_code
}
)*/
newCarry.status = oldCarry.status; var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
newCarry.carry_status = oldCarry.carry_status; foreach (var item in items)
newCarry.location_id = oldCarry.location_id; {
newCarry.location_code = oldCarry.location_code; WmsFeedingrecordCode wmsFeedingRecordCode = new();
newCarry.is_lock = oldCarry.is_lock; wmsFeedingRecordCode.id = SnowflakeIdHelper.NextId();
newCarry.out_status = oldCarry.out_status; wmsFeedingRecordCode.org_id = carry?.org_id!;
newCarry.is_check = oldCarry.is_check; wmsFeedingRecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!;
newCarry.bale_num = oldCarry.bale_num; wmsFeedingRecordCode.material_id = item.material_id;
newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id; wmsFeedingRecordCode.material_code = item.material_code;
newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code; wmsFeedingRecordCode.barcode = item.barcode;
newCarry.source_id = oldCarry.source_id; wmsFeedingRecordCode.code_batch = item.code_batch;
newCarry.source_code = oldCarry.source_code; wmsFeedingRecordCode.codeqty = item.codeqty;
newCarry.create_id = _userManager.UserId; wmsFeedingRecordCode.unit_id = item.unit_id;
newCarry.create_time = DateTime.Now; wmsFeedingRecordCode.unit_code = item.unit_code;
var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); wmsFeedingRecordCode.create_id = _userManager.UserId;
WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>(); wmsFeedingRecordCode.create_time = DateTime.Now;
wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); row = await _db.Insertable(wmsFeedingRecordCode).ExecuteCommandAsync();
wmsCarryReplaceH.org_id = oldCarry.org_id; }
wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); row = await UpdateNullCarry(carry);
wmsCarryReplaceH.carry_id = oldCarry.id;
wmsCarryReplaceH.carry_code = oldCarry.carry_code;
wmsCarryReplaceH.newcarry_id = newCarry.id;
wmsCarryReplaceH.newcarry_code = newCarry.carry_code;
row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();
row = await UpdateNullCarry(oldCarry);
isOk = (row > 0); isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001); if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
} }
else else
{ {
if (oldCarry == null) if (carry == null)
{ {
throw new AppFriendlyException("没有可用的旧载具", 500); throw new AppFriendlyException("没有可用的旧载具", 500);
} }
if (newCarry == null) if (feedBox == null)
{ {
throw new AppFriendlyException("没有可用的新载具", 500); throw new AppFriendlyException("没有可用的新载具", 500);
} }

5
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
View File

@@ -70,7 +70,7 @@ namespace Tnb.WarehouseMgr
//await _runService.Create(templateEntity, input); //await _runService.Create(templateEntity, input);
//入库取终点 //出库起点 //入库取终点 //出库起点
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
var inbaleItem =await _db.Queryable<WmsInbale>().SingleAsync(it => it.bill_code == input.data[nameof(WmsInbale.bill_code)].ToString()); var inbaleItem = await _db.Queryable<WmsInbale>().SingleAsync(it => it.bill_code == input.data[nameof(WmsInbale.bill_code)].ToString());
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = null; WmsPointH sPoint = null;
WmsPointH ePoint = null; WmsPointH ePoint = null;
@@ -143,8 +143,9 @@ namespace Tnb.WarehouseMgr
//根据载具移入Id，回更单据状态 //根据载具移入Id，回更单据状态
await _db.Updateable<WmsInbale>().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID}).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); await _db.Updateable<WmsInbale>().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID}).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
var baleNum = input.data[nameof(WmsCarryH.bale_num)]?.ToString();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status= ((int)EnumCarryStatus.寄存).ToString() }, it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status = ((int)EnumCarryStatus.寄存).ToString(), bale_num = baleNum },
it => new BasLocation { is_lock = 1 }); it => new BasLocation { is_lock = 1 });
//((int)EnumCarryStatus.寄存).ToString() //((int)EnumCarryStatus.寄存).ToString()
} }

4
WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// PDA库内转移 /// PDA库内转移
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)]
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsPDATransferService : BaseWareHouseService, IPdaStroage public class WmsPDATransferService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); 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); await _runService.Create(templateEntity, input);
// 计算路径，插入预任务申请 // 计算路径，插入预任务申请
WmsPointH sPoint = null; WmsPointH sPoint = null;

4
WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 库内转移 /// 库内转移
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)]
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsTransferService : BaseWareHouseService, IPdaStroage public class WmsTransferService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
// 计算路径，插入预任务申请 // 计算路径，插入预任务申请
WmsPointH sPoint = null; WmsPointH sPoint = null;