排产相关-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml

@@ -58,7 +58,7 @@
     </resultMap>
 
 
-    <select id="selectYieldOrderPage" resultMap="yieldOrderResultMap">
+    <select id="selectYieldOrderPage" resultType="org.springblade.scheduling.scheduling.vo.YieldOrderVO">
         select * from MES_YIELD_ORDER
         <where>
             is_deleted = 0

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
+import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
 import org.springblade.scheduling.scheduling.excel.YieldOrderExcel;
@@ -47,7 +48,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 	@Override
 	public IPage<YieldOrderVO> selectYieldOrderPage(IPage<YieldOrderVO> page, YieldOrderVO yieldOrder) {
-		return page.setRecords(baseMapper.selectYieldOrderPage(page, yieldOrder));
+		List<YieldOrderVO> list = baseMapper.selectYieldOrderPage(page, yieldOrder);
+		for(YieldOrderVO vo : list){
+			vo.setPriorityApsStr(YieldOrderEnum.getName(vo.getPriorityAps()));
+		}
+		return page.setRecords(list);
 	}
 
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
@@ -43,4 +44,9 @@ public class YieldOrderVO extends YieldOrderEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 优先级-排产
+	 */
+	private String priorityApsStr;
+
 }