Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java

@@ -51,5 +51,7 @@ public class ProduceMonitorSlotListVO {
 	@Schema(description = "订单类型")
 	private String yieldType;;
 
+	@Schema(description = "作业计划ID")
+	private Long wpId;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanLoadVO.java

@@ -121,16 +121,16 @@ public class WorkPlanLoadVO {
     @Schema(description = "当前工序加工班组")
     public String currentMakeTeam;
 
-    @Schema(description = "上序名称")
+//    @Schema(description = "上序名称")
-    public String frontWpTitle;
+//    public String frontWpTitle;
-
+//
-    @Schema(description = "上序加工班组")
+//    @Schema(description = "上序加工班组")
-    public String frontMakeTeam;
+//    public String frontMakeTeam;
-
+//
-    @Schema(description = "下序名称")
+//    @Schema(description = "下序名称")
-    public String nextWpTitle;
+//    public String nextWpTitle;
-
+//
-    @Schema(description = "下序加工班组")
+//    @Schema(description = "下序加工班组")
-    public String nextMakeTeam;
+//    public String nextMakeTeam;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml

@@ -37,13 +37,13 @@
     <select id="listSlotInfo" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         SELECT
         a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.WORK_QTY as poQty, a.area, a.sumArea, a.sumArea as areaTotal, a.sumArea as totalArea, a.MTN_CODE as mtnCode, a.MTN_CODE as mtuCode, a.MTN_CODE as sameNo, a.PRODUCT_IDENT as prodIdent, a.wo_code, a.material,
-        a.yield_type
+        a.yield_type, a.WP_ID
         FROM
         (
         SELECT
         d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY * d.YP_AREA AS area, sum(b.WORK_QTY * d.YP_AREA) OVER() AS
         sumArea,
-        a.MTN_CODE, d.PRODUCT_IDENT, c.wo_code, f.material, d.yield_type
+        a.MTN_CODE, d.PRODUCT_IDENT, c.wo_code, f.material, d.yield_type, a.WP_ID
         FROM
         MES_MAC_TOOL_USE a
         INNER JOIN MES_work_plan b ON a.WP_ID = b.ID
@@ -58,7 +58,7 @@
         <if test="isGr == 1">) AND a.mtu_index = '1' AND b.pps_id = 417</if>
         ) a
         GROUP BY a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea, a.MTN_CODE, a.PRODUCT_IDENT, a.wo_code,
-        a.material, a.yield_type
+        a.material, a.yield_type, a.WP_ID
     </select>
     <select id="getBoxInfoByWpIdMtnCode" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
         SELECT

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorWorkPlanVO;
+import org.springblade.desk.produce.pojo.vo.WorkPlanLoadVO;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.WorkPlanVO;
 
 
@@ -29,5 +29,5 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlan> {
 
     List<ProduceMonitorWorkPlanVO> getProduceMonitorWorkPlanList(Long woId);
 
-    List<WorkPlan> loadNotReceived(List<Long> tsIds, Long id);
+    List<WorkPlanLoadVO> loadNotReceived(List<Long> tsIds, Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -93,28 +93,57 @@
         WHERE mwp.WO_ID = #{woId}
         ORDER BY mwp.ORDERS
     </select>
-    <select id="loadNotReceived" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
+    <select id="loadNotReceived" resultType="org.springblade.desk.produce.pojo.vo.WorkPlanLoadVO">
-        SELECT a.* FROM mes_work_plan a
+        SELECT
+        d.ROAM_NO_NEXT AS nextRoam,
+        d.YO_CODE AS yoCode,
+        d.YP_CODE AS ypCode,
+        d.PART_CODE AS partCode,
+        d.PRODUCT_TYPE AS productType,
+        d.PART_NAME AS partName,
+        d.PLATE AS plate,
+        d.PRODUCT_IDENT AS prodIdent,
+        d.USE_DEPT AS useDept,
+        d.YP_AREA AS poArea,
+        d.DEMAND_DATE AS demandDate,
+        d.PLAN_USER AS planUser,
+        d.RELEASE_DATE AS releaseDate,
+        d.PRIMARY_CRAFT AS primaryCraft,
+        c.CARD_NO AS cardNo,
+        c.BATCH_NO AS batchNo,
+        c.WO_CODE AS woCode,
+        a.QUALIFIED_QTY AS makeQty,
+        a.QUALIFIED_QTY - a.WORK_QTY - a.SCRAP_QTY AS notWorkQty,
+        a.WORK_QTY AS workQty,
+        a.SCRAP_QTY AS scrapQty,
+        c.PLAN_START_TIME AS planStartTime,
+        c.PLAN_END_TIME AS planEndTime,
+        c.INVENTORY_QTY AS inventoryQty,
+        c.MAKE_QTY - c.INVENTORY_QTY AS notInQty,
+        c.RUN_STATUS AS runStatus,
+        a.STATUS AS status,
+        c.PRIORITY AS priority,
+        c.PICKING_STATUS AS pickingStatus,
+        a.ORDERS || '|' || bps.NAME AS currentWpTitle,
+        bts.TS_NAME AS currentMakeTeam,
+        a.ID AS wpId,
+        a.ID AS currentWpId
+        FROM mes_work_plan a
         INNER JOIN mes_WORK_ORDER c ON a.wo_id = c.ID
         INNER JOIN mes_YIELD_ORDER d ON c.yo_id = d.ID
         LEFT JOIN mes_work_plan b ON a.front_wp_id = b.ID
+        LEFT JOIN BS_PROCESS_SET bps ON a.PPS_ID = bps.ID
+        LEFT JOIN BS_TEAM_SET bts ON a.MAKE_TEAM = bts.ID
         WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3))
-        AND a.make_team IN
+        AND ((a.make_team IN
         <foreach collection="tsIds" item="tsId" open="(" separator="," close=")">
             #{tsId}
         </foreach>
-        AND a.subsidiary_team IS NULL AND c.run_status >= 2 AND c.run_status &lt; 15 AND c.id = #{id}
+        AND a.subsidiary_team IS NULL) OR a.subsidiary_team IN
-        UNION
-        SELECT a.* FROM mes_work_plan a
-        INNER JOIN mes_WORK_ORDER c ON a.wo_id = c.ID
-        INNER JOIN mes_YIELD_ORDER d ON c.yo_id = d.ID
-        LEFT JOIN mes_work_plan b ON a.front_wp_id = b.ID
-        WHERE ((a.front_wp_id IS NULL AND a.status = 1) OR (b.status = 3))
-        AND a.subsidiary_team IN
         <foreach collection="tsIds" item="tsId" open="(" separator="," close=")">
             #{tsId}
         </foreach>
-        AND c.run_status >= 2 AND c.run_status &lt; 15 AND c.id = #{id}
+        ) AND c.run_status >= 2 AND c.run_status &lt; 15 AND c.id = #{id}
     </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java

@@ -30,6 +30,7 @@ import org.springblade.desk.produce.pojo.dto.MakeRecDTO;
 import org.springblade.desk.produce.pojo.dto.RetrospectDefendDTO;
 import org.springblade.desk.produce.pojo.dto.WorkPlanDto;
 import org.springblade.desk.produce.pojo.entity.*;
+import org.springblade.desk.produce.pojo.enums.WorkOrderEnum;
 import org.springblade.desk.produce.pojo.vo.MesMakeRecVO;
 import org.springblade.desk.produce.pojo.vo.WorkPlanLoadVO;
 import org.springblade.desk.produce.service.*;
@@ -290,23 +291,21 @@ public class MakeRecServiceImpl extends BaseServiceImpl<MakeRecMapper, MakeRec>
 
     @Override
     public List<WorkPlanLoadVO> loadNotReceived(String cardNo) {
-        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, AuthUtil.getUserId())).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
+        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, 1297)).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
         List<WorkPlanLoadVO> rtnList = new ArrayList<>();
         if (CollectionUtils.isEmpty(tsIds)) {
             return rtnList;
         }
         WorkOrder wo = workOrderMapper.getWorkOrderByCardNo(cardNo, (short) 0);
         Optional.ofNullable(wo).orElseThrow(() -> new ServiceException("车间订单不存在！"));
