新增喷涂机器人采集, mes过程扫码数据接入;

src/main/java/net/vtstar/zhongtong/avi/equipment/job/CleanStatusDataJob.java

@@ -59,27 +59,34 @@ public class CleanStatusDataJob extends QuartzJobBean {
                 if (CollectionUtils.isEmpty(dataList)) {
                     continue;
                 }
-                if (key.contains("DRYING_ROOM_TEMP")) {
+                EquipmentData data = dataList.get(0);
+                String equipType = data.getEquipType();
+                if (null != equipType && equipType.contains("DRYING_ROOM_TEMP")) {
                     //插入设备监控数据
-                    equipmentDataMapper.insert(dataList.get(0));
+                    equipmentDataMapper.insert(data);
                 } else {
                     //插入设备监控数据
                     List<EquipmentData> collect = dataList.stream().filter(item -> !EquipStatusEnum.SHUTDOWN.equals(item.getEquipStatus())).collect(Collectors.toList());
-                    equipmentDataMapper.insertList(collect);
+                    if (CollectionUtils.isEmpty(collect)){
+                        continue;
+                    }
+                    if (null != equipType && !equipType.contains("LASER_CUTTING")){
+                        equipmentDataMapper.insertList(collect);
+                    }
                 }
-                if (key.contains("DRYING_ROOM_TEMP") || key.contains("SPRAY_BOOTH")) {
+                if ((null != equipType && equipType.contains("DRYING_ROOM_TEMP")) || (null != equipType && equipType.contains("SPRAY_BOOTH"))) {
                     continue;
                 }
                 equipDataService.updateLastStatus(dataList.get(dataList.size() - 1));
 
-                String equipCode = dataList.get(0).getEquipCode();
+                String equipCode = data.getEquipCode();
                 EquipmentData last = equipDataService.getLast(equipCode);
                 final EquipmentData first = last;
                 int index = 1;
                 for (int i = 0; i < dataList.size(); i++) {
 
                     if (last == null) {
-                        last = dataList.get(0);
+                        last = data;
                         continue;
                     }
 

src/main/java/net/vtstar/zhongtong/avi/equipment/service/EquipmentService.java

@@ -248,7 +248,7 @@ public class EquipmentService {
             //平板激光切割机
             case "076707-177":
                 ip = "10.1.25.181";
-                path = "smb://" + ip + "/NCPrg/";
+                path = "smb://" + ip + "/NcProng/";
                 break;
         }
         return SmbFileUtil.smbPut(path, transferVO.getFilePath(), auth);

src/main/java/net/vtstar/zhongtong/avi/gateway/stamping/job/FlatLaserCuttingMachineJob.java

@@ -84,6 +84,7 @@ public class FlatLaserCuttingMachineJob extends QuartzJobBean {
             machine.setStatus("1");
             machine.setEquipFactory(equipFactory);
             machine.setBeginTime(new Date());
+            machine.setEquipType("FLAT_LASER_CUTTING");
             if (!PingIpUtils.ping(ipAddress, pingTimes, timeOut)) {
                 realTimeService.saveEquip("制件车间", equipCode, equipName, "关机");
                 machine.setEquipStatus(EquipStatusEnum.SHUTDOWN);

src/main/java/net/vtstar/zhongtong/avi/gateway/stamping/job/LaserCutting3DMachineJob.java

@@ -67,6 +67,7 @@ public class LaserCutting3DMachineJob extends QuartzJobBean {
             machine.setStatus("1");
             machine.setBeginTime(new Date());
             machine.setEquipFactory(equipFactory);
+            machine.setEquipType("3D_LASER_CUTTING");
             if (!PingIpUtils.ping(ipAddress, pingTimes, timeOut)) {
                 realTimeService.saveEquip("制件车间", equipCode, equipName, "关机");
                 machine.setEquipStatus(EquipStatusEnum.SHUTDOWN);

src/main/java/net/vtstar/zhongtong/avi/gateway/stamping/job/LaserCuttingMachineJob.java

@@ -72,6 +72,7 @@ public class LaserCuttingMachineJob extends QuartzJobBean {
             machine.setStatus("1");
             machine.setBeginTime(new Date());
             machine.setEquipFactory(equipFactory);
+            machine.setEquipType("LASER_CUTTING");
             if (!PingIpUtils.ping(ipAddress, pingTimes, timeOut)) {
                 realTimeService.saveEquip("制件车间", equipCode, equipName, "关机");
                 machine.setEquipStatus(EquipStatusEnum.SHUTDOWN);

src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/MesScanCodeDpInfo.java

@@ -62,10 +62,8 @@ public class MesScanCodeDpInfo {
     @Search
     private String SupplierName;
 
-    @Show(label = "车间ID")
     @ApiModelProperty(notes = "车间ID")
     @Column(name = "workshopID")
-    @Search
     private String workshopID;
 
     @Show(label = "产线ID")

src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/MesScanCodeZpInfo.java

@@ -62,10 +62,8 @@ public class MesScanCodeZpInfo {
     @Search
     private String SupplierName;
 
-    @Show(label = "车间ID")
     @ApiModelProperty(notes = "车间ID")
     @Column(name = "workshopID")
-    @Search
     private String workshopID;
 
     @Show(label = "产线ID")

src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/MesScanCodeDpJob.java

@@ -51,11 +51,15 @@ public class MesScanCodeDpJob extends QuartzJobBean {
         Date startOfDay = DateUtils.getStartOfDay(0);
         String dateString = DateUtils.parseDateToString(startOfDay, "yyyy-MM-dd HH:mm:ss");
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT SaleOrderNO, VehicleID, PartTraceID, PartDrawingNo,PartDrawingName, SupplierNo, SupplierName, workshopID," +
-                " workLineID, WPCode, ProductionBatch, OperationTime, OperationPerson, OperationPersonName, IsSpecified," +
-                " Deleted, Memo, WkStation, DocClosedBy, Operation, DocClosed, CrtDate, UpdDate, Archived," +
-                " IsSynchronize, MesNoticeNo, personFlag, supplierFlag, matFlag FROM VehicleQualityTraceDocument " +
-                "WHERE workshopID = 'DP' AND Deleted = 'F' AND OperationTime > '" + dateString + "'");
+        sql.append("SELECT v.SaleOrderNO, v.VehicleID, v.PartTraceID, v.PartDrawingNo, v.PartDrawingName, v.SupplierNo, v.SupplierName, v.workshopID," +
+                " v.workLineID, v.WPCode, v.ProductionBatch, v.OperationTime, v.OperationPerson, v.OperationPersonName, v.IsSpecified," +
+                " v.Deleted, v.Memo, v.WkStation, v.DocClosedBy, v.Operation, v.DocClosed, v.CrtDate, v.UpdDate, v.Archived," +
+                " v.IsSynchronize, v.MesNoticeNo, v.personFlag, v.supplierFlag, v.matFlag, b.WSName, c.MLineNo, d.WPName" +
+                " FROM VehicleQualityTraceDocument v " +
+                " left join WS_WorkShop b on v.workshopID = b.WSCode " +
+                " left join WS_MaufactoryLine c on v.workLineID = c.MLineNo" +
+                " left join WS_Point d on v.WPCode = d.WPCode" +
+                "WHERE v.workshopID = 'DP' AND v.Deleted = 'F' AND v.OperationTime > '" + dateString + "'");
         List<MesScanCodeDpInfo> query = mesSqlServerJdbcTemplate.query(sql.toString(), (rs, rowNum) -> {
             MesScanCodeDpInfo map = new MesScanCodeDpInfo();
             map.setSaleOrderNO(rs.getString("SaleOrderNO"));
@@ -67,15 +71,15 @@ public class MesScanCodeDpJob extends QuartzJobBean {
             map.setSupplierName(rs.getString("SupplierName"));
             map.setWorkshopID(rs.getString("workshopID"));
             map.setWorkLineID(rs.getString("workshopID"));
-//            map.setWorkLineName(rs.getString(""));
+            map.setWorkLineName(rs.getString("MLineNo"));
             map.setWPCode(rs.getString("WPCode"));
-//            map.setWPName(rs.getString(""));
+            map.setWPName(rs.getString("WPName"));
             map.setProductionBatch(rs.getString("ProductionBatch"));
             map.setOperationTime(rs.getTimestamp("OperationTime"));
             map.setOperationPerson(rs.getString("OperationPerson"));
             map.setOperationPersonName(rs.getString("OperationPersonName"));
             map.setStatus("1");
-            map.setCreateTime(new Date());
+            map.setCreateTime(rs.getTimestamp("OperationTime"));
             return map;
         });
         if (CollectionUtils.isEmpty(query)) {

src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/MesScanCodeZpJob.java

@@ -51,11 +51,15 @@ public class MesScanCodeZpJob extends QuartzJobBean {
         Date startOfDay = DateUtils.getStartOfDay(0);
         String dateString = DateUtils.parseDateToString(startOfDay, "yyyy-MM-dd HH:mm:ss");
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT SaleOrderNO, VehicleID, PartTraceID, PartDrawingNo,PartDrawingName, SupplierNo, SupplierName, workshopID," +
-                " workLineID, WPCode, ProductionBatch, OperationTime, OperationPerson, OperationPersonName, IsSpecified," +
-                " Deleted, Memo, WkStation, DocClosedBy, Operation, DocClosed, CrtDate, UpdDate, Archived," +
-                " IsSynchronize, MesNoticeNo, personFlag, supplierFlag, matFlag FROM VehicleQualityTraceDocument " +
-                "WHERE workshopID = 'ZP' AND Deleted = 'F' AND OperationTime > '" + dateString + "'");
+        sql.append("SELECT v.SaleOrderNO, v.VehicleID, v.PartTraceID, v.PartDrawingNo, v.PartDrawingName, v.SupplierNo, v.SupplierName, v.workshopID," +
+                " v.workLineID, v.WPCode, v.ProductionBatch, v.OperationTime, v.OperationPerson, v.OperationPersonName, v.IsSpecified," +
+                " v.Deleted, v.Memo, v.WkStation, v.DocClosedBy, v.Operation, v.DocClosed, v.CrtDate, v.UpdDate, v.Archived," +
+                " v.IsSynchronize, v.MesNoticeNo, v.personFlag, v.supplierFlag, v.matFlag, b.WSName, c.MLineNo, d.WPName" +
+                " FROM VehicleQualityTraceDocument v " +
+                " left join WS_WorkShop b on v.workshopID = b.WSCode " +
+                " left join WS_MaufactoryLine c on v.workLineID = c.MLineNo" +
+                " left join WS_Point d on v.WPCode = d.WPCode" +
+                "WHERE v.workshopID = 'ZP' AND v.Deleted = 'F' AND v.OperationTime > '" + dateString + "'");
         List<MesScanCodeZpInfo> query = mesSqlServerJdbcTemplate.query(sql.toString(), (rs, rowNum) -> {
             MesScanCodeZpInfo map = new MesScanCodeZpInfo();
             map.setSaleOrderNO(rs.getString("SaleOrderNO"));
@@ -67,15 +71,15 @@ public class MesScanCodeZpJob extends QuartzJobBean {
             map.setSupplierName(rs.getString("SupplierName"));
             map.setWorkshopID(rs.getString("workshopID"));
             map.setWorkLineID(rs.getString("workshopID"));
-//            map.setWorkLineName(rs.getString(""));
+            map.setWorkLineName(rs.getString("MLineNo"));
             map.setWPCode(rs.getString("WPCode"));
-//            map.setWPName(rs.getString(""));
+            map.setWPName(rs.getString("WPName"));
             map.setProductionBatch(rs.getString("ProductionBatch"));
             map.setOperationTime(rs.getTimestamp("OperationTime"));
             map.setOperationPerson(rs.getString("OperationPerson"));
             map.setOperationPersonName(rs.getString("OperationPersonName"));
             map.setStatus("1");
-            map.setCreateTime(new Date());
+            map.setCreateTime(rs.getTimestamp("OperationTime"));
             return map;
         });
         log.error("mes查询到数据: {} 条", query.size());