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:
alex
2023-08-02 17:50:58 +08:00
parent e685faca9e 981662037e
commit a07b3c73fc
9 changed files with 275 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/KittingOutInput.cs Normal file
View File

@@ -0,0 +1,88 @@
namespace Tnb.ProductionMgr.Entities.Dto
{
public class KittingOutInput
{
public string id { get; set; }
/// <summary>
/// 出库仓库ID
/// </summary>
public string warehouse_id { get; set; } = string.Empty;
/// <summary>
/// 目标库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
/// <summary>
/// 产品ID
/// </summary>
public string material_id { get; set; } = string.Empty;
/// <summary>
/// 产品编号
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 齐套搭配方案ID
/// </summary>
public string collocation_scheme_id { get; set; } = string.Empty;
/// <summary>
/// 齐套搭配方案编号
/// </summary>
public string? collocation_scheme_code { get; set; }
/// <summary>
/// 顺序号
/// </summary>
public string? seq { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 单据号
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 所属工位
/// </summary>
public string? workstation_id { get; set; }
/// <summary>
/// 所属产线
/// </summary>
public string? workline_id { get; set; }
/// <summary>
/// 任务单
/// </summary>
public string? mo_task_id { get; set; }
public List<Dictionary<string,object>> tableField115 { get; set; }
}
}

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdKittingOutH.cs
View File

@@ -87,7 +87,7 @@ public partial class PrdKittingOutH : BaseEntity<string>
/// <summary>
/// 所属产线
/// </summary>
public string? worklinei_d { get; set; }
public string? workline_id { get; set; }
/// <summary>
/// 任务单

162
ProductionMgr/Tnb.ProductionMgr/PrdKittingOutService.cs
View File

@@ -20,6 +20,7 @@ using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Interfaces;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.ProductionMgr.Entities.Dto;
namespace Tnb.ProductionMgr
{
@@ -46,10 +47,115 @@ namespace Tnb.ProductionMgr
_repository = repository;
_userManager = userManager;
_billRullService = billRullService;
OverideFuncs.CreateAsync = Create;
// OverideFuncs.CreateAsync = Create;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput visualDevModelDataCrInput)
// private async Task<dynamic> Create(VisualDevModelDataCrInput visualDevModelDataCrInput)
// {
// PrdKittingOutH prdKittingOutH = new PrdKittingOutH();
// try
// {
// var db = _repository.AsSugarClient();
//
// List<MESKittingOutStkInput> input = new List<MESKittingOutStkInput>();
// input.Add(new MESKittingOutStkInput()
// {
// org_id = _userManager.GetUserInfo().Result.organizeId,
// bill_date = DateTime.Now,
// warehouse_id = visualDevModelDataCrInput.data.ContainsKey("warehouse_id") ? visualDevModelDataCrInput.data["warehouse_id"].ToString() : "",
// location_code = visualDevModelDataCrInput.data.ContainsKey("location_code") ? visualDevModelDataCrInput.data["location_code"].ToString() : "",
// material_id = visualDevModelDataCrInput.data.ContainsKey("material_id") ? visualDevModelDataCrInput.data["material_id"].ToString() : "",
// material_code = visualDevModelDataCrInput.data.ContainsKey("material_code") ? visualDevModelDataCrInput.data["material_code"].ToString() : "",
// collocation_scheme_id = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_id") ? visualDevModelDataCrInput.data["collocation_scheme_id"].ToString() : "",
// collocation_scheme_code = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_code") ? visualDevModelDataCrInput.data["collocation_scheme_code"].ToString() : "",
// source_id = prdKittingOutH.id,
// seq = visualDevModelDataCrInput.data.ContainsKey("seq") ? (int)visualDevModelDataCrInput.data["seq"] : 0,
// create_id = _userManager.UserId,
// wmsKittingoutDs = new List<MESKittingOutStkDInput>(),
// });
//
// input[0].wmsKittingoutDs = JsonConvert.DeserializeObject<List<MESKittingOutStkDInput>>(JsonConvert.SerializeObject(visualDevModelDataCrInput.data["tableField115"]));
// string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
// Dictionary<string, object> header = new Dictionary<string, object>()
// {
// ["Authorization"] = App.HttpContext.Request.Headers["Authorization"]
// };
// var sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_KITTING_OUT_STK,JsonConvert.SerializeObject(input),header);
// Log.Information(sendResult);
//
// AuthResponse authResponse = JsonConvert.DeserializeObject<AuthResponse>(sendResult);
// if (authResponse.code != 200)
// {
// throw Oops.Bah(authResponse.msg);
// }
// else
// {
// prdKittingOutH.code = await _billRullService.GetBillNumber(CodeTemplateConst.PRDKITTINGOUTSTOCK_CODE);
// prdKittingOutH.warehouse_id = visualDevModelDataCrInput.data.ContainsKey("warehouse_id") ? visualDevModelDataCrInput.data["warehouse_id"].ToString() : "";
// prdKittingOutH.location_code = visualDevModelDataCrInput.data.ContainsKey("location_code") ? visualDevModelDataCrInput.data["location_code"].ToString() : "";
// prdKittingOutH.material_id = visualDevModelDataCrInput.data.ContainsKey("material_id") ? visualDevModelDataCrInput.data["material_id"].ToString() : "";
// prdKittingOutH.material_code = visualDevModelDataCrInput.data.ContainsKey("material_code") ? visualDevModelDataCrInput.data["material_code"].ToString() : "";
// prdKittingOutH.collocation_scheme_id = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_id") ? visualDevModelDataCrInput.data["collocation_scheme_id"].ToString() : "";
// prdKittingOutH.collocation_scheme_code = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_code") ? visualDevModelDataCrInput.data["collocation_scheme_code"].ToString() : "";
// prdKittingOutH.workline_id = visualDevModelDataCrInput.data.ContainsKey("worklinei_d") ? visualDevModelDataCrInput.data["worklinei_d"].ToString() : "";
// prdKittingOutH.workstation_id = visualDevModelDataCrInput.data.ContainsKey("workstation_id") ? visualDevModelDataCrInput.data["workstation_id"].ToString() : "";
// prdKittingOutH.mo_task_id = visualDevModelDataCrInput.data.ContainsKey("mo_task_id") ? visualDevModelDataCrInput.data["mo_task_id"].ToString() : "";
// prdKittingOutH.seq = visualDevModelDataCrInput.data.ContainsKey("seq") ? visualDevModelDataCrInput.data["seq"]?.ToString() : "0";
// prdKittingOutH.create_id = _userManager.UserId;
// prdKittingOutH.create_time = DateTime.Now;
// prdKittingOutH.org_id = _userManager.GetUserInfo().Result.organizeId;
// List<PrdKittingOutD> prdKittingOutDs = new List<PrdKittingOutD>();
// foreach (var item in (JArray)visualDevModelDataCrInput.data["tableField115"])
// {
// prdKittingOutDs.Add(new PrdKittingOutD()
// {
// material_id = item.Value<string>("material_id"),
// material_code = item.Value<string>("material_code"),
// unit_id = item.Value<string>("unit_id"),
// unit_code = item.Value<string>("unit_code"),
// pr_qty = item.Value<decimal>("pr_qty"),
// code_batch = item.Value<string>("code_batch"),
// box = item.Value<int>("box"),
// kitting_out_id = prdKittingOutH.id,
// });
// }
//
// // VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
// // await _runService.Create(templateEntity, visualDevModelDataCrInput);
//
// DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
// {
// await _repository.InsertAsync(prdKittingOutH);
// if (prdKittingOutDs.Count > 0)
// {
// await db.Insertable<PrdKittingOutD>(prdKittingOutDs).ExecuteCommandAsync();
// }
// });
//
// if (!result.IsSuccess)
// {
// throw Oops.Bah(result.ErrorMessage);
// }
// }
// return await Task.FromResult(true);
// }
// catch (Exception e)
// {
// Console.WriteLine(e);
// Log.Error(e.Message);
// throw Oops.Bah(e.Message);
// }
//
// }
/// <summary>
/// 齐套出库申请
/// </summary>
/// <param name="kittingOutInput"></param>
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost]
public async Task<dynamic> KittingOut(KittingOutInput kittingOutInput)
{
PrdKittingOutH prdKittingOutH = new PrdKittingOutH();
try
@@ -61,19 +167,19 @@ namespace Tnb.ProductionMgr
{
org_id = _userManager.GetUserInfo().Result.organizeId,
bill_date = DateTime.Now,
warehouse_id = visualDevModelDataCrInput.data.ContainsKey("warehouse_id") ? visualDevModelDataCrInput.data["warehouse_id"].ToString() : "",
location_code = visualDevModelDataCrInput.data.ContainsKey("location_code") ? visualDevModelDataCrInput.data["location_code"].ToString() : "",
material_id = visualDevModelDataCrInput.data.ContainsKey("material_id") ? visualDevModelDataCrInput.data["material_id"].ToString() : "",
material_code = visualDevModelDataCrInput.data.ContainsKey("material_code") ? visualDevModelDataCrInput.data["material_code"].ToString() : "",
collocation_scheme_id = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_id") ? visualDevModelDataCrInput.data["collocation_scheme_id"].ToString() : "",
collocation_scheme_code = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_code") ? visualDevModelDataCrInput.data["collocation_scheme_code"].ToString() : "",
warehouse_id = kittingOutInput.warehouse_id,
location_code = kittingOutInput.location_code,
material_id = kittingOutInput.material_id,
material_code = kittingOutInput.material_code,
collocation_scheme_id = kittingOutInput.collocation_scheme_id,
collocation_scheme_code = kittingOutInput.collocation_scheme_code,
source_id = prdKittingOutH.id,
seq = visualDevModelDataCrInput.data.ContainsKey("seq") ? (int)visualDevModelDataCrInput.data["seq"] : 0,
seq = !string.IsNullOrEmpty(kittingOutInput.seq) ? Convert.ToInt32(kittingOutInput.seq) : 0,
create_id = _userManager.UserId,
wmsKittingoutDs = new List<MESKittingOutStkDInput>(),
});
input[0].wmsKittingoutDs = JsonConvert.DeserializeObject<List<MESKittingOutStkDInput>>(JsonConvert.SerializeObject(visualDevModelDataCrInput.data["tableField115"]));
input[0].wmsKittingoutDs = JsonConvert.DeserializeObject<List<MESKittingOutStkDInput>>(JsonConvert.SerializeObject(kittingOutInput.tableField115));
string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host;
Dictionary<string, object> header = new Dictionary<string, object>()
{
@@ -90,31 +196,31 @@ namespace Tnb.ProductionMgr
else
{
prdKittingOutH.code = await _billRullService.GetBillNumber(CodeTemplateConst.PRDKITTINGOUTSTOCK_CODE);
prdKittingOutH.warehouse_id = visualDevModelDataCrInput.data.ContainsKey("warehouse_id") ? visualDevModelDataCrInput.data["warehouse_id"].ToString() : "";
prdKittingOutH.location_code = visualDevModelDataCrInput.data.ContainsKey("location_code") ? visualDevModelDataCrInput.data["location_code"].ToString() : "";
prdKittingOutH.material_id = visualDevModelDataCrInput.data.ContainsKey("material_id") ? visualDevModelDataCrInput.data["material_id"].ToString() : "";
prdKittingOutH.material_code = visualDevModelDataCrInput.data.ContainsKey("material_code") ? visualDevModelDataCrInput.data["material_code"].ToString() : "";
prdKittingOutH.collocation_scheme_id = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_id") ? visualDevModelDataCrInput.data["collocation_scheme_id"].ToString() : "";
prdKittingOutH.collocation_scheme_code = visualDevModelDataCrInput.data.ContainsKey("collocation_scheme_code") ? visualDevModelDataCrInput.data["collocation_scheme_code"].ToString() : "";
prdKittingOutH.worklinei_d = visualDevModelDataCrInput.data.ContainsKey("worklinei_d") ? visualDevModelDataCrInput.data["worklinei_d"].ToString() : "";
prdKittingOutH.workstation_id = visualDevModelDataCrInput.data.ContainsKey("workstation_id") ? visualDevModelDataCrInput.data["workstation_id"].ToString() : "";
prdKittingOutH.mo_task_id = visualDevModelDataCrInput.data.ContainsKey("mo_task_id") ? visualDevModelDataCrInput.data["mo_task_id"].ToString() : "";
prdKittingOutH.seq = visualDevModelDataCrInput.data.ContainsKey("seq") ? visualDevModelDataCrInput.data["seq"]?.ToString() : "0";
prdKittingOutH.warehouse_id = kittingOutInput.warehouse_id;
prdKittingOutH.location_code = kittingOutInput.location_code;
prdKittingOutH.material_id = kittingOutInput.material_id;
prdKittingOutH.material_code = kittingOutInput.material_code;
prdKittingOutH.collocation_scheme_id = kittingOutInput.collocation_scheme_id;
prdKittingOutH.collocation_scheme_code = kittingOutInput.collocation_scheme_code;
prdKittingOutH.workline_id = kittingOutInput.workline_id;
prdKittingOutH.workstation_id = kittingOutInput.workstation_id;
prdKittingOutH.mo_task_id = kittingOutInput.mo_task_id;
prdKittingOutH.seq = kittingOutInput.seq;
prdKittingOutH.create_id = _userManager.UserId;
prdKittingOutH.create_time = DateTime.Now;
prdKittingOutH.org_id = _userManager.GetUserInfo().Result.organizeId;
List<PrdKittingOutD> prdKittingOutDs = new List<PrdKittingOutD>();
foreach (var item in (JArray)visualDevModelDataCrInput.data["tableField115"])
foreach (var item in kittingOutInput.tableField115)
{
prdKittingOutDs.Add(new PrdKittingOutD()
{
material_id = item.Value<string>("material_id"),
material_code = item.Value<string>("material_code"),
unit_id = item.Value<string>("unit_id"),
unit_code = item.Value<string>("unit_code"),
pr_qty = item.Value<decimal>("pr_qty"),
code_batch = item.Value<string>("code_batch"),
box = item.Value<int>("box"),
material_id = item.ContainsKey("material_id") ? item["material_id"].ToString() : "",
material_code = item.ContainsKey("material_code") ? item["material_code"].ToString() : "",
unit_id = item.ContainsKey("unit_id") ? item["unit_id"].ToString() : "",
unit_code = item.ContainsKey("unit_code") ? item["unit_code"].ToString() : "",
pr_qty = item.ContainsKey("pr_qty") ? Convert.ToDecimal(item["pr_qty"]) : 0,
code_batch = item.ContainsKey("code_batch") ? item["code_batch"].ToString() : "",
box = item.ContainsKey("box") ? Convert.ToInt32(item["box"]) : 0,
kitting_out_id = prdKittingOutH.id,
});
}

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

@@ -1871,6 +1871,13 @@ namespace Tnb.ProductionMgr
return await _db.Queryable<PrdMoTask>().Where(it => it.eqp_id == eqpId && it.mo_task_status == DictConst.InProgressEnCode).ToListAsync();
}
/// <summary>
/// 计算预计结束日期
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="AppFriendlyException"></exception>
[HttpPost]
public async Task<dynamic> GetEstimatedEndTime(CountEstimatedEndTimeInput input)
{
@@ -1903,6 +1910,19 @@ namespace Tnb.ProductionMgr
}
}
/// <summary>
/// 获取这个产线生产中的任务单
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetMoTaskByWorklineId(Dictionary<string,string> dic)
{
string id = dic["id"];
return await _repository.AsSugarClient().Queryable<PrdMoTask>()
.Where(x => x.workline_id == id && x.mo_task_status == DictConst.InProgressEnCode).FirstAsync();
}
}
}

