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:
马健
2024-07-03 17:04:57 +08:00
parent 11490d101f 0465c4f73d
commit 7fa009d599
8 changed files with 139 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMaterialReceiptRecordUpListOutPut.cs
View File

@@ -17,6 +17,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
{
public string id { get; set; }
public string code { get; set; }
public string carry_code { get; set; }
public string create_id { get; set; }
public string create_time { get; set; }
}

40
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/ErpExtendField.cs Normal file
View File

@@ -0,0 +1,40 @@
using JNPF.Common.Contracts;
using SqlSugar;
namespace Tnb.ProductionMgr.Entities.Entity
{
/// <summary>
/// erp扩展字段
/// </summary>
[SugarTable("erp_extend_field")]
public class ErpExtendField: BaseEntity<string>
{
/// <summary>
/// 天益表名
/// </summary>
public string table_name { get; set; }
/// <summary>
/// 天益表id
/// </summary>
public string table_id { get; set; }
/// <summary>
/// 机构id
/// </summary>
public string org_id { get; set; }
/// <summary>
/// erp表体行号
/// </summary>
public int erp_lineno { get; set; }
/// <summary>
/// 工单pk值
/// </summary>
public string erp_mo_pk { get; set; }
/// <summary>
/// 表体pk值
/// </summary>
public string erp_line_pk { get; set; }
public DateTime create_time { get; set; }
}
}

16
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs
View File

@@ -243,5 +243,19 @@ public partial class PrdMo : BaseEntity<string>
/// </summary>
public string? mo_source { get; set; }
/// <summary>
/// erp表体行号
/// </summary>
[SugarColumn(IsIgnore = true)]
public int erp_lineno { get; set; }
/// <summary>
/// 工单pk值
/// </summary>
[SugarColumn(IsIgnore = true)]
public string erp_mo_pk { get; set; }
/// <summary>
/// 表体pk值
/// </summary>
[SugarColumn(IsIgnore = true)]
public string erp_line_pk { get; set; }
}

102
ProductionMgr/Tnb.ProductionMgr/MesForErpService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
@@ -13,6 +14,7 @@ using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Entities.Entity;
using Tnb.WarehouseMgr.Entities.Consts;
namespace Tnb.ProductionMgr
@@ -25,6 +27,14 @@ namespace Tnb.ProductionMgr
private readonly IUserManager _userManager;
private readonly IBillRullService _billRuleService;
public static Dictionary<string, string> moTypeDic = new Dictionary<string, string>()
{
["1"] = "25019163616533", //注塑
["2"] = "25019172714005", //挤出
["3"] = "25019181615125", //组装
["4"] = "25019191681045", //包装
};
public MesForErpService(ISqlSugarRepository<PrdMo> repository,
IBillRullService billRuleService,
IUserManager userManager)
@@ -36,45 +46,71 @@ namespace Tnb.ProductionMgr
[HttpPost]
[AllowAnonymous]
public async Task<string> SavePrdMo(PrdMo input)
public async Task<string> SavePrdMo(List<PrdMo> input)
{
if (input == null)
if (input == null || input.IsEmpty())
throw Oops.Bah("参数不能为空");
if(string.IsNullOrEmpty(input.mo_code))
throw Oops.Bah("工单代码不能为空");
if(string.IsNullOrEmpty(input.mo_type))
throw Oops.Bah("工单类型不能为空");
if(input.plan_start_date==null)
throw Oops.Bah("计划开始日期不能为空");
if(input.plan_end_date==null)
throw Oops.Bah("计划结束日期不能为空");
if(string.IsNullOrEmpty(input.material_code))
throw Oops.Bah("物料编号不能为空");
if(string.IsNullOrEmpty(input.unit_id))
throw Oops.Bah("单位不能为空");
if(input.plan_qty==null || input.plan_qty<=0)
throw Oops.Bah("计划数量不能为空");
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.code == input.material_code);
if(basMaterial==null)
throw Oops.Bah($"未找到物料编号为{input.material_code}的物料");
List<PrdMo> moList = new List<PrdMo>();
List<ErpExtendField> extendFieldList = new List<ErpExtendField>();
foreach (var item in input)
{
if(string.IsNullOrEmpty(item.mo_code))
throw Oops.Bah("工单代码不能为空");
if(string.IsNullOrEmpty(item.mo_type))
throw Oops.Bah("工单类型不能为空");
if(item.plan_start_date==null)
throw Oops.Bah("计划开始日期不能为空");
if(item.plan_end_date==null)
throw Oops.Bah("计划结束日期不能为空");
if(string.IsNullOrEmpty(item.material_code))
throw Oops.Bah("物料编号不能为空");
if(string.IsNullOrEmpty(item.unit_id))
throw Oops.Bah("单位不能为空");
if(item.plan_qty==null || item.plan_qty<=0)
throw Oops.Bah("计划数量不能为空");
if(item.ebom_version==null || item.ebom_version.IsEmpty())
throw Oops.Bah("物料清单版本不能为空");
List<BasMaterialUnit> basMaterialUnits = await _db.Queryable<BasMaterialUnit>().Where(x => x.material_id == basMaterial.id).ToListAsync();
List<String> units = basMaterialUnits.Select(x => x.auxiliary_unit_id).Distinct().ToList();
if(units!=null && !string.IsNullOrEmpty(basMaterial.unit_id)) units.Add(basMaterial.unit_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.code == item.material_code);
if(basMaterial==null)
throw Oops.Bah($"未找到物料编号为{item.material_code}的物料");
List<BasMaterialUnit> basMaterialUnits = await _db.Queryable<BasMaterialUnit>().Where(x => x.material_id == basMaterial.id).ToListAsync();
List<String> units = basMaterialUnits.Select(x => x.auxiliary_unit_id).Distinct().ToList();
if(units!=null && !string.IsNullOrEmpty(basMaterial.unit_id)) units.Add(basMaterial.unit_id);
if(!units.Contains(input.unit_id))
throw Oops.Bah($"{basMaterial.name}不存在{input.unit_id}该单位");
if(!units.Contains(item.unit_id))
throw Oops.Bah($"{basMaterial.name}不存在{item.unit_id}该单位");
input.id = SnowflakeIdHelper.NextId();
input.mo_source = "1";
input.mo_code = input.mo_code;
input.create_id = WmsWareHouseConst.AdministratorUserId;
input.create_time = DateTime.Now;
input.mo_status = DictConst.ToBeScheduledId;
await _db.Insertable(input).ExecuteCommandAsync();
return "true";
item.id = SnowflakeIdHelper.NextId();
item.mo_source = "1";
item.mo_type = moTypeDic[item.mo_type];
item.mo_code = item.mo_code+"-"+item.erp_lineno;
item.create_id = WmsWareHouseConst.AdministratorUserId;
item.create_time = DateTime.Now;
item.mo_status = DictConst.ToBeScheduledId;
moList.Add(item);
extendFieldList.Add(new ErpExtendField()
{
id = SnowflakeIdHelper.NextId(),
org_id =WmsWareHouseConst.AdministratorOrgId,
table_name = "prd_mo",
table_id = item.id,
erp_lineno = item.erp_lineno,
erp_line_pk = item.erp_line_pk,
erp_mo_pk = item.erp_mo_pk,
create_time = DateTime.Now
});
}
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
await _db.Insertable(moList).ExecuteCommandAsync();
await _db.Insertable(extendFieldList).ExecuteCommandAsync();
});
return !result.IsSuccess ? result.ErrorMessage : "保存成功";
}
}
}

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

