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

载具库存报表导出加规格型号字段；bip异常信息对接接口

Browse Source
This commit is contained in:
陈文凯
2024-11-12 11:02:14 +08:00
parent bce95139a5
commit 72d8f4f40b
6 changed files with 298 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Entities.Dto.PrdManage;
using Tnb.ProductionMgr.Entities.Entity;
using Tnb.WarehouseMgr.Entities.Consts;
@@ -189,5 +190,210 @@ namespace Tnb.ProductionMgr
return !result.IsSuccess ? result.ErrorMessage : "保存成功";
}
/// <summary>
/// 删除生产订单
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<string> DelPrdMo(DeletePrdMoInput input)
{
Log.Information($"删除生产订单接收参数:{JsonConvert.SerializeObject(input)}");
try
{
if (string.IsNullOrEmpty(input.mo_code))
throw Oops.Bah("工单代码不能为空");
if (string.IsNullOrEmpty(input.erp_lineno))
throw Oops.Bah("行号不能为空");
var mo_code= input.mo_code + "-" + input.erp_lineno;
await _db.Ado.BeginTranAsync();
PrdMo existMo = await _db.Queryable<PrdMo>().Where(x => x.mo_code == mo_code).FirstAsync();
if (existMo != null)
{
if (existMo.mo_status != DictConst.ToBeScheduledId)
{
throw Oops.Bah($"【DelPrdMo】生产工单{input.mo_code}状态不是待下发无法删除");
}
await _db.Deleteable<PrdMo>().Where(r => r.id == existMo.id).ExecuteCommandAsync();
}
else
{
throw Oops.Bah($"【DelPrdMo】生产工单{input.mo_code}数据不存在");
}
await _db.Ado.CommitTranAsync();
}
catch (Exception e)
{
await _db.Ado.RollbackTranAsync();
throw Oops.Bah($"{e.Message}");
}
return "删除成功";
}
/// <summary>
/// 修改生产订单
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<string> ModifyPrdMo(PrdMo input)
{
Log.Information($"删除生产订单接收参数:{JsonConvert.SerializeObject(input)}");
try
{
if (string.IsNullOrEmpty(input.mo_code))
{
Log.Error("【ModifyPrdMo】工单代码不能为空");
throw Oops.Bah("工单代码不能为空");
}
if (string.IsNullOrEmpty(input.mo_type))
{
Log.Error("【ModifyPrdMo】工单类型不能为空");
throw Oops.Bah("工单类型不能为空");
}
if (input.plan_start_date == null)
{
Log.Error("【ModifyPrdMo】计划开始日期不能为空");
throw Oops.Bah("计划开始日期不能为空");
}
if (input.plan_end_date == null)
{
Log.Error("【ModifyPrdMo】计划结束日期不能为空");
throw Oops.Bah("计划结束日期不能为空");
}
if (string.IsNullOrEmpty(input.material_code))
{
Log.Error("【ModifyPrdMo】物料编号不能为空");
throw Oops.Bah("物料编号不能为空");
}
if (string.IsNullOrEmpty(input.unit_id))
{
Log.Error("【ModifyPrdMo】单位不能为空");
throw Oops.Bah("单位不能为空");
}
if (input.plan_qty == null || input.plan_qty <= 0)
{
Log.Error("【ModifyPrdMo】计划数量不能为空");
throw Oops.Bah("计划数量不能为空");
}
if (string.IsNullOrEmpty(input.dept_id))
{
Log.Error("【ModifyPrdMo】生产部门id不能为空");
throw Oops.Bah("生产部门id不能为空");
}
if (input.ebom_version == null || input.ebom_version.IsEmpty())
{
Log.Error("【ModifyPrdMo】物料清单版本不能为空");
throw Oops.Bah("物料清单版本不能为空");
}
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.code == input.material_code);
if (basMaterial == null)
{
Log.Error($"【ModifyPrdMo】未找到物料编号为{input.material_code}的物料");
throw Oops.Bah($"未找到物料编号为{input.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))
{
Log.Error($"【ModifyPrdMo】{basMaterial.name}不存在{input.unit_id}该单位");
throw Oops.Bah($"{basMaterial.name}不存在{input.unit_id}该单位");
}
if (!await _db.Queryable<BasEbomH>().AnyAsync(x => x.material_id == basMaterial.id && x.version == input.ebom_version))
{
Log.Error($"【ModifyPrdMo】系统中无法找到物料清单{input.ebom_version}版本");
throw Oops.Bah($"系统中无法找到物料清单{input.ebom_version}版本");
}
DictionaryDataEntity unitDic = await _db.Queryable<DictionaryDataEntity>().Where(x => x.DictionaryTypeId == WmsWareHouseConst.UNITTYPEID && x.EnCode == input.unit_id).FirstAsync();
string mocode = input.mo_code + "-" + input.erp_lineno;
PrdMo existMo = await _db.Queryable<PrdMo>().Where(x => x.mo_code == mocode).FirstAsync();
if (existMo == null)
throw Oops.Bah($"【ModifyPrdMo】生产工单{mocode}数据不存在");
if (existMo.mo_status != DictConst.ToBeScheduledId)
{
Log.Error($"【ModifyPrdMo】生产工单{mocode}状态不是待下发，无法修改");
throw Oops.Bah($"【ModifyPrdMo】生产工单{mocode}状态不是待下发，无法修改");
}
var unit_id= unitDic?.EnCode ?? input.unit_id;
existMo.org_id=input.org_id;
existMo.material_code=input.material_code;
existMo.mo_type = moTypeDic[input.mo_type];
existMo.mo_status = DictConst.ToBeScheduledId;
existMo.plan_qty=input.plan_qty;
existMo.input_qty=input.input_qty;
existMo.complete_qty=input.complete_qty;
existMo.reported_work_qty=input.reported_work_qty;
existMo.scrap_qty=input.scrap_qty;
existMo.plan_start_date=input.plan_start_date;
existMo.plan_end_date=input.plan_end_date;
existMo.act_start_date = input.act_start_date;
existMo.act_end_date = input.act_end_date;
existMo.dept_id=input.dept_id;
existMo.customer_code=input.customer_code;
existMo.order_no=input.order_no;
existMo.order_seq=input.order_seq;
existMo.bom_version=input.bom_version;
existMo.ebom_version=input.ebom_version;
existMo.relation_ratio=input.relation_ratio;
existMo.mo_down_user_id=input.mo_down_user_id;
existMo.mo_down_user_name=input.mo_down_user_name;
existMo.mo_down_date=input.mo_down_date;
existMo.remark=input.remark;
existMo.work_center_code=input.work_center_code;
existMo.parent_mo_code=input.parent_mo_code;
existMo.seduling_start_date=input.seduling_start_date;
existMo.seduling_end_date=input.seduling_end_date;
existMo.is_create_dispatch=input.is_create_dispatch;
existMo.seq=input.seq;
existMo.data_sources=input.data_sources;
existMo.production_linecode=input.production_linecode;
existMo.is_merge=input.is_merge;
existMo.combine_mo_code=existMo.combine_mo_code;
existMo.time_stamp=input.time_stamp;
existMo.extras=input.extras;
existMo.material_id = basMaterial.id;
existMo.scheduled_qty=input.scheduled_qty;
existMo.parent_id=input.parent_id;
existMo.unit_id = unit_id;
existMo.mo_source = "1";
existMo.erp_lineno=input.erp_lineno;
existMo.erp_line_pk=input.erp_line_pk;
existMo.erp_mo_pk=input.erp_mo_pk;
existMo.mo_category=input.mo_category;
await _db.Updateable(existMo).ExecuteCommandAsync();
await _db.Ado.CommitTranAsync();
}
catch (Exception e)
{
await _db.Ado.RollbackTranAsync();
throw Oops.Bah($"修改失败:{e.Message}");
}
return "修改成功";
}
}
}