修改获取MES作业工单接口，现在调整为获取全部的工单而不是某一天的工单

src/main/java/cn/mrdear/conf/CorsConfig.java

@@ -0,0 +1,27 @@
+package cn.mrdear.conf;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 9:35
+ */
+@Configuration
+public class CorsConfig {
+    @Bean
+    public CorsFilter corsFilter() {
+        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        final CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true); // 允许cookies跨域
+        config.addAllowedOrigin("*");// 允许向该服务器提交请求的URI，*表示全部允许。。这里尽量限制来源域，比如http://xxxx:8080 ,以降低安全风险。。
+        config.addAllowedHeader("*");// 允许访问的头信息,*表示全部
+        config.setMaxAge(3600L);// 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了
+        config.addAllowedMethod("*");// 允许提交请求的方法，*表示全部允许，也可以单独设置GET、PUT等
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
+}

src/main/java/cn/mrdear/controller/JobOrderController.java

@@ -0,0 +1,90 @@
+package cn.mrdear.controller;
+
+import cn.mrdear.entity.dto.ManuOrderDTO;
+import cn.mrdear.entity.dto.MesJobOrderDTO;
+import cn.mrdear.entity.dto.ProductDTO;
+import cn.mrdear.entity.vo.JobOrderListVO;
+import cn.mrdear.mapper.ManuOrderMapper;
+import cn.mrdear.mapper.MesJobOrderMapper;
+import cn.mrdear.mapper.ProductMapper;
+import cn.mrdear.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 16:10
+ */
+@RestController()
+@RequestMapping("jobOrder")
+public class JobOrderController {
+    @Autowired
+    MesJobOrderMapper mesJobOrderMapper;
+    @Autowired
+    ProductMapper productMapper;
+    @Autowired
+    ManuOrderMapper manuOrderMapper;
+    @GetMapping("getList")
+    public Map<String,Object> getJobOrderList() {
+        HashMap<String, Object> resultMap = new HashMap<>();
+        List<JobOrderListVO> jobOrderListVOS = new ArrayList<>();
+        List<MesJobOrderDTO> jobOrderDTOList = mesJobOrderMapper.getListByDate();
+        if(jobOrderDTOList.size() == 0) {
+            resultMap.put("data",jobOrderListVOS);
+            return resultMap;
+        }
+        Map<Integer, List<MesJobOrderDTO>> ordersByYear = jobOrderDTOList.stream()
+                // 过滤掉 code 太短或格式不对的项（可选）
+                .filter(dto -> dto.getCode() != null && dto.getCode().length() >= 4)
+                .collect(Collectors.groupingBy(dto -> {
+                    String yy = dto.getCode().substring(2, 4);      // e.g. "25"
+                    int year = 2000 + Integer.parseInt(yy);         // 转成 2025
+                    return year;
+                }));
+        // 将map按年份倒序
+        Map<Integer, List<MesJobOrderDTO>> descByYear = new TreeMap<>(Comparator.reverseOrder());
+        descByYear.putAll(ordersByYear);
+        for (Map.Entry<Integer, List<MesJobOrderDTO>> entry : descByYear.entrySet()) {
+            Integer year = entry.getKey();
+            List<MesJobOrderDTO> listForYear = entry.getValue();
+            // 获取订单详情
+            List<String> manuOrderIds = listForYear.stream().map(MesJobOrderDTO::getEmesoManuorderId)
+                    .collect(Collectors.toList());
+            // 获取形体
+            List<String> productIds = listForYear.stream().map(MesJobOrderDTO::getmProductId).distinct()
+                    .collect(Collectors.toList());
+            List<ProductDTO> productDTOList = productMapper.getProductMap(productIds);
+            Map<String, String> productMap = productDTOList.stream().collect(Collectors.toMap(ProductDTO::getmProductId, ProductDTO::getValue));
+            String tableName = "emeso_manuorder_" + year;
+            List<ManuOrderDTO> manuOrderList = manuOrderMapper.getManuOrderList(tableName, manuOrderIds);
+            Map<String, ManuOrderDTO> manuOrderDTOMap = manuOrderList.stream().collect(Collectors.toMap(ManuOrderDTO::getManuOrderId, o -> o));
+            for (MesJobOrderDTO mesJobOrderDTO : listForYear) {
+                JobOrderListVO jobOrderListVO = new JobOrderListVO();
+                jobOrderListVO.setJobOrderId(mesJobOrderDTO.getEmesoJobOrderId());
+                jobOrderListVO.setCode(mesJobOrderDTO.getCode()); // 工单号
+                jobOrderListVO.setQty(mesJobOrderDTO.getQty()); // 数量
+                jobOrderListVO.setDescription(mesJobOrderDTO.getDescription());
+                jobOrderListVO.setColor(mesJobOrderDTO.getColor());
+                jobOrderListVO.setType(mesJobOrderDTO.getType());
+                String mProductId = mesJobOrderDTO.getmProductId();
+                if(productMap.containsKey(mProductId)) {
+                    jobOrderListVO.setGoodsCode(productMap.get(mProductId));
+                }
+                String emesoManuorderId = mesJobOrderDTO.getEmesoManuorderId();
+                if(manuOrderDTOMap.containsKey(emesoManuorderId)) {
+                    ManuOrderDTO manuOrderDTO = manuOrderDTOMap.get(emesoManuorderId);
+                    jobOrderListVO.setOrderCode(manuOrderDTO.getOrderCode());
+                    jobOrderListVO.setShoesSize(manuOrderDTO.getSizeCode());
+                }
+                jobOrderListVOS.add(jobOrderListVO);
+            }
+        }
+        resultMap.put("data",jobOrderListVOS);
+        return resultMap;
+    }
+
+}