1
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs
View File

@@ -28,6 +28,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// 取货/放货
/// </summary>
public string action { get; set; }
}

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

@@ -12,6 +12,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// 状态
/// </summary>
public string status { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string deviceID { get; set; }
}

3
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc;
using NPOI.OpenXmlFormats;
using Senparc.NeuChar.ApiHandlers;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
@@ -107,9 +108,11 @@ namespace Tnb.WarehouseMgr
case "CREATED": break;
case "ALLOCATED":
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => it.bill_code.Contains(input.taskChainCode)).ToListAsync();
var eps = await _db.Queryable<EqpEquipment>().Where(it => it.code.Contains(input.deviceID)).ToListAsync();
TaskExecuteUpInput taskExecuteUpInput = new()
{
disTaskIds = disTasks.Select(x => x.id).ToList(),
EqpIds = eps.Select(x => x.id).ToList(),
};
await _wareHouseService.TaskExecute(taskExecuteUpInput); break;
case "PROGRESSING": break;

1
WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
View File

@@ -11,6 +11,7 @@
<ItemGroup>
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
<ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Entities\Tnb.EquipMgr.Entities.csproj" />
<ProjectReference Include="..\..\ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" />

22
system/Tnb.Systems/Permission/DepartmentService.cs
View File

@@ -666,6 +666,28 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
};
}
/// <summary>
/// 根据工位id获取产线信息
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetWorklineByWorkstationId(Dictionary<string, string> dic)
{
string id = dic["id"];
var db = _repository.AsSugarClient();
OrganizeEntity organizeEntity = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == id);
if (organizeEntity != null && !string.IsNullOrEmpty(organizeEntity.OrganizeIdTree))
{
string[] arr = organizeEntity.OrganizeIdTree.Split(",");
return await db.Queryable<OrganizeEntity>().SingleAsync(x => arr.Contains(x.Id) && x.Category == DictConst.RegionCategoryWorklineCode);
}
return null;
}
#endregion
#region PublicMethod