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

物料规格型号改成material_specification字段

Browse Source
This commit is contained in:
周科达
2024-06-13 17:18:38 +08:00
parent c368e24d9e
commit c5a7e672b6
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ public partial class BasMaterial : BaseEntity<string>
/// <summary> /// <summary>
/// 物料规格型号 /// 物料规格型号
/// </summary> /// </summary>
public string? material_standard { get; set; } // public string? material_standard { get; set; }
/// <summary> /// <summary>
/// 海关编码 /// 海关编码

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

@@ -207,8 +207,8 @@ namespace Tnb.BasicData
.Where(x => x.state == "1") .Where(x => x.state == "1")
.WhereIF(queryJson != null && queryJson.ContainsKey("name"), x => x.name.Contains(queryJson!["name"])) .WhereIF(queryJson != null && queryJson.ContainsKey("name"), x => x.name.Contains(queryJson!["name"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("code"), x => x.code.Contains(queryJson!["code"])) .WhereIF(queryJson != null && queryJson.ContainsKey("code"), x => x.code.Contains(queryJson!["code"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("material_standard"), .WhereIF(queryJson != null && queryJson.ContainsKey("material_specification"),
x => x.material_standard!.Contains(queryJson!["material_standard"])) x => x.material_specification!.Contains(queryJson!["material_specification"]))
.Select(x => x); .Select(x => x);
List<ISugarQueryable<BasMaterial>> list = new(); List<ISugarQueryable<BasMaterial>> list = new();

2
BasicData/Tnb.BasicData/BasMbomService.cs
View File

@@ -227,7 +227,7 @@ namespace Tnb.BasicData
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),
material_code = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.code), material_code = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.code),
material_name = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.name), material_name = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.name),
material_standard = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.material_standard), material_standard = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.material_specification),
num = e.num, num = e.num,
ordinal = d.ordinal, ordinal = d.ordinal,
}) })

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

@@ -152,7 +152,7 @@ namespace Tnb.ProductionMgr
eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.equip_id))?.code!, eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.equip_id))?.code!,
mold_code = "", mold_code = "",
item_code = material?.code!, item_code = material?.code!,
item_standard = material?.material_standard!, item_standard = material?.material_specification!,
status = "生产投料", status = "生产投料",
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,

10
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -518,7 +518,7 @@ namespace Tnb.ProductionMgr
type = (a.mo_type == DictConst.PrdMoTypeZS || a.mo_type == DictConst.PrdMoTypeJC) ? 1 : 2, type = (a.mo_type == DictConst.PrdMoTypeZS || a.mo_type == DictConst.PrdMoTypeJC) ? 1 : 2,
material_code = b.code, material_code = b.code,
material_name = b.name, material_name = b.name,
material_standard = b.material_standard, material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS), act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS) act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS)
}).ToPagedListAsync(input.currentPage, input.pageSize); }).ToPagedListAsync(input.currentPage, input.pageSize);
@@ -560,7 +560,7 @@ namespace Tnb.ProductionMgr
material_id = a.material_id, material_id = a.material_id,
material_code = b.code, material_code = b.code,
material_name = b.name, material_name = b.name,
material_standard = b.material_standard, material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS), act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS), act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
workshop_name = e.FullName, workshop_name = e.FullName,
@@ -582,7 +582,7 @@ namespace Tnb.ProductionMgr
material_id = a.material_id, material_id = a.material_id,
material_code = b.code, material_code = b.code,
material_name = b.name, material_name = b.name,
material_standard = b.material_standard, material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS), act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS), act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
workline_name = c.FullName, workline_name = c.FullName,
@@ -994,7 +994,7 @@ namespace Tnb.ProductionMgr
.LeftJoin<PrdFeedingD>((a, b) => a.id == b.material_receipt_detail_id) .LeftJoin<PrdFeedingD>((a, b) => a.id == b.material_receipt_detail_id)
.Where((a, b) => a.barcode == barcode).SumAsync((a, b) => b.num); .Where((a, b) => a.barcode == barcode).SumAsync((a, b) => b.num);
output.list[0].material_name = basMaterial.name; output.list[0].material_name = basMaterial.name;
output.list[0].material_standard = basMaterial.material_standard; output.list[0].material_standard = basMaterial.material_specification;
output.list[0].supplier_name = basSupplier?.supplier_name ?? ""; output.list[0].supplier_name = basSupplier?.supplier_name ?? "";
output.list[0].unit_name = unit?.FullName ?? ""; output.list[0].unit_name = unit?.FullName ?? "";
@@ -1031,7 +1031,7 @@ namespace Tnb.ProductionMgr
mo_code = b.mo_code, mo_code = b.mo_code,
material_code = c.code, material_code = c.code,
material_name = c.name, material_name = c.name,
material_standard = c.material_standard, material_standard = c.material_specification,
children = SqlFunc.Subqueryable<PrdFeedingD>() children = SqlFunc.Subqueryable<PrdFeedingD>()
.LeftJoin<PrdFeedingH>((x, y) => x.feeding_id == y.id) .LeftJoin<PrdFeedingH>((x, y) => x.feeding_id == y.id)
.LeftJoin<UserEntity>((x, y, z) => y.create_id == z.Id) .LeftJoin<UserEntity>((x, y, z) => y.create_id == z.Id)

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