@@ -480,7 +480,7 @@ namespace Tnb.ProductionMgr
await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString())
.Where(x => x.id==detail.member_carry_id)
.Where(x => x.id==input.carry_code)
.ExecuteCommandAsync();
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbind(new CarryCodeUnbindInput()

1
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptRecordUpServicecs.cs
View File

@@ -99,6 +99,7 @@ namespace Tnb.ProductionMgr
{
id = x.id,
code = x.code,
carry_code = x.carry_code,
create_id = y.RealName,
create_time = x.create_time==null ? "" : x.create_time.Value.ToString(DbTimeFormat.SS),

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

@@ -2071,6 +2071,12 @@ namespace Tnb.ProductionMgr
{
throw Oops.Bah($"提报失败，载具已绑定");
}
List<WmsCarryCode> wmsCarryCodes = await db.Queryable<WmsCarryCode>().Where(x=>x.carry_code==materialBoxCode).ToListAsync();
if (wmsCarryCodes != null && wmsCarryCodes.Count > 0)
{
Log.Error($"载具{materialBoxCode}状态为{wmsCarryH.carry_status},但有条码{JsonConvert.SerializeObject(wmsCarryCodes)}");
throw Oops.Bah($"提报失败，载具异常");
}
BindCarryCodeInput bindCarryCodeInput = new BindCarryCodeInput();
bindCarryCodeInput.carry_id = wmsCarryH.id;

6
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -364,12 +364,14 @@ namespace Tnb.ProductionMgr
bool qu1 = await _redisData.TryGetValueByKeyField<bool>("外包装箱码垛线", "WBZX_x1_AGV_qu");
if (qu1)
{
Log.Information("血路管1线取");
HttpUtils.RequestGet($"{config.value}/api/production/time-work/x1-auto-prd-report");
}
bool qu2 = await _redisData.TryGetValueByKeyField<bool>("外包装箱码垛线", "WBZX_x2_AGV_qu");
if (qu2)
{
Log.Information("血路管2线取");
HttpUtils.RequestGet($"{config.value}/api/production/time-work/x2-auto-prd-report");
}
return "true";
@@ -383,11 +385,13 @@ namespace Tnb.ProductionMgr
int num = await _redisData.TryGetValueByKeyField<int>("外包装箱码垛线", "WBZX_x1_Enquantity");
if (string.IsNullOrEmpty(carryCode) || num<=0)
{
Log.Information("血路管1线无载具或数量为0");
return "无载具或数量为0";
}
PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.workline_id == WmsWareHouseConst.XUELUGUAN1XIAN && x.mo_task_status == DictConst.InProgressEnCode && x.parent_id != null).FirstAsync();
if (prdMoTask == null)
{
Log.Information("血路管1线没有进行中的任务单");
return "血路管1线没有进行中的任务单";
}
@@ -409,11 +413,13 @@ namespace Tnb.ProductionMgr
int num = await _redisData.TryGetValueByKeyField<int>("外包装箱码垛线", "WBZX_x2_Enquantity");
if (string.IsNullOrEmpty(carryCode) || num<=0)
{
Log.Information("血路管2线无载具或数量为0");
return "无载具或数量为0";
}
PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.workline_id == WmsWareHouseConst.XUELUGUAN2XIAN && x.mo_task_status == DictConst.InProgressEnCode && x.parent_id != null).FirstAsync();
if (prdMoTask == null)
{
Log.Information("血路管2线没有进行中的任务单");
return "血路管2线没有进行中的任务单";
}