jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev_temp_xw_202502120000_45071' into dev

Browse Source
dev
xiangwei.zhang 3 months ago
parent ae99dcbf12 d912b19680
commit 6f5ecda4aa
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File

20
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
Unescape Escape View File

@ -624,12 +624,17 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} }
item.setShiftName(mesShift.getShiftName()); item.setShiftName(mesShift.getShiftName());
try { try {
//拼接 if (StringUtil.isEmpty(item.getPlanStartTime())) {
item.setPlanStartTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getStartTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT)); //拼接
item.setPlanEndTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getEndTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT)); item.setPlanStartTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getStartTime(), DateUtil.BASE_FORMAT1, DateUtil.BASE_FORMAT));
int windowStartEndTimeCompare = DateUtilExt.compareDateTime(DateUtil.BASE_FORMAT, item.getPlanStartTime(), item.getPlanEndTime()); }
if (windowStartEndTimeCompare > 0) { if (StringUtil.isEmpty(item.getPlanEndTime())) {
item.setPlanEndTime(TimeTool.pareDateToString(DateUtil.addDays(item.getPlanEndTime(), 1))); //拼接
item.setPlanEndTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getEndTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
int windowStartEndTimeCompare = DateUtilExt.compareDateTime(DateUtil.BASE_FORMAT, item.getPlanStartTime(), item.getPlanEndTime());
if (windowStartEndTimeCompare > 0) {
item.setPlanEndTime(TimeTool.pareDateToString(DateUtil.addDays(item.getPlanEndTime(), 1)));
}
} }
} catch (Exception e) { } catch (Exception e) {
MesException.throwMesBusiException("时间格式异常"); MesException.throwMesBusiException("时间格式异常");
@ -699,7 +704,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} }
item.setProductSeq(productSeq + 1); item.setProductSeq(productSeq + 1);
item.setWorkOrderSeq(seqList.get(index)); item.setWorkOrderSeq(seqList.get(index));
} else {
item.setProductSeq(Long.valueOf(item.getWorkOrderSeq()));
} }
item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
ConvertBean.serviceModelInitialize(item, item.getCreateUser()); ConvertBean.serviceModelInitialize(item, item.getCreateUser());
baseRDao.insert(item); baseRDao.insert(item);

Write Preview
Loading…
Cancel
Save