前一天报工改成前20天

master
xiangwei.zhang 6 months ago
parent 0dd22c25b8
commit 4d9a028d82

@ -920,7 +920,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
} }
//获取前一天的早班到当天早班的区间的所有加工记录,统计个数 //获取前一天的早班到当天早班的区间的所有加工记录,统计个数
DdlPreparedPack.timeBuilder( DdlPreparedPack.timeBuilder(
new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)) + startTime, new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 20)) + startTime,
TimeTool.getToday() + startTime, TimeTool.getToday() + startTime,
"completeDateTime", ddlPackBean, false); "completeDateTime", ddlPackBean, false);
@ -1176,7 +1176,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
item.setShiftCode(mesShift.getShiftCode()); item.setShiftCode(mesShift.getShiftCode());
item.setShiftName(mesShift.getShiftName()); item.setShiftName(mesShift.getShiftName());
String today = TimeTool.getToday(); String today = TimeTool.getToday();
String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)); String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 20));
item.setPlanStartTime(dayBefore + " " + mesShift.getStartTime()); item.setPlanStartTime(dayBefore + " " + mesShift.getStartTime());
item.setPlanEndTime(today + " " + mesShift.getEndTime()); item.setPlanEndTime(today + " " + mesShift.getEndTime());
@ -1277,10 +1277,10 @@ public class MesWorkOrderService implements IMesWorkOrderService {
newMesProductOffLine.setItemUnit(mesBom.getItemUnit()); newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType()); newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
newMesProductOffLine.setReportType(mesWorkOrder.getReportType()); newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getErpWorkCenter()); newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode()); newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
newMesProductOffLine.setDescription(nowTime); newMesProductOffLine.setDescription(nowTime);
newMesProductOffLine.setBomTotalSize(bomTotalSize); newMesProductOffLine.setBomTotalSize(bomTotalSize);

Loading…
Cancel
Save