src/main/java/cn/mrdear/entity/dto/ManuOrderDTO.java

@@ -0,0 +1,35 @@
+package cn.mrdear.entity.dto;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/10 10:41
+ */
+public class ManuOrderDTO {
+    private String manuOrderId;
+    private String orderCode; // 订单号
+    private String sizeCode; // 尺码
+
+    public String getManuOrderId() {
+        return manuOrderId;
+    }
+
+    public void setManuOrderId(String manuOrderId) {
+        this.manuOrderId = manuOrderId;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getSizeCode() {
+        return sizeCode;
+    }
+
+    public void setSizeCode(String sizeCode) {
+        this.sizeCode = sizeCode;
+    }
+}

src/main/java/cn/mrdear/entity/dto/MesJobOrderDTO.java

@@ -0,0 +1,98 @@
+package cn.mrdear.entity.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 17:27
+ */
+public class MesJobOrderDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String emesoJobOrderId;
+    private String emesoManuorderId;
+
+    @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    private Date created;
+    private String code;
+    private Integer qty;
+    private String description;
+    private String type; // 楦型
+    private String color; // 颜色
+
+    private String mProductId;
+
+    public String getEmesoJobOrderId() {
+        return emesoJobOrderId;
+    }
+
+    public void setEmesoJobOrderId(String emesoJobOrderId) {
+        this.emesoJobOrderId = emesoJobOrderId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getQty() {
+        return qty;
+    }
+
+    public void setQty(Integer qty) {
+        this.qty = qty;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getEmesoManuorderId() {
+        return emesoManuorderId;
+    }
+
+    public void setEmesoManuorderId(String emesoManuorderId) {
+        this.emesoManuorderId = emesoManuorderId;
+    }
+
+    public String getmProductId() {
+        return mProductId;
+    }
+
+    public void setmProductId(String mProductId) {
+        this.mProductId = mProductId;
+    }
+}

src/main/java/cn/mrdear/entity/dto/ProductDTO.java

@@ -0,0 +1,26 @@
+package cn.mrdear.entity.dto;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 16:29
+ */
+public class ProductDTO {
+    private String mProductId; // 产品id
+    private String value; // 形体名称
+
+    public String getmProductId() {
+        return mProductId;
+    }
+
+    public void setmProductId(String mProductId) {
+        this.mProductId = mProductId;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

src/main/java/cn/mrdear/entity/vo/JobOrderListVO.java

@@ -0,0 +1,93 @@
+package cn.mrdear.entity.vo;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 16:11
+ */
+
+public class JobOrderListVO {
+
+    private String jobOrderId; // 订单id
+    private String goodsCode; // 形体
+    private String color; // 颜色
+    private String shoesSize; // 尺码
+    private String type; // 楦型
+    private Integer qty; // 数量
+    private String orderCode; // 订单号 117429040931-67090
+    private String code; // 工单号
+    private String description; // 备注
+
+
+    public String getJobOrderId() {
+        return jobOrderId;
+    }
+
+    public void setJobOrderId(String jobOrderId) {
+        this.jobOrderId = jobOrderId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getShoesSize() {
+        return shoesSize;
+    }
+
+    public void setShoesSize(String shoesSize) {
+        this.shoesSize = shoesSize;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getQty() {
+        return qty;
+    }
+
+    public void setQty(Integer qty) {
+        this.qty = qty;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

src/main/java/cn/mrdear/mapper/ManuOrderMapper.java

@@ -0,0 +1,16 @@
+package cn.mrdear.mapper;
+
+import cn.mrdear.entity.dto.ManuOrderDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/10 10:38
+ */
+@Mapper
+public interface ManuOrderMapper {
+    List<ManuOrderDTO> getManuOrderList(@Param("tableName") String tableName,@Param("manuOrderIds") List<String> manuOrderIds);
+}

src/main/java/cn/mrdear/mapper/MesJobOrderMapper.java

@@ -0,0 +1,17 @@
+package cn.mrdear.mapper;
+
+import cn.mrdear.entity.dto.MesJobOrderDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/9 16:54
+ */
+@Mapper
+public interface MesJobOrderMapper {
+    List<MesJobOrderDTO> getListByDate();
+}

src/main/java/cn/mrdear/mapper/ProductMapper.java

@@ -0,0 +1,21 @@
+package cn.mrdear.mapper;
+
+import cn.mrdear.entity.dto.ProductDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/10 10:06
+ */
+@Mapper
+public interface ProductMapper {
+
+
+    List<ProductDTO> getProductMap(@Param("productIds") List<String> productIds);
+//    Map<String,String> getProductMap(@Param("productIds")List<String> productIds);
+}

src/main/java/cn/mrdear/util/DateUtil.java

@@ -0,0 +1,50 @@
+package cn.mrdear.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Author: zxy
+ * @Date: create in 2025/4/10 9:42
+ */
+public class DateUtil {
+    public static final String YEAR_PATTERN = "yyyy";
+    public final static String DATE_PATTERN = "yyyy-MM-dd";
+    /** 时间格式(yyyy-MM-dd HH:mm:ss) */
+    public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+    public static Date string2Date(String strDate) {
+        return toDate(strDate,DATE_PATTERN);
+    }
+
+    public static  Date string2Time(String strDate) {
+        return toDate(strDate,DATE_TIME_PATTERN);
+    }
+    public static  Date toDate(String strDate, String PATTERN) {
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN);
+        try {
+            return sdf.parse(strDate);
+        } catch (ParseException e) {
+            e.printStackTrace(); // 在实际应用中，可能会选择记录日志而不是打印堆栈跟踪
+            return null; // 或根据你的错误处理策略，可能会抛出一个自定义异常
+        }
+    }
+    public static String yearFormat(Date date) {return format(date,YEAR_PATTERN);}
+
+    public static String dateFormat(Date date) {
+        return format(date,DATE_PATTERN);
+    }
+
+    public static String timeFormat(Date date) {
+        return format(date,DATE_TIME_PATTERN);
+    }
+
+    public static String format(Date date, String pattern) {
+        if(date != null){
+            SimpleDateFormat df = new SimpleDateFormat(pattern);
+            return df.format(date);
+        }
+        return null;
+    }
+}

src/main/resources/mapper/ManuOrderMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.mrdear.mapper.ManuOrderMapper">
+    <resultMap id="ManuOrderMap" type="cn.mrdear.entity.dto.ManuOrderDTO">
+        <id property="manuOrderId" column="emeso_manuorder_id"></id>
+        <result property="orderCode" column="code"></result>
+        <result property="sizeCode" column="foot_size_code"></result>
+    </resultMap>
+
+    <select id="getManuOrderList" resultMap="ManuOrderMap">
+        SELECT emeso_manuorder_id,code,foot_size_code
+        FROM ${tableName}
+        WHERE emeso_manuorder_id IN
+        <foreach collection="manuOrderIds" item="manuOrderId" index="index" open="(" separator="," close=")">
+            #{manuOrderId}
+        </foreach>
+    </select>
+
+</mapper>

src/main/resources/mapper/MesJobOrderMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.mrdear.mapper.MesJobOrderMapper">
+    <resultMap id="mesJobOrderMap" type="cn.mrdear.entity.dto.MesJobOrderDTO">
+        <id property="emesoJobOrderId" column="emeso_job_order_id"></id>
+        <result property="emesoManuorderId" column="emeso_manuorder_id"></result>
+        <result property="created" column="created"></result>
+        <result property="code" column="code"></result>
+        <result property="color" column="color"></result>
+        <result property="type" column="type"></result>
+        <result property="qty" column="qty"></result>
+        <result property="description" column="description"></result>
+        <result property="mProductId" column="m_product_id"></result>
+    </resultMap>
+    <select id="getListByDate" resultMap="mesJobOrderMap">
+        select emeso_job_order_id, emeso_manuorder_id, created, code,color,type, qty, description, m_product_id
+        from emeso_job_order where status in('START','CREATE') order by code desc ;
+    </select>
+
+</mapper>

src/main/resources/mapper/ProductMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.mrdear.mapper.ProductMapper">
+    <resultMap id="productMap" type="cn.mrdear.entity.dto.ProductDTO">
+        <id property="mProductId" column="m_product_id"></id>
+        <result property="value" column="value"></result>
+    </resultMap>
+<!--    <select id="getProductMap" resultMap="">-->
+<!--        select m_product_id,value-->
+<!--        from m_product where m_product_id in-->
+<!--        <foreach collection="productIds" item="productId" open="(" separator="," close=")">-->
+<!--            #{productId}-->
+<!--        </foreach>-->
+<!--    </select>-->
+    <select id="getProductMap" resultMap="productMap">
+        SELECT m_product_id , value
+        FROM m_product
+        WHERE m_product_id IN
+        <foreach collection="productIds" item="productId" index="index" open="(" separator="," close=")">
+            #{productId}
+        </foreach>
+    </select>
+
+</mapper>