|
|
|
@ -230,7 +230,7 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
|
|
|
|
|
List<MesShiftProdCenterRecord> shiftProdCenterRecordList = getShiftProdCenterRecordList(
|
|
|
|
|
centerRecordModel.getOrganizeCode(), workTime, centerRecordModel.getWorkCenterCode(), shiftDb.getShiftCode());
|
|
|
|
|
|
|
|
|
|
MesShiftProdCenterRecord startOrEndShiftRecord = new MesShiftProdCenterRecord();
|
|
|
|
|
MesShiftProdCenterRecord startOrEndShiftRecord = null;
|
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(shiftProdCenterRecordList)) {
|
|
|
|
|
|
|
|
|
@ -283,6 +283,11 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (startOrEndShiftRecord == null) {
|
|
|
|
|
startOrEndShiftRecord = new MesShiftProdCenterRecord();
|
|
|
|
|
ConvertBean.serviceModelInitialize(startOrEndShiftRecord, centerRecordModel.getModifyUser());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
startOrEndShiftRecord.setWorkCenterCode(centerRecordModel.getWorkCenterCode());
|
|
|
|
|
startOrEndShiftRecord.setStartTime(centerRecordModel.getStartTime());
|
|
|
|
|
startOrEndShiftRecord.setShiftCode(shiftDb.getShiftCode());
|
|
|
|
@ -295,8 +300,9 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
|
|
|
|
|
startOrEndShiftRecord.setQuitWorkNum(centerRecordModel.getQuitWorkNum());
|
|
|
|
|
startOrEndShiftRecord.setWorkerQty(centerRecordModel.getWorkerQty());
|
|
|
|
|
startOrEndShiftRecord.setProdType(MesPcnExtEnumUtil.SHIFT_PROD_TYPE.START_OR_END_SHIFT_TIME.getValue());
|
|
|
|
|
startOrEndShiftRecord.setOrganizeCode(centerRecordModel.getOrganizeCode());
|
|
|
|
|
|
|
|
|
|
shiftProdCenterRecordRepository.insert(startOrEndShiftRecord);
|
|
|
|
|
shiftProdCenterRecordRepository.save(startOrEndShiftRecord);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|