|
|
@ -507,20 +507,22 @@ func (impl *ParseMesWorkOrderServiceImplement) DealArtDemand(pid int, |
|
|
|
return err |
|
|
|
} |
|
|
|
artDemandHead := logModel.ArtDemandHead{ |
|
|
|
Source: workOrder.OrderType, |
|
|
|
UnproducedQty: workOrderQty.PlanQty - workOrderQty.ActQty - workOrderQty.ActQty1, |
|
|
|
DemandId: demandId, |
|
|
|
ArtId: workOrder.ArtId, |
|
|
|
DemandType: "byDay", |
|
|
|
DemandYear: demandTime.Year(), |
|
|
|
DemandMonth: int(demandTime.Month()), |
|
|
|
DemandWeek: weekIndex, |
|
|
|
DemandTime: workOrder.PlanEndTime, |
|
|
|
DemandDate: grmi.Date(demandTime), |
|
|
|
DemandQty: workOrderQty.PlanQty, |
|
|
|
Status: logModel.WaitReceivingStatus, |
|
|
|
OrderStatus: workOrderStatus.Status, |
|
|
|
QtyUomId: workOrder.QtyUomId, |
|
|
|
Source: workOrder.OrderType, |
|
|
|
UnproducedQty: workOrderQty.PlanQty - workOrderQty.ActQty - workOrderQty.ActQty1, |
|
|
|
DemandId: demandId, |
|
|
|
ArtId: workOrder.ArtId, |
|
|
|
DemandType: "byDay", |
|
|
|
DemandYear: demandTime.Year(), |
|
|
|
DemandMonth: int(demandTime.Month()), |
|
|
|
DemandWeek: weekIndex, |
|
|
|
DemandTime: workOrder.PlanEndTime, |
|
|
|
DemandDate: grmi.Date(demandTime), |
|
|
|
DemandQty: workOrderQty.PlanQty, |
|
|
|
Status: logModel.WaitReceivingStatus, |
|
|
|
OrderStatus: workOrderStatus.Status, |
|
|
|
QtyUomId: workOrder.QtyUomId, |
|
|
|
// project id
|
|
|
|
DemandCtrlPara3: workOrder.ProjectId, |
|
|
|
} |
|
|
|
err = artDemandHeadDao.InsertOne(&artDemandHead) |
|
|
|
if err != nil { |
|
|
@ -694,7 +696,6 @@ func (impl *ParseMesWorkOrderServiceImplement) DealArtDemand(pid int, |
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************************** |
|
|
|
* |
|
|
|
* @Reference LAPP_GAAS_GFrame_BACKEND/services/om/ParseMesWorkOrder.OMParseDemandFromDB |
|
|
@ -733,7 +734,6 @@ func (impl *ParseMesWorkOrderServiceImplement) OMParseDemandFromDB(plantNr int) |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************************** |
|
|
|
* |
|
|
|
* @Reference LAPP_GAAS_GFrame_BACKEND/services/om/ParseMesWorkOrder.DealDBDemandHead |
|
|
@ -947,7 +947,6 @@ func (impl *ParseMesWorkOrderServiceImplement) DealDBDemandHead(demandHead model |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************************** |
|
|
|
* |
|
|
|
* @Reference LAPP_GAAS_GFrame_BACKEND/services/om/ParseMesWorkOrder.DealIntervalFileDemandHead |
|
|
@ -1049,7 +1048,6 @@ func (impl *ParseMesWorkOrderServiceImplement) DealIntervalFileDemandHead(demand |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (impl *ParseMesWorkOrderServiceImplement) DealINTWorkOrder(pid int, |
|
|
|
custOrder *model.CustOrder, |
|
|
|
qty float64, |
|
|
@ -1057,7 +1055,7 @@ func (impl *ParseMesWorkOrderServiceImplement) DealINTWorkOrder(pid int, |
|
|
|
workOrderStatusDao dal.WorkOrderStatusDAO, |
|
|
|
workOrderQtyDao dal.WorkOrderQtyDAO, |
|
|
|
articleDao baseDal.ArticleDAO, |
|
|
|
) (err error) { |
|
|
|
) (err error) { |
|
|
|
user := "crontab" |
|
|
|
var workOrder model.WorkOrder |
|
|
|
var workOrderStatus model.WorkOrderStatus |
|
|
@ -1155,4 +1153,4 @@ func (impl *ParseMesWorkOrderServiceImplement) DealINTWorkOrder(pid int, |
|
|
|
} |
|
|
|
} |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |