update 工位关联机台

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java

@@ -72,8 +72,14 @@ public class ProdBaseStationInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 机台ID
+     */
+    private Long machineId;
+
     @TableField(exist = false)
     private String processName;//字段映射
 
-
+    @TableField(exist = false)
+    private String machineName;//字段映射
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseStationInfoBo.java

@@ -74,5 +74,5 @@ public class ProdBaseStationInfoBo extends BaseEntity {
      */
     private String remark;
 
-
+    private Long machineId;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseStationInfoVo.java

@@ -131,5 +131,11 @@ public class ProdBaseStationInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    private Long machineId;
 
+    /**
+     * 机台名称
+     */
+    @ExcelProperty(value = "机台名称")
+    private String machineName;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseMachineInfoServiceImpl.java

@@ -83,7 +83,7 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi
         .eq(StringUtils.isNotBlank(bo.getMachineSpec()), ProdBaseMachineInfo::getMachineSpec, bo.getMachineSpec())
         .eq(StringUtils.isNotBlank(bo.getSupplierId()), ProdBaseMachineInfo::getSupplierId, bo.getSupplierId())
         .eq(StringUtils.isNotBlank(bo.getMachineStatus()), ProdBaseMachineInfo::getMachineStatus, bo.getMachineStatus())
-        .orderByDesc(ProdBaseMachineInfo::getCreateTime);
+        .orderByAsc(ProdBaseMachineInfo::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseStationInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.mes.domain.ProdBaseMachineInfo;
 import org.dromara.mes.domain.ProdBaseProcessInfo;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.ProdBaseStationInfoBo;
@@ -75,16 +76,19 @@ public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoServi
         MPJLambdaWrapper<ProdBaseStationInfo> lqw = JoinWrappers.lambda(ProdBaseStationInfo.class)
             .selectAll(ProdBaseStationInfo.class)
             .select(ProdBaseProcessInfo::getProcessName)
+            .select(ProdBaseMachineInfo::getMachineName)
             .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdBaseStationInfo::getProcessId)
+            .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdBaseStationInfo::getMachineId)
             .eq(bo.getStationId() != null, ProdBaseStationInfo::getStationId, bo.getStationId())
             .eq(StringUtils.isNotBlank(bo.getStationCode()), ProdBaseStationInfo::getStationCode, bo.getStationCode())
             .like(StringUtils.isNotBlank(bo.getStationName()), ProdBaseStationInfo::getStationName, bo.getStationName())
             .eq(StringUtils.isNotBlank(bo.getStationType()), ProdBaseStationInfo::getStationType, bo.getStationType())
             .eq(bo.getProcessId() != null, ProdBaseStationInfo::getProcessId, bo.getProcessId())
+            .eq(bo.getMachineId() != null, ProdBaseStationInfo::getMachineId, bo.getMachineId())
             .like(StringUtils.isNotBlank(bo.getAgvCode()), ProdBaseStationInfo::getAgvCode, bo.getAgvCode())
             .like(StringUtils.isNotBlank(bo.getIpAddress()), ProdBaseStationInfo::getIpAddress, bo.getIpAddress())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseStationInfo::getActiveFlag, bo.getActiveFlag())
-            .orderByDesc(ProdBaseStationInfo::getCreateTime);
+            .orderByAsc(ProdBaseStationInfo::getCreateTime);
         return lqw;
     }