-//        List<WorkPlan> wpList= workPlanMapper.selectList(Wrappers.<WorkPlan>lambdaQuery().eq(WorkPlan::getWoId, wo.getId()).in(WorkPlan::getMakeTeam, tsIds));
+        List<WorkPlanLoadVO> wpList = workPlanMapper.loadNotReceived(tsIds, wo.getId());
-        List<WorkPlan> wpList= workPlanMapper.loadNotReceived(tsIds,wo.getId());
+        for (WorkPlanLoadVO workPlanLoadVO : wpList) {
-        if (CollectionUtils.isNotEmpty(wpList)) {
+            workPlanLoadVO.setRunStatusTitle(WorkOrderEnum.getName(workPlanLoadVO.getRunStatus()));
-            rtnList = wpList.stream().map(wp -> {
+            workPlanLoadVO.setPriorityTitle(WorkOrder.priorityMap.get(workPlanLoadVO.getPriority()));
-                WorkPlanLoadVO wpLoad = new WorkPlanLoadVO();
+            workPlanLoadVO.setPickingStatusTitle(WorkOrder.pickingStatusMap.get(workPlanLoadVO.getPickingStatus()));
-                    BeanUtils.copyProperties(wp, wpLoad);
+            workPlanLoadVO.setIsBing(0);
-            return wpLoad;
-        }).collect(Collectors.toList());
         }
-        return rtnList;
+        return wpList;
     }
 
     @Override