1

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/controller/DataCollectController.java

@@ -708,6 +708,9 @@ public class DataCollectController {
         //获取销售主表单信息数据
         String sqlQueryDetail = "select id,autoId,cSOCode,cItemCode ,cItemName from SO_SODetails ssd where ssd.cSOCode in (?)";
 
+        String sqlQueryProdMain="select moId,moCode,createTime,createDate,modifyDate from mom_order";
+        String sqlQueryProdDetail="select relsTime, CostItemName ,Define24 ,OrderDId ,CostItemCode ,MoDId ,moid ,relsDate from mom_orderdetail";
+
         SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter df1=DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -759,5 +762,59 @@ public class DataCollectController {
     }
 
 
+    @RequestMapping("/getProdOrderData")
+    public List<ProdOrderMain> getProdOrderData(@RequestBody PageBO pageBO) {
+        String sqlQueryMain = "select moId,moCode,createTime,createDate,modifyDate from mom_order where  mom.createDate >= DATEADD(day, -30, GETDATE()) order by ID";
+        //获取销售主表单信息数据
+        String sqlQueryDetail = "select relsTime, CostItemName ,Define24 ,OrderDId ,CostItemCode ,MoDId ,moid ,relsDate,Status  from mom_orderdetail momd where momd.moid in (?)";
+
+        SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter df1=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        List<ProdOrderMain> resList = new ArrayList<>();
+        try (Connection connection = sqlServerDataSource.getConnection()) {
+            PreparedStatement queryMain = connection.prepareStatement(sqlQueryMain);
+//            int pageSize = pageBO.getPageSize();
+//            int offset = pageBO.getPageNo();
+//            queryMain.setInt(1, offset);
+//            queryMain.setInt(2, pageSize);
+            try (ResultSet resultSet = queryMain.executeQuery()) {
+                while (resultSet.next()) {
+                    ProdOrderMain prodOrderMain = new ProdOrderMain();
+                    prodOrderMain.setId(resultSet.getString("moId"));
+                    prodOrderMain.setCreateDate(LocalDate.parse(resultSet.getString("createDate"),df1));
+                    prodOrderMain.setCreateTime(LocalDateTime.parse(resultSet.getString("createTime "),df));
+                    prodOrderMain.setCode(resultSet.getString("moCode"));
+                    resList.add(prodOrderMain);
+                }
+            }
+            List<String> mainIds = resList.stream().map(i -> i.getId()).distinct().collect(Collectors.toList());
+            PreparedStatement queryDetail = connection.prepareStatement(sqlQueryDetail);
+            String join = String.join(",", mainIds);
+            queryMain.setString(1, join);
+            List<ProdOrderDetail> prodOrderDetails=new ArrayList<>();
+            try (ResultSet resultSet = queryDetail.executeQuery()) {
+                while (resultSet.next()) {
+                    ProdOrderDetail prodOrderDetail = new ProdOrderDetail();
+                    prodOrderDetail.setId(resultSet.getString("MoDId"));
+                    prodOrderDetail.setMainId(resultSet.getString("moid"));
+                    prodOrderDetail.setProjectCode(resultSet.getString("Define24"));
+                    prodOrderDetail.setRelsDate(LocalDate.parse(resultSet.getString("relsDate"),df1));
+                    prodOrderDetail.setRelsTime(LocalDateTime.parse(resultSet.getString("relsDate"),df));
+                    prodOrderDetail.setStatus(resultSet.getInt("Status"));
+                    prodOrderDetails.add(prodOrderDetail);
+                }
+            }
+            for (ProdOrderMain prodOrderMain : resList) {
+                List<ProdOrderDetail> detailList = prodOrderDetails.stream().filter(i -> i.getMainId().equals(prodOrderMain.getId())).collect(Collectors.toList());
+                prodOrderMain.setProdOrderDetails(detailList);
+            }
+        } catch (SQLException e) {
+            System.err.println("数据库操作错误: " + e.getMessage());
+        }
+        return resList;
+    }
+
+
 
 }

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/entity/ProdOrderDetail.java

@@ -0,0 +1,89 @@
+package com.management.collectdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 生产订单详情表
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProdOrderDetail extends Model<ProdOrderDetail> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 生产订单明细资料ID
+     */
+    @TableId("id")
+    private String id;
+
+    /**
+     * 生产订单表头ID
+     */
+    @TableField("main_id")
+    private String mainId;
+
+    /**
+     * 销售订单明细Id
+     */
+    @TableField("order_id")
+    private Integer orderId;
+
+    /**
+     * 订单号码
+     */
+    @TableField("order_code")
+    private String orderCode;
+
+    /**
+     * 项目编码
+     */
+    @TableField("project_code")
+    private String projectCode;
+
+    /**
+     * 项目名称
+     */
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 审核时间
+     */
+    @TableField("rels_time")
+    private LocalDateTime relsTime;
+
+    /**
+     * 审核日期
+     */
+    @TableField("rels_date")
+    private LocalDate relsDate;
+
+    /**
+     * 状态(NA-开立/FM-锁定/OP-审核/CL-关闭)
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/entity/ProdOrderMain.java

@@ -0,0 +1,63 @@
+package com.management.collectdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 生产订单主表
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProdOrderMain extends Model<ProdOrderMain> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 生产令单表头ID
+     */
+    @TableId("id")
+    private String id;
+
+    /**
+     * 生产订单号码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 建档日期
+     */
+    @TableField("create_date")
+    private LocalDate createDate;
+
+    @TableField(exist = false)
+    private List<ProdOrderDetail> prodOrderDetails;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProdOrderDetailController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 生产订单详情表 前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@RestController
+@RequestMapping("/prod-order-detail")
+public class ProdOrderDetailController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProdOrderMainController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 生产订单主表 前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@RestController
+@RequestMapping("/prod-order-main")
+public class ProdOrderMainController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -2619,7 +2619,7 @@ public class UserCorpwxTimeController {
                     }
                 }
             }
