细节升级

op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java

@@ -20,6 +20,42 @@ public class BoardDTO {
    private List<String> days;
    private String startTime;
    private String endTime;
+   private String productName;
+   private String productCode;
+   private String workorderCodeSap;
+   private String unit;
+
+    public String getWorkorderCodeSap() {
+        return workorderCodeSap;
+    }
+
+    public void setWorkorderCodeSap(String workorderCodeSap) {
+        this.workorderCodeSap = workorderCodeSap;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
 
     public String getStartTime() {
         return startTime;

op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java

@@ -34,6 +34,7 @@ public class MesBoardController extends BaseController {
         return iMesBoradService.getLineList(mesBoard);
     }
 
+    /**计划产量、当前产量、15天的产量趋势图**/
     @PostMapping("/getProduction15Days")
     public AjaxResult getProduction15Days(BoardDTO mesBoard) {
         if (StringUtils.isBlank(mesBoard.getFactoryCode())) {
@@ -44,4 +45,16 @@ public class MesBoardController extends BaseController {
         }
         return success(iMesBoradService.getProduction15Days(mesBoard));
     }
+
+    /**产线信息**/
+    @PostMapping("/getProductionLineInfo")
+    public AjaxResult getProductionLineInfo(BoardDTO mesBoard) {
+        if (StringUtils.isBlank(mesBoard.getFactoryCode())) {
+            return error("[facotryCode] 不能为空");
+        }
+        if (StringUtils.isBlank(mesBoard.getEquCode())) {
+            return error("[equCode] 不能为空");
+        }
+        return success(iMesBoradService.getProductionLineInfo(mesBoard));
+    }
 }

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java

@@ -79,4 +79,6 @@ public interface MesMapper {
 
     @MapKey("dayStr")
     Map<String, MesReportWork> getProduction15Days(BoardDTO boardDTO);
+
+    BoardDTO getWorkOrder(BoardDTO boardDTO);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java

@@ -4,6 +4,7 @@ import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.domain.dto.BoardDTO;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IMesBoradService {
     public AjaxResult finishProductBoard(BoardDTO boardDTO);
@@ -11,4 +12,5 @@ public interface IMesBoradService {
     public List<BoardDTO> getLineList(BoardDTO boardDTO);
 
     public BoardDTO getProduction15Days(BoardDTO mesBoard);
+    public Map<String,BoardDTO> getProductionLineInfo(BoardDTO mesBoard);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java

@@ -9,6 +9,7 @@ import com.op.mes.domain.MesReportWork;
 import com.op.mes.mapper.MesMapper;
 import com.op.mes.service.IMesBoradService;
 import com.op.system.api.domain.dto.BoardDTO;
+import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -85,6 +86,19 @@ public class MesBoradServiceImpl implements IMesBoradService {
         return dto;
     }
 
+    @Override
+    public Map<String,BoardDTO> getProductionLineInfo(BoardDTO boardDTO) {
+        DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        Map<String,BoardDTO> dtoMap = new HashMap<>();
+        //当前工单信息
+        BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO);
+        dtoMap.put("workOrder",workOrder);
+
+
+
+        return dtoMap;
+    }
+
     //获取当前日期前几天
     private List<String> getDays(int dayNum){
         List<String> days = new ArrayList<>();
@@ -102,6 +116,8 @@ public class MesBoradServiceImpl implements IMesBoradService {
         return days;
     }
 
+
+
     public static void main(String[] args){
         List<String> days = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml

@@ -305,4 +305,19 @@
           and CONVERT(DATE, pow.product_date) BETWEEN DATEADD(DAY, -15, CONVERT(DATE, GETDATE())) AND CONVERT(DATE, GETDATE())
         group by pow.product_date,pow.quantity_split
     </select>
+    <select id="getWorkOrder" resultType="com.op.system.api.domain.dto.BoardDTO">
+        select
+            pow.workorder_name equCode,
+            be.equipment_name equName,
+            pow.product_code productCode,
+            pow.product_name productName,
+            pow.workorder_code_sap workorderCodeSap,
+            pow.quantity_split totalNum,
+            pow.unit
+        from pro_order_workorder pow
+                 left join base_equipment be on pow.workorder_name = be.equipment_code and be.equipment_type_code = 'equ_type_bzx'
+        where pow.workorder_name = 'XL03' and pow.status = 'w2'
+          and CONVERT ( DATE, pow.product_date ) = CONVERT ( DATE, GETDATE( ) )
+          and pow.parent_order = '0'
+    </select>
 </mapper>

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -552,7 +552,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test='parentOrder!="0"'>
 				and mrw.parent_order = #{workorderCode}
 			</if>
-            order by mrw.end_report
+            order by mrw.batch
 	</select>
 	<select id="getPrepareList" resultType="com.op.mes.domain.MesPrepareDetail">
 		select