Merge branch 'master' of http://1.13.177.47:3000/xins/hwmom

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

@@ -126,13 +126,15 @@ public class ProdPlanInfoBo extends BaseEntity {
     private Long completeAmount;
 
     /**
-     * 计划时间
+     * 计划开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planBeginTime;
 
     /**
      * 计划结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planEndTime;
 
     /**

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

@@ -104,8 +104,8 @@ public class ProdPlanInfoServiceImpl implements IProdPlanInfoService {
             .eq(bo.getPlanAmount() != null, ProdPlanInfo::getPlanAmount, bo.getPlanAmount())
             .eq(bo.getDispatchAmount() != null, ProdPlanInfo::getDispatchAmount, bo.getDispatchAmount())
             .eq(bo.getCompleteAmount() != null, ProdPlanInfo::getCompleteAmount, bo.getCompleteAmount())
-            .eq(bo.getPlanBeginTime() != null, ProdPlanInfo::getPlanBeginTime, bo.getPlanBeginTime())
-            .eq(bo.getPlanEndTime() != null, ProdPlanInfo::getPlanEndTime, bo.getPlanEndTime())
+            .between(StringUtils.isNotNull(bo.getPlanBeginTime()) && StringUtils.isNotNull(bo.getPlanEndTime()), 
+                    ProdPlanInfo::getPlanBeginTime, bo.getPlanBeginTime(), bo.getPlanEndTime())
             .eq(bo.getRealBeginTime() != null, ProdPlanInfo::getRealBeginTime, bo.getRealBeginTime())
             .eq(bo.getRealEndTime() != null, ProdPlanInfo::getRealEndTime, bo.getRealEndTime())
             .eq(StringUtils.isNotBlank(bo.getAttachId()), ProdPlanInfo::getAttachId, bo.getAttachId())

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

@@ -84,20 +84,17 @@ public class ProdProductPlanDetailServiceImpl implements IProdProductPlanDetailS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<ProdProductPlanDetail> lqw = JoinWrappers.lambda(ProdProductPlanDetail.class)
             .selectAll(ProdProductPlanDetail.class)
-
-            //工装连表查询名称
-            .select(BaseToolingInfo::getToolingName)
-            .leftJoin(BaseToolingInfo.class, BaseToolingInfo::getToolingId, ProdProductPlanDetail::getToolingId)
-
-            //班次连表查询名称
-            .select(BaseShiftInfo::getShiftName)
-            .leftJoin(BaseShiftInfo.class, BaseShiftInfo::getShiftId, ProdProductPlanDetail::getShiftId)
-
-            //班组连表查询名称
-            .select(BaseClassTeamInfo::getTeamName)
-            .leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId)
-
-
+//            //工装连表查询名称
+//            .select(BaseToolingInfo::getToolingName)
+//            .leftJoin(BaseToolingInfo.class, BaseToolingInfo::getToolingId, ProdProductPlanDetail::getToolingId)
+//
+//            //班次连表查询名称
+//            .select(BaseShiftInfo::getShiftName)
+//            .leftJoin(BaseShiftInfo.class, BaseShiftInfo::getShiftId, ProdProductPlanDetail::getShiftId)
+//
+//            //班组连表查询名称
+//            .select(BaseClassTeamInfo::getTeamName)
+//            .leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId)
             //接班
 /*            .select(ProdShiftChange::)
             .leftJoin(ProdShiftChange.class, ProdShiftChange::getShiftChangeId, ProdProductPlanDetail::getShiftChangeId)*/

ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdProductPlanDetailMapper.xml

@@ -5,14 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.mes.mapper.ProdProductPlanDetailMapper">
 
     <select id="selectProdProductPlanDetailList" resultType="org.dromara.mes.domain.vo.ProdProductPlanDetailVo">
-        select
+        SELECT
         <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
+            ${ew.getSqlSelect},
         </if>
-        <if test="ew.getSqlSelect == null">
-            *
-        </if>
-        from ${tableName} t
+        t1.tooling_name,
+        t2.shift_name,
+        t3.team_name
+        FROM ${tableName} t
+        LEFT JOIN base_tooling_info t1 ON t.tooling_id = t1.tooling_id
+        LEFT JOIN base_shift_info t2 ON t.shift_id = t2.shift_id
+        LEFT JOIN base_class_team_info t3 ON t.class_team_id = t3.class_team_id
         ${ew.getCustomSqlSegment}
     </select>