RIZO/guiyang-fluorescent-line-lmes-backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首检

Browse Source
This commit is contained in:
quowingwang 2025-11-26 15:15:17 +08:00
parent 3006f2574f
commit 5c099ebca5
8 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs
View File

@ -105,9 +105,9 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo
/// <returns></returns>
[HttpPost("createWorkOrderBySacnCode")]
[Log(Title = "扫码新增工单主表", BusinessType = BusinessType.INSERT)]
public ApiResult CreateWorkOrderBySacnCode([FromBody] string json)
public ApiResult CreateWorkOrderBySacnCode([FromBody] FlowCard flowCard)
{
var response = _WorkOrderService.CreateWorkOrderBySacnCode(json);
var response = _WorkOrderService.CreateWorkOrderBySacnCode(flowCard);
return response;
}

4
RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs
View File

@ -131,9 +131,9 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo
/// <returns></returns>
[HttpPost("createWorkOrderItemBySacnCode")]
[Log(Title = "扫码新增工单主表", BusinessType = BusinessType.INSERT)]
public ApiResult CreateWorkOrderItemBySacnCode(string json)
public ApiResult CreateWorkOrderItemBySacnCode([FromBody] PartsBasketCard partsBasketCard)
{
var response = _WorkOrderItemService.CreateWorkOrderItemBySacnCode(json);
var response = _WorkOrderItemService.CreateWorkOrderItemBySacnCode(partsBasketCard);
return response;
}
}

4
RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs
View File

@ -14,7 +14,7 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
public string PartsBasketNo { get; set; }
//工艺特性（自乳化，后乳化四级、后乳化四级）
public string Character { get; set; }
//是否清洗
//是否清洗，0否1是
public int IfClean { get; set; }
public string LineCode { get; set; }
@ -24,5 +24,7 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
public string ProcessName { get; set; }
public string UserId { get; set; }
public string UserName { get; set; }
//是否首检，0否1是
public int FirstInspection { get; set; }
}
}

6
RIZO.Model/Mes/WorkOrderInfo/WorkOrderItem.cs
View File

@ -138,5 +138,11 @@ namespace RIZO.Model.Mes.WorkOrderInfo
[SugarColumn(ColumnName = "ifClean")]
public int IfClean { get; set; }
/// <summary>
/// 是否首检（0否，1是）
/// </summary>
[SugarColumn(ColumnName = "first_Inspection")]
public int FirstInspection { get; set; }
}
}

2
RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderItemService.cs
View File

@ -20,7 +20,7 @@ namespace RIZO.Service.Mes.IMesService.WorkOrderInfo
WorkOrderItem AddWorkOrderItem(WorkOrderItem parm);
int UpdateWorkOrderItem(WorkOrderItem parm);
ApiResult CreateWorkOrderItemBySacnCode(string json);
ApiResult CreateWorkOrderItemBySacnCode(PartsBasketCard partsBasketCard);
}

2
RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs
View File

@ -20,7 +20,7 @@ namespace RIZO.Service.Mes.IMesService.WorkOrderInfo
WorkOrder AddWorkOrder(WorkOrder parm);
int UpdateWorkOrder(WorkOrder parm);
ApiResult CreateWorkOrderBySacnCode(string json);
ApiResult CreateWorkOrderBySacnCode(FlowCard flowCard);
int ChangeWorkOrderState(WorkOrderState parm);

31
RIZO.Service/Mes/WorkOrderInfo/WorkOrderItemService.cs
View File

@ -121,24 +121,24 @@ namespace RIZO.Service.Mes.WorkOrderInfo
return predicate;
}
public ApiResult CreateWorkOrderItemBySacnCode(string json)
public ApiResult CreateWorkOrderItemBySacnCode(PartsBasketCard partsBasketCard)
{
try
{
if (string.IsNullOrWhiteSpace(json))
{
return ApiResult.Error(400, "扫码数据为空，请重新扫码");
}
//字符串转对象
PartsBasketCard partsBasketCard = new PartsBasketCard();
try
{
partsBasketCard = JsonConvert.DeserializeObject<PartsBasketCard>(json);
}
catch (Exception ex)
{
return ApiResult.Error(400, "扫码数据格式错误，无法解析");
}
//if (string.IsNullOrWhiteSpace(json))
//{
// return ApiResult.Error(400, "扫码数据为空，请重新扫码");
//}
////字符串转对象
//PartsBasketCard partsBasketCard = new PartsBasketCard();
//try
//{
// partsBasketCard = JsonConvert.DeserializeObject<PartsBasketCard>(json);
//}
//catch (Exception ex)
//{
// return ApiResult.Error(400, "扫码数据格式错误，无法解析");
//}
string plcCode = "";
PlcFirstCode plcFirstCode = plcFirstCodeService.Queryable()
.Where(it => it.Character == partsBasketCard.Character).First();
@ -162,6 +162,7 @@ namespace RIZO.Service.Mes.WorkOrderInfo
workOrderItem1.WorkOrderCode = partsBasketCard.WorkOrderCode;
workOrderItem1.WorkOrderItemCode = strWorkOrderItemCode;
workOrderItem1.PlcCode = plcCode;
workOrderItem1.FirstInspection = partsBasketCard.FirstInspection;
workOrderItem1.LineCode = partsBasketCard.LineCode;
workOrderItem1.LineName = partsBasketCard.LineName;
workOrderItem1.ProcessCode = partsBasketCard.ProcessCode;

28
RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
View File

@ -131,16 +131,16 @@ namespace RIZO.Service.Mes.WorkOrderInfo
}
public ApiResult CreateWorkOrderBySacnCode(string json)
public ApiResult CreateWorkOrderBySacnCode(FlowCard flowCard)
{
try
{
WorkOrder orderInfoNew = new WorkOrder();
if (string.IsNullOrWhiteSpace(json))
{
return ApiResult.Error(400,"扫码数据为空，请重新扫码");
}
//if (string.IsNullOrWhiteSpace(json))
//{
// return ApiResult.Error(400,"扫码数据为空，请重新扫码");
//}
//扫码信息转成FlowCard对象
//假设扫码结果是json形式
//{
@ -153,15 +153,15 @@ namespace RIZO.Service.Mes.WorkOrderInfo
// "TotalQty": 100
//}
//字符串转对象
FlowCard flowCard = new FlowCard();
try
{
flowCard = JsonConvert.DeserializeObject<FlowCard>(json);
}
catch (Exception ex)
{
return ApiResult.Error(400, "扫码数据格式错误，无法解析");
}
//FlowCard flowCard = new FlowCard();
//try
//{
// flowCard = JsonConvert.DeserializeObject<FlowCard>(json);
//}
//catch (Exception ex)
//{
// return ApiResult.Error(400, "扫码数据格式错误，无法解析");
//}
//根据IDCode解析的数据去检索物料档案
//var material = materialListService.Queryable().Where(it => it.Code == flowCard.MaterialCode).First();
//if (material != null)