46751 MES：设备实时值查询，条码字段没有展示。

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentLogService.java

@@ -8,7 +8,6 @@ public interface IMesEquipmentLogService {
     void saveEquipmentLogToRedis(ActorMessage actorMessage);
 
     void saveEquipmentLogDetails(String organizeCode, String userInfo, Integer qty);
-    void saveEquipmentLogDetailsById(String organizeCode, String userInfo, Long id);
 
     void updateValue(EquipLogMqttMsg equipLogMqttMsg);
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 
-import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentLogService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderService;
 import cn.estsh.i3plus.ext.mes.pcn.api.job.IMesWorkOrderOfflineRestoreService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob.MesReportNoSortJob;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob.MesReportWorkByPreDayJob;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesShiftRepository;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -44,28 +42,25 @@ public class TestController {
     @Autowired
     private IMesWorkOrderOfflineRestoreService workOrderOfflineRestoreService;
 
-    @Autowired
-    private IMesEquipmentLogService mesEquipmentLogService;
-
     @GetMapping("/reportWorkByPreDayJob")
     @ApiOperation(value = "查询设备交互")
     public ResultBean queryReworkTaskByPager(String organizeCode) {
       return  null;
     }
 
-    @GetMapping("/reportOrder")
-    @ApiOperation(value = "报工")
-    public void reportOrder() {
-        mesReportNoSortJob.executeMesJob(null, null);
-
-    }
+//    @GetMapping("/reportOrder")
+//    @ApiOperation(value = "报工")
+//    public void reportOrder() {
+//        mesReportNoSortJob.executeMesJob(null, null);
+//
+//    }
 
-    @GetMapping("/reportOrder1")
-    @ApiOperation(value = "报工")
-    public void reportOrder1() {
-        mesReportWorkByPreDayJob.executeMesJob(null, null);
-
-    }
+//    @GetMapping("/reportOrder1")
+//    @ApiOperation(value = "报工")
+//    public void reportOrder1() {
+//        mesReportWorkByPreDayJob.executeMesJob(null, null);
+//
+//    }
 
     @GetMapping("/MesReportSortJob")
     @ApiOperation(value = "排序工单汇报")
@@ -93,16 +88,4 @@ public class TestController {
         }
     }
 
-    @GetMapping("/testMesSaveVariableJob")
-    @ApiOperation(value = "保存工艺参数job")
-    public ResultBean testMesSaveVariableJob(Long id) {
-        try {
-            mesEquipmentLogService.saveEquipmentLogDetailsById("CF08", MesPcnExtConstWords.JOB, id);
-            return ResultBean.success("操作成功");
-        } catch (ImppBusiException imppException) {
-            return ResultBean.fail(imppException);
-        } catch (Exception e) {
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java

@@ -210,8 +210,6 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
         StringBuffer builder = new StringBuffer();
 
         Integer index = 0;
-        for (MesEquipVariableCollectContext equipmentLog : equipmentLogList) {
-            if (null == equipmentLog) continue;
 
         builder.append(" insert into mes_equipment_log_detail_");
         if (!StringUtils.isEmpty(mesShardingAppendOrg) && mesShardingAppendOrg.toUpperCase().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.name())) builder.append(organizeCode.toLowerCase()).append(MesPcnExtConstWords.E_UNDERLINE);
@@ -220,8 +218,12 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
         builder.append(" description, remark, system_sync_date_time, system_sync_status,");
         builder.append(" area_code, work_center_code, work_cell_code, equipment_code, process_code, craft_code,");
         builder.append(" mould_record_id, extend, org_equip_id, equip_id, equip_variable_id, equip_variable_name, equip_variable_desc,");
-            builder.append(" read_write_flag, data_type, equip_variable_value, variable_type, category_level_two, quality)");
-            builder.append(" values ( ");
+        builder.append(" read_write_flag, data_type, equip_variable_value, variable_type, category_level_two, quality) values ");
+
+        for (MesEquipVariableCollectContext equipmentLog : equipmentLogList) {
+            if (null == equipmentLog) continue;
+
+            builder.append(" ( ");
 
             for (int i = 0; i < equipmentLogDetailFields.length; i ++) {
                 if (StringUtils.isEmpty(equipmentLogDetailFields[i])) continue;
@@ -233,7 +235,8 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
                 if (i != equipmentLogDetailFields.length - 1) builder.append(" , ");
             }
 
-            builder.append(" );");
+            builder.append(" ) ");
+            if (index != equipmentLogList.size() - 1) builder.append(" , ");
 
             index ++;
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java

@@ -136,17 +136,6 @@ public class MesEquipmentLogService implements IMesEquipmentLogService {
 
     }
 
-    @Override
-    public void saveEquipmentLogDetailsById(String organizeCode, String userInfo, Long id) {
-
-        MesEquipmentRecord equipmentRecord = mesEquipmentRecordRepository.getById(id);
-
-        if (null == equipmentRecord) return;
-
-        saveEquipmentLogDetail(organizeCode, userInfo, 50, equipmentRecord);
-
-    }
-
     private void saveEquipmentLogDetail(String organizeCode, String userInfo, Integer qty, MesEquipmentRecord mesEquipmentRecord) {
 
         String key = getKey(mesEquipmentRecord);