@@ -579,7 +579,7 @@ namespace Tnb.ProductionMgr
mo_code = a.mo_code, mo_code = a.mo_code,
material_code = b.code, material_code = b.code,
material_name = b.name, material_name = b.name,
material_standard = b.material_standard, material_standard = b.material_specification,
mo_type = c.FullName, mo_type = c.FullName,
mo_status = d.FullName, mo_status = d.FullName,
plan_qty = a.plan_qty.Value.ToString(), plan_qty = a.plan_qty.Value.ToString(),
@@ -615,7 +615,7 @@ namespace Tnb.ProductionMgr
mo_code = h.mo_code, mo_code = h.mo_code,
material_code = i.code, material_code = i.code,
material_name = i.name, material_name = i.name,
material_standard = i.material_standard, material_standard = i.material_specification,
mo_type = j.FullName, mo_type = j.FullName,
mo_status = k.FullName, mo_status = k.FullName,
plan_qty = h.plan_qty.Value.ToString(), plan_qty = h.plan_qty.Value.ToString(),
@@ -778,7 +778,7 @@ namespace Tnb.ProductionMgr
eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.eqp_id))?.code!, eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.eqp_id))?.code!,
mold_code = (await db.Queryable<ToolMolds>().FirstAsync(it => it.id == input.mold_id))?.mold_code!, mold_code = (await db.Queryable<ToolMolds>().FirstAsync(it => it.id == input.mold_id))?.mold_code!,
item_code = material?.code!, item_code = material?.code!,
item_standard = material?.material_standard!, item_standard = material?.material_specification!,
status = DictConst.ToBeScheduledEncode, status = DictConst.ToBeScheduledEncode,
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,
@@ -894,7 +894,7 @@ namespace Tnb.ProductionMgr
id = SnowflakeIdHelper.NextId(), id = SnowflakeIdHelper.NextId(),
mo_code = (await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code!, mo_code = (await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code!,
item_code = material_h?.code!, item_code = material_h?.code!,
item_standard = material_h?.material_standard!, item_standard = material_h?.material_specification!,
status = DictConst.ToBeScheduledEncode, status = DictConst.ToBeScheduledEncode,
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,
@@ -1019,7 +1019,7 @@ namespace Tnb.ProductionMgr
subTaskLog.id = SnowflakeIdHelper.NextId(); subTaskLog.id = SnowflakeIdHelper.NextId();
subTaskLog.mo_code = (await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code!; subTaskLog.mo_code = (await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code!;
subTaskLog.item_code = subMaterial?.code!; subTaskLog.item_code = subMaterial?.code!;
subTaskLog.item_standard = subMaterial?.material_standard!; subTaskLog.item_standard = subMaterial?.material_specification!;
subTaskLog.status = DictConst.ToBeScheduledEncode; subTaskLog.status = DictConst.ToBeScheduledEncode;
subTaskLog.operator_name = _userManager.RealName; subTaskLog.operator_name = _userManager.RealName;
subTaskLog.create_id = _userManager.UserId; subTaskLog.create_id = _userManager.UserId;
@@ -1159,13 +1159,13 @@ namespace Tnb.ProductionMgr
throw Oops.Bah("已开始的不能再开始"); throw Oops.Bah("已开始的不能再开始");
} }
if (item.schedule_type == 2) // if (item.schedule_type == 2)
{ // {
if (await db.Queryable<PrdMoTask>().AnyAsync(x => x.workstation_id == item.workstation_id && x.mo_task_status == DictConst.InProgressEnCode && x.id != item.id)) if (await db.Queryable<PrdMoTask>().AnyAsync(x => x.workline_id == item.workline_id && x.mo_task_status == DictConst.InProgressEnCode && x.id != item.id))
{ {
throw Oops.Bah("该工位已有生产中的任务单"); throw Oops.Bah("该产线已有生产中的任务单");
} }
} // }
if (item.mo_task_status is not DictConst.ToBeStartedEnCode and not DictConst.MoStatusPauseCode) if (item.mo_task_status is not DictConst.ToBeStartedEnCode and not DictConst.MoStatusPauseCode)
{ {
@@ -1283,7 +1283,7 @@ namespace Tnb.ProductionMgr
{ {
BasMaterial? material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == taskItem.material_id); BasMaterial? material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == taskItem.material_id);
taskLog.item_code = material?.code!; taskLog.item_code = material?.code!;
taskLog.item_standard = material?.material_standard!; taskLog.item_standard = material?.material_specification!;
} }
taskLog.operator_name = _userManager.RealName; taskLog.operator_name = _userManager.RealName;
taskLog.status = status; taskLog.status = status;
@@ -1410,7 +1410,7 @@ namespace Tnb.ProductionMgr
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == item.parent_id); PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == item.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){parent.batch??""}#{basMaterial.material_standard}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){parent.batch??""}#{basMaterial.material_specification}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase) Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
{ {
["DevName"] = "外包装箱码垛线", ["DevName"] = "外包装箱码垛线",
@@ -1907,6 +1907,7 @@ namespace Tnb.ProductionMgr
bindCarryCodeInput.location_code = location.location_code; bindCarryCodeInput.location_code = location.location_code;
bindCarryCodeInput.code_batch = prdMoTask.batch; bindCarryCodeInput.code_batch = prdMoTask.batch;
Log.Information($"载具绑定参数:${JsonConvert.SerializeObject(bindCarryCodeInput)}");
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result1 = await _wmsCarryService.BindCarryMaterial(bindCarryCodeInput); Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result1 = await _wmsCarryService.BindCarryMaterial(bindCarryCodeInput);
if (result1.code != HttpStatusCode.OK) if (result1.code != HttpStatusCode.OK)
{ {
@@ -1918,7 +1919,7 @@ namespace Tnb.ProductionMgr
wmsPrdInstockInput.material_id = prdMoTask.material_id; wmsPrdInstockInput.material_id = prdMoTask.material_id;
wmsPrdInstockInput.material_code = prdMoTask.material_code; wmsPrdInstockInput.material_code = prdMoTask.material_code;
wmsPrdInstockInput.material_name = basMaterial.name; wmsPrdInstockInput.material_name = basMaterial.name;
wmsPrdInstockInput.material_spec = basMaterial.material_standard; wmsPrdInstockInput.material_spec = basMaterial.material_specification;
wmsPrdInstockInput.planqty = prdMoTask.scheduled_qty.Value; wmsPrdInstockInput.planqty = prdMoTask.scheduled_qty.Value;
wmsPrdInstockInput.pqty = input.reported_qty; wmsPrdInstockInput.pqty = input.reported_qty;
wmsPrdInstockInput.rqty = 0; wmsPrdInstockInput.rqty = 0;
@@ -1943,6 +1944,7 @@ namespace Tnb.ProductionMgr
carry_id = wmsCarryH.id, carry_id = wmsCarryH.id,
}); });
Log.Information($"生产入库参数:${JsonConvert.SerializeObject(wmsPrdInstockInput)}");
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsPrdInstockHService.PrdInstock(wmsPrdInstockInput); Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsPrdInstockHService.PrdInstock(wmsPrdInstockInput);
if (result2 != null) if (result2 != null)
{ {
@@ -2523,7 +2525,7 @@ namespace Tnb.ProductionMgr
eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.equip_id))?.code!, eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == input.equip_id))?.code!,
mold_code = "", mold_code = "",
item_code = material?.code!, item_code = material?.code!,
item_standard = material?.material_standard!, item_standard = material?.material_specification!,
status = "更换机台", status = "更换机台",
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,
@@ -2570,7 +2572,7 @@ namespace Tnb.ProductionMgr
eqp_code = "", eqp_code = "",
mold_code = mold?.mold_code, mold_code = mold?.mold_code,
item_code = material?.code!, item_code = material?.code!,
item_standard = material?.material_standard!, item_standard = material?.material_specification!,
status = "更换模具", status = "更换模具",
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,
@@ -2617,7 +2619,7 @@ namespace Tnb.ProductionMgr
eqp_code = "", eqp_code = "",
mold_code = "", mold_code = "",
item_code = material?.code!, item_code = material?.code!,
item_standard = material?.material_standard!, item_standard = material?.material_specification!,
status = "更换产线", status = "更换产线",
operator_name = _userManager.RealName, operator_name = _userManager.RealName,
create_id = _userManager.UserId, create_id = _userManager.UserId,
@@ -3226,7 +3228,7 @@ namespace Tnb.ProductionMgr
PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id); PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id); BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){parent.batch??""}#{basMaterial.material_standard}*{parent.batch??""}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){parent.batch??""}#{basMaterial.material_specification}*{parent.batch??""}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
return code; return code;
} }
} }

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

@@ -436,7 +436,7 @@ namespace Tnb.ProductionMgr
material_id = a.material_id, material_id = a.material_id,
material_code = b.code, material_code = b.code,
material_name = b.name, material_name = b.name,
material_standard = b.material_standard, material_standard = b.material_specification,
container_no = b.container_no, container_no = b.container_no,
di = b.di, di = b.di,
workline_id = a.workline_id, workline_id = a.workline_id,