|
|
@@ -94,6 +94,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// </summary>
|
|
|
public List<mo_mes_mooccupy> mo_Mes_Mooccupies = new List<mo_mes_mooccupy>();
|
|
|
|
|
|
+ private readonly SerialNumberAppService _serialNumberAppService;
|
|
|
|
|
|
private readonly ISqlRepository<rf_serialnumber> _rf_serialnumber;
|
|
|
#endregion
|
|
|
@@ -110,6 +111,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//IRepository<crm_seorder, long> mysql_crm_seorder,
|
|
|
//IRepository<crm_seorderentry, long> mysql_crm_seorderentry,
|
|
|
ProductExamineAppService productExamineAppService,
|
|
|
+ SerialNumberAppService serialNumberAppService,
|
|
|
ISqlRepository<rf_serialnumber> rf_serialnumber
|
|
|
)
|
|
|
{
|
|
|
@@ -121,6 +123,7 @@ namespace Business.ResourceExamineManagement
|
|
|
//_mysql_crm_seorderentry = mysql_crm_seorderentry;
|
|
|
_productExamineAppService = productExamineAppService;
|
|
|
_rf_serialnumber = rf_serialnumber;
|
|
|
+ _serialNumberAppService = serialNumberAppService;
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
@@ -149,7 +152,16 @@ namespace Business.ResourceExamineManagement
|
|
|
//mes_Morder.morder_icitem_type
|
|
|
mes_Morder.work_order_type = generateMorderDto.work_order_type;
|
|
|
mes_Morder.morder_state = generateMorderDto.morder_state;
|
|
|
- mes_Morder.morder_no = GetMaxSerialNumber(418022612537413);//WWPO
|
|
|
+
|
|
|
+ var nbrlistDto = _serialNumberAppService.GetBillNo(param.factoryId.ToString(), "M5", 1, "", 1);
|
|
|
+ if (nbrlistDto.Any())
|
|
|
+ {
|
|
|
+ mes_Morder.morder_no = nbrlistDto[0].NbrResult;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ //补救
|
|
|
+ mes_Morder.morder_no = GetMaxSerialNumber(418022612537413);//WWPO
|
|
|
+ }
|
|
|
mes_Morder.fms_number = generateMorderDto.ic_Item.fms_number;
|
|
|
mes_Morder.bom_number = generateMorderDto.BomNumber;
|
|
|
mes_Morder.fmodel = generateMorderDto.ic_Item.model;
|