update 优化生产计划添加

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

@@ -115,7 +115,7 @@ public class ProdPlanInfo extends TenantEntity {
     private Long completeAmount;
 
     /**
-     * 计划开始时间
+     * 计划时间
      */
     private Date planBeginTime;
 
@@ -140,7 +140,7 @@ public class ProdPlanInfo extends TenantEntity {
     private String attachId;
 
     /**
-     * 工单计划状态（0未派工 1已派工 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
      */
     private String planStatus;
 

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

@@ -120,7 +120,7 @@ public class ProdPlanInfoBo extends BaseEntity {
     private Long completeAmount;
 
     /**
-     * 计划开始时间
+     * 计划时间
      */
     private Date planBeginTime;
 
@@ -145,7 +145,7 @@ public class ProdPlanInfoBo extends BaseEntity {
     private String attachId;
 
     /**
-     * 工单计划状态（0未派工 1已派工 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
      */
     private String planStatus;
 

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

@@ -143,9 +143,9 @@ public class ProdPlanInfoVo implements Serializable {
     private Long completeAmount;
 
     /**
-     * 计划开始时间
+     * 计划时间
      */
-    @ExcelProperty(value = "计划开始时间")
+    @ExcelProperty(value = "计划时间")
     private Date planBeginTime;
 
     /**
@@ -173,7 +173,7 @@ public class ProdPlanInfoVo implements Serializable {
     private String attachId;
 
     /**
-     * 工单计划状态（0未派工 1已派工 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
      */
     @ExcelProperty(value = "工单计划状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "mes_plan_status")

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

@@ -79,7 +79,7 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi
         .leftJoin(ProdBaseStationInfo.class, ProdBaseStationInfo::getMachineId, ProdBaseMachineInfo::getMachineId)
         .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdBaseStationInfo::getProcessId)
         .eq(bo.getMachineId() != null, ProdBaseMachineInfo::getMachineId, bo.getMachineId())
-        .eq(StringUtils.isNotBlank(bo.getMachineCode()), ProdBaseMachineInfo::getMachineCode, bo.getMachineCode())
+        .like(StringUtils.isNotBlank(bo.getMachineCode()), ProdBaseMachineInfo::getMachineCode, bo.getMachineCode())
         .like(StringUtils.isNotBlank(bo.getMachineName()), ProdBaseMachineInfo::getMachineName, bo.getMachineName())
         .eq(StringUtils.isNotBlank(bo.getAssetNumber()), ProdBaseMachineInfo::getAssetNumber, bo.getAssetNumber())
         .eq(StringUtils.isNotBlank(bo.getMachineLocation()), ProdBaseMachineInfo::getMachineLocation, bo.getMachineLocation())
@@ -131,7 +131,7 @@ public class ProdBaseMachineInfoServiceImpl implements IProdBaseMachineInfoServi
             ProdBaseMachineInfoBo query = new ProdBaseMachineInfoBo();
             query.setMachineCode(entity.getMachineCode());
             MPJLambdaWrapper<ProdBaseMachineInfo> lqw = buildQueryWrapper(query);
-            ProdBaseMachineInfo baseProdBaseMachineInfo =  baseMapper.selectOne(lqw);
+            ProdBaseMachineInfo baseProdBaseMachineInfo = baseMapper.selectOne(lqw);
             if (baseProdBaseMachineInfo != null
                 && !baseProdBaseMachineInfo.getMachineId().equals(entity.getMachineId())) {
                 throw new ServiceException("编码已存在");