|
|
@ -98,7 +98,7 @@ public class MesWorkOrderSaveSortStepService extends BaseStepService {
|
|
|
|
if (!isEndWorkCell && productionPartContext.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) == 0) continue;
|
|
|
|
if (!isEndWorkCell && productionPartContext.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) == 0) continue;
|
|
|
|
|
|
|
|
|
|
|
|
if (!isEndWorkCell) {
|
|
|
|
if (!isEndWorkCell) {
|
|
|
|
workOrderRepository.updateByProperties(
|
|
|
|
workOrderRepository.updateByPropertiesNoSync(
|
|
|
|
new String[]{MesPcnExtConstWords.ID, MesPcnExtConstWords.ORGANIZE_CODE},
|
|
|
|
new String[]{MesPcnExtConstWords.ID, MesPcnExtConstWords.ORGANIZE_CODE},
|
|
|
|
new Object[]{productionPartContext.getId(), reqBean.getOrganizeCode()},
|
|
|
|
new Object[]{productionPartContext.getId(), reqBean.getOrganizeCode()},
|
|
|
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME,
|
|
|
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME,
|
|
|
@ -109,7 +109,7 @@ public class MesWorkOrderSaveSortStepService extends BaseStepService {
|
|
|
|
MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue(), productionPartContext.getOnlineTime(), productionPartContext.getOnlineTime()});
|
|
|
|
MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue(), productionPartContext.getOnlineTime(), productionPartContext.getOnlineTime()});
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
productionPartContext.setOfflineTime(TimeTool.getNowTime(true));
|
|
|
|
productionPartContext.setOfflineTime(TimeTool.getNowTime(true));
|
|
|
|
workOrderRepository.updateByProperties(
|
|
|
|
workOrderRepository.updateByPropertiesNoSync(
|
|
|
|
new String[]{MesPcnExtConstWords.ID, MesPcnExtConstWords.ORGANIZE_CODE},
|
|
|
|
new String[]{MesPcnExtConstWords.ID, MesPcnExtConstWords.ORGANIZE_CODE},
|
|
|
|
new Object[]{productionPartContext.getId(), reqBean.getOrganizeCode()},
|
|
|
|
new Object[]{productionPartContext.getId(), reqBean.getOrganizeCode()},
|
|
|
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME,
|
|
|
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME,
|
|
|
|