-
+            userWrapper.and(i->i.eq("is_active",1).or().gt("inactive_date",monthStart));
             Page<User> userPage = new Page<>(pageIndex, pageSize);
             IPage<User> userIPage = userMapper.selectPage(userPage, userWrapper);
             List<User> userList = userIPage.getRecords();
@@ -3011,6 +3011,7 @@ public class UserCorpwxTimeController {
                 }
             }
             monthQuery.orderByAsc("create_date", "name");
+            userWrapper.and(i->i.eq("is_active",1).or().gt("inactive_date",monthStart));
             Page<User> userPage = new Page<>(pageIndex, pageSize);
             IPage<User> userIPage = userMapper.selectPage(userPage, userWrapper);
             List<User> userList = userIPage.getRecords();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ProdOrderDetail.java

@@ -0,0 +1,89 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 生产订单详情表
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProdOrderDetail extends Model<ProdOrderDetail> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 生产订单明细资料ID
+     */
+    @TableId("id")
+    private Integer id;
+
+    /**
+     * 生产订单表头ID
+     */
+    @TableField("main_id")
+    private Integer mainId;
+
+    /**
+     * 销售订单明细Id
+     */
+    @TableField("order_id")
+    private Integer orderId;
+
+    /**
+     * 订单号码
+     */
+    @TableField("order_code")
+    private String orderCode;
+
+    /**
+     * 项目编码
+     */
+    @TableField("project_code")
+    private String projectCode;
+
+    /**
+     * 项目名称
+     */
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 审核时间
+     */
+    @TableField("rels_time")
+    private LocalDateTime relsTime;
+
+    /**
+     * 审核日期
+     */
+    @TableField("rels_date")
+    private LocalDate relsDate;
+
+    /**
+     * 状态(NA-开立/FM-锁定/OP-审核/CL-关闭)
+     */
+    @TableField("status")
+    private String status;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ProdOrderMain.java

@@ -0,0 +1,58 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 生产订单主表
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProdOrderMain extends Model<ProdOrderMain> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 生产令单表头ID
+     */
+    @TableId("id")
+    private Integer id;
+
+    /**
+     * 生产订单号码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 建档日期
+     */
+    @TableField("create_date")
+    private LocalDate createDate;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProdOrderDetailMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProdOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产订单详情表 Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+public interface ProdOrderDetailMapper extends BaseMapper<ProdOrderDetail> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProdOrderMainMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProdOrderMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产订单主表 Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+public interface ProdOrderMainMapper extends BaseMapper<ProdOrderMain> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProdOrderDetailService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProdOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 生产订单详情表 服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+public interface ProdOrderDetailService extends IService<ProdOrderDetail> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProdOrderMainService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProdOrderMain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 生产订单主表 服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+public interface ProdOrderMainService extends IService<ProdOrderMain> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProdOrderDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ProdOrderDetail;
+import com.management.platform.mapper.ProdOrderDetailMapper;
+import com.management.platform.service.ProdOrderDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 生产订单详情表 服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Service
+public class ProdOrderDetailServiceImpl extends ServiceImpl<ProdOrderDetailMapper, ProdOrderDetail> implements ProdOrderDetailService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProdOrderMainServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ProdOrderMain;
+import com.management.platform.mapper.ProdOrderMainMapper;
+import com.management.platform.service.ProdOrderMainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 生产订单主表 服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2026-06-10
+ */
+@Service
+public class ProdOrderMainServiceImpl extends ServiceImpl<ProdOrderMainMapper, ProdOrderMain> implements ProdOrderMainService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProdOrderDetailMapper.xml

@@ -0,0 +1,23 @@
+<?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="com.management.platform.mapper.ProdOrderDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProdOrderDetail">
+        <id column="id" property="id" />
+        <result column="main_id" property="mainId" />
+        <result column="order_id" property="orderId" />
+        <result column="order_code" property="orderCode" />
+        <result column="project_code" property="projectCode" />
+        <result column="project_name" property="projectName" />
+        <result column="rels_time" property="relsTime" />
+        <result column="rels_date" property="relsDate" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, main_id, order_id, order_code, project_code, project_name, rels_time, rels_date, status
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProdOrderMainMapper.xml

@@ -0,0 +1,18 @@
+<?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="com.management.platform.mapper.ProdOrderMainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProdOrderMain">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="create_time" property="createTime" />
+        <result column="create_date" property="createDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, code, create_time, create_date
+    </sql>
+
+</mapper>