设备停机修改

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionEquDowntimeService.java

@@ -82,32 +82,23 @@ public class MesFunctionEquDowntimeService extends BaseSwsService implements IFs
             if (!StringUtil.isEmpty(type)) {
                 DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
             }
-            MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
-            if (StringUtil.isEmpty(mesDowntimeRecordDao)) {
-                //新增设备停机记录
-                MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
-                mesDowntimeRecord.setOrganizeCode(organizeCode);
-                mesDowntimeRecord.setEquipId(mesEquipment.getEquipId());
-                mesDowntimeRecord.setEquipmentCode(mesEquipment.getEquipmentCode());
-                mesDowntimeRecord.setAreaCode(reqBean.getAreaCode());
-                mesDowntimeRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
-                mesDowntimeRecord.setWorkCellCode(reqBean.getWorkCellCode());
-                mesDowntimeRecord.setReasonCode(StringUtil.isEmpty(reason) ? "" : reason);
-                mesDowntimeRecord.setReasonTypeCode(StringUtil.isEmpty(type) ? "" : type);
-                ConvertBean.serviceModelInitialize(mesDowntimeRecord, userInfo);
+            //新增设备停机记录
+            MesDowntimeRecord mesDowntimeRecord = new MesDowntimeRecord();
+            mesDowntimeRecord.setOrganizeCode(organizeCode);
+            mesDowntimeRecord.setEquipId(mesEquipment.getEquipId());
+            mesDowntimeRecord.setEquipmentCode(mesEquipment.getEquipmentCode());
+            mesDowntimeRecord.setAreaCode(reqBean.getAreaCode());
+            mesDowntimeRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
+            mesDowntimeRecord.setWorkCellCode(reqBean.getWorkCellCode());
+            mesDowntimeRecord.setReasonCode(StringUtil.isEmpty(reason) ? "" : reason);
+            mesDowntimeRecord.setReasonTypeCode(StringUtil.isEmpty(type) ? "" : type);
+            ConvertBean.serviceModelInitialize(mesDowntimeRecord, userInfo);
+            mesDowntimeRecord.setModifyDatetime(null);
+            mesDowntimeRecordRDao.insert(mesDowntimeRecord);
+
 
-                mesDowntimeRecordRDao.insert(mesDowntimeRecord);
-//                //将当前新增数据的create_date_time时间些到上一条记录的modify_date_time字段
-//                DdlPackBean ddlPackBeanOt = DdlPackBean.getDdlPackBean(organizeCode);
-//                DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanOt);
-//                ddlPackBeanOt.setWhereAppend(ddlPackBeanOt.getWhereAppend() + " order by createDatetime desc ");
-//                MesDowntimeRecord mesDowntimeRecordOt = mesDowntimeRecordRDao.getByProperty(ddlPackBeanOt);
-//                if (StringUtil.isEmpty(mesDowntimeRecordOt)) {
-//                    mesDowntimeRecordOt.setModifyDatetime(mesDowntimeRecord.getCreateDatetime());
-//                    mesDowntimeRecordOt.setModifyUser(userInfo);
-//                    mesDowntimeRecordRDao.update(mesDowntimeRecordOt);
-//                }
-            } else {
+            MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
+            if (!StringUtil.isEmpty(mesDowntimeRecordDao)) {
                 ConvertBean.serviceModelUpdate(mesDowntimeRecordDao, "MesDowntimeRecordJob");
                 mesDowntimeRecordRDao.update(mesDowntimeRecordDao);
             }