Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-modules/pom.xml

ruoyi-api/hwmom-api-mes/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-api</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hwmom-api-mes</artifactId>
+
+    <description>
+        hwmom-api-mes MES接口模块
+    </description>
+
+    <dependencies>
+
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/RemoteMaterialInfoService.java

@@ -0,0 +1,21 @@
+package org.dromara.mes.api;
+
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
+
+import java.util.List;
+
+/**
+ * 物料接口
+ *
+ * @author Yinq
+ */
+public interface RemoteMaterialInfoService {
+
+    /**
+     * 批量新增物料信息接口
+     * @param bos
+     * @return true成功，false失败
+     */
+    Boolean remoteInsertBaseMaterialInfo(List<BaseMaterialInfoBo> bos);
+
+}

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/BaseMaterialInfo.java

@@ -0,0 +1,272 @@
+package org.dromara.mes.api.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 物料信息对象 base_material_info
+ *
+ * @author zangch
+ * @date 2025-01-07
+ */
+@Data
+public class BaseMaterialInfo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    private Long materialId;
+
+    /**
+     * ERP信息
+     */
+    private String erpId;
+
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
+     * 旧物料编码
+     */
+    private String oldMaterialCode;
+
+    /**
+     * 物料名称
+     */
+    private String materialName;
+
+    /**
+     * 物料类型ID
+     */
+    private Long materialTypeId;
+
+    /**
+     * 物料大类(1原材料  2半成品 3成品)
+     */
+    private String materialCategories;
+
+    /**
+     * 物料小类
+     */
+    private String materialSubclass;
+
+    /**
+     * 批次标识(0否 1是)
+     */
+    private String batchFlag;
+
+    /**
+     * 小批次数量
+     */
+    private Long batchAmount;
+
+    /**
+     * 计量单位ID
+     */
+    private Long materialUnitId;
+
+    /**
+     * 计量单位名称
+     */
+    private String materialUnit;
+
+    /**
+     * 物料组
+     */
+    private String materialMatkl;
+
+    /**
+     * 物料规格
+     */
+    private String materialSpec;
+
+    /**
+     * 净重
+     */
+    private Long netWeight;
+
+    /**
+     * 毛重
+     */
+    private Long grossWeight;
+
+    /**
+     * 绑定标识(1是 0否)
+     */
+    private String alwaysFlag;
+
+    /**
+     * 所属工厂
+     */
+    private Long factoryId;
+
+    /**
+     * 创建组织
+     */
+    private Long createOrgId;
+
+    /**
+     * 使用组织
+     */
+    private Long useOrgId;
+
+    /**
+     * 所属产线
+     */
+    private Long prodLineId;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 删除标识(0否 1是)
+     */
+    private String deletedFlag;
+
+    /**
+     * 采购计价单位
+     */
+    private Long purchasePriceUnitId;
+
+    /**
+     * 审核日期
+     */
+    private Date approveDate;
+
+    /**
+     * erp最后更新日期
+     */
+    private Date erpModifyDate;
+
+    /**
+     * 最大库存数量
+     */
+    private Long maxStockAmount;
+
+    /**
+     * 最小库存数量
+     */
+    private Long minStockAmount;
+
+    /**
+     * 安全库存数量
+     */
+    private Long safeStockAmount;
+
+    /**
+     * 申请标识(1是 0否)
+     */
+    private String applyFlag;
+
+    /**
+     * 物料分类（1ERP同步 2虚拟物料 3MES物料）
+     */
+    private String materialClassfication;
+
+    /**
+     * 自动出库标识(1是 0否)
+     */
+    private String autoOutstockFlag;
+
+    /**
+     * 辅料标识(1是 0否)
+     */
+    private String accessoriesFlag;
+
+    /**
+     * 低值易耗品标识(1是 0否)
+     */
+    private String lowValueConsumableFlag;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 层级
+     */
+    private String plyrating;
+
+    /**
+     * 花纹
+     */
+    private String pattern;
+
+    /**
+     * 速度级别
+     */
+    private String speedLevel;
+
+    /**
+     * 负荷载重
+     */
+    private String load;
+
+    /**
+     * 轮胎标记（1全钢胎 2半钢胎 3工程胎）
+     */
+    private String tireMarkings;
+
+    /**
+     * 最小停放时间（秒）
+     */
+    private Long minParkingTime;
+
+    /**
+     * 最大停放时间（秒）
+     */
+    private Long maxParkingTime;
+
+    /**
+     * 标准重量
+     */
+    private Long standardWeight;
+
+    /**
+     * 标准重量上限
+     */
+    private Long weightUpperLimit;
+
+    /**
+     * 标准重量下限
+     */
+    private Long weightLowerLimit;
+
+    /**
+     * 内胎标记(0无 1有)
+     */
+    private String innerTubeFlag;
+
+    /**
+     * 销售类型(0内销 1外销)
+     */
+    private String saleType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 所属工厂名称
+     */
+    private String factoryName; //映射字段
+
+    /**
+     * 物料类型名称
+     */
+    private String matrialTypeName;//映射字段
+
+}

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/bo/BaseMaterialInfoBo.java

@@ -0,0 +1,256 @@
+package org.dromara.mes.api.model.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 物料信息业务对象 base_material_info
+ *
+ */
+@Data
+public class BaseMaterialInfoBo implements Serializable {
+
+    /**
+     * 主键标识
+     */
+    private Long materialId;
+
+    /**
+     * ERP信息
+     */
+    private String erpId;
+
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
+     * 旧物料编码
+     */
+    private String oldMaterialCode;
+
+    /**
+     * 物料名称
+     */
+    private String materialName;
+
+    /**
+     * 物料类型ID
+     */
+    private Long materialTypeId;
+
+    /**
+     * 物料大类(1原材料  2半成品 3成品)
+     */
+    private String materialCategories;
+
+    /**
+     * 物料小类
+     */
+    private String materialSubclass;
+
+    /**
+     * 批次标识(0否 1是)
+     */
+    private String batchFlag;
+
+    /**
+     * 小批次数量
+     */
+    private Long batchAmount;
+
+    /**
+     * 计量单位ID
+     */
+    private Long materialUnitId;
+
+    /**
+     * 计量单位名称
+     */
+    private String materialUnit;
+
+    /**
+     * 物料组
+     */
+    private String materialMatkl;
+
+    /**
+     * 物料规格
+     */
+    private String materialSpec;
+
+    /**
+     * 净重
+     */
+    private Long netWeight;
+
+    /**
+     * 毛重
+     */
+    private Long grossWeight;
+
+    /**
+     * 绑定标识(1是 0否)
+     */
+    private String alwaysFlag;
+
+    /**
+     * 所属工厂
+     */
+    private Long factoryId;
+
+    /**
+     * 创建组织
+     */
+    private Long createOrgId;
+
+    /**
+     * 使用组织
+     */
+    private Long useOrgId;
+
+    /**
+     * 所属产线
+     */
+    private Long prodLineId;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 删除标识(0否 1是)
+     */
+    private String deletedFlag;
+
+    /**
+     * 采购计价单位
+     */
+    private Long purchasePriceUnitId;
+
+    /**
+     * 审核日期
+     */
+    private Date approveDate;
+
+    /**
+     * erp最后更新日期
+     */
+    private Date erpModifyDate;
+
+    /**
+     * 最大库存数量
+     */
+    private Long maxStockAmount;
+
+    /**
+     * 最小库存数量
+     */
+    private Long minStockAmount;
+
+    /**
+     * 安全库存数量
+     */
+    private Long safeStockAmount;
+
+    /**
+     * 申请标识(1是 0否)
+     */
+    private String applyFlag;
+
+    /**
+     * 物料分类（1ERP同步 2虚拟物料 3MES物料）
+     */
+    private String materialClassfication;
+
+    /**
+     * 自动出库标识(1是 0否)
+     */
+    private String autoOutstockFlag;
+
+    /**
+     * 辅料标识(1是 0否)
+     */
+    private String accessoriesFlag;
+
+    /**
+     * 低值易耗品标识(1是 0否)
+     */
+    private String lowValueConsumableFlag;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 层级
+     */
+    private String plyrating;
+
+    /**
+     * 花纹
+     */
+    private String pattern;
+
+    /**
+     * 速度级别
+     */
+    private String speedLevel;
+
+    /**
+     * 负荷载重
+     */
+    private String load;
+
+    /**
+     * 轮胎标记（1全钢胎 2半钢胎 3工程胎）
+     */
+    private String tireMarkings;
+
+    /**
+     * 最小停放时间（秒）
+     */
+    private Long minParkingTime;
+
+    /**
+     * 最大停放时间（秒）
+     */
+    private Long maxParkingTime;
+
+    /**
+     * 标准重量
+     */
+    private Long standardWeight;
+
+    /**
+     * 标准重量上限
+     */
+    private Long weightUpperLimit;
+
+    /**
+     * 标准重量下限
+     */
+    private Long weightLowerLimit;
+
+    /**
+     * 内胎标记(0无 1有)
+     */
+    private String innerTubeFlag;
+
+    /**
+     * 销售类型(0内销 1外销)
+     */
+    private String saleType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-api/pom.xml

@@ -13,6 +13,7 @@
         <module>ruoyi-api-system</module>
         <module>ruoyi-api-resource</module>
         <module>ruoyi-api-workflow</module>
+        <module>hwmom-api-mes</module>
     </modules>
 
     <artifactId>ruoyi-api</artifactId>

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteCodeRuleService.java

@@ -0,0 +1,17 @@
+package org.dromara.system.api;
+
+/**
+ * 编码规则服务
+ *
+ * @author Yinq
+ */
+public interface RemoteCodeRuleService {
+
+    /**
+     * 通过编码规则编码获取编码
+     * @param codeRuleCode 编码规则编码
+     * @return currentCode
+     */
+    String selectCodeRuleCode(String codeRuleCode);
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -107,6 +107,22 @@ public class TokenController {
         return R.ok(loginVo);
     }
 
+    // @ApiEncrypt
+    @PostMapping("/pdaLogin")
+    public R<LoginVo> pdaLogin(@RequestBody String body) {
+        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+        // 授权类型和客户端id
+        String clientId = "428a8310cd442757ae699df5d894f051";
+        String grantType = "pda";
+        RemoteClientVo clientVo = remoteClientService.queryByClientId(clientId);
+        System.out.println(clientVo.toString());
+        // 校验租户
+        sysLoginService.checkTenant(loginBody.getTenantId());
+        // 登录
+        LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType);
+        return R.ok(loginVo);
+    }
+
     /**
      * 第三方登录请求
      *
@@ -114,8 +130,7 @@ public class TokenController {
      * @return 结果
      */
     @GetMapping("/binding/{source}")
-    public R<String> authBinding(@PathVariable("source") String source,
-                                 @RequestParam String tenantId, @RequestParam String domain) {
+    public R<String> authBinding(@PathVariable("source") String source, @RequestParam String tenantId, @RequestParam String domain) {
         SocialLoginConfigProperties obj = socialProperties.getType().get(source);
         if (ObjectUtil.isNull(obj)) {
             return R.fail(source + "平台账号暂不支持");
@@ -138,9 +153,7 @@ public class TokenController {
     @PostMapping("/social/callback")
     public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
         // 获取第三方登录信息
-        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
-            loginBody.getSource(), loginBody.getSocialCode(),
-            loginBody.getSocialState(), socialProperties);
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody.getSource(), loginBody.getSocialCode(), loginBody.getSocialState(), socialProperties);
         AuthUser authUserData = response.getData();
         // 判断授权响应是否成功
         if (!response.ok()) {
@@ -222,8 +235,7 @@ public class TokenController {
             host = new URL(request.getRequestURL().toString()).getHost();
         }
         // 根据域名进行筛选
-        List<TenantListVo> list = StreamUtils.filter(voList, vo ->
-            StringUtils.equals(vo.getDomain(), host));
+        List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host));
         result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
         return R.ok(result);
     }

ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java

@@ -1,6 +1,7 @@
 package org.dromara.auth.service;
 
 import org.dromara.auth.domain.vo.LoginVo;
+import org.dromara.auth.service.impl.PdaAuthStrategy;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.system.api.domain.vo.RemoteClientVo;
@@ -29,6 +30,8 @@ public interface IAuthStrategy {
             throw new ServiceException("授权类型不正确!");
         }
         IAuthStrategy instance = SpringUtils.getBean(beanName);
+        System.out.println("真实类型="+beanName);
+        System.out.println(instance instanceof PdaAuthStrategy);
         return instance.login(body, client);
     }
 

ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PdaAuthStrategy.java

@@ -0,0 +1,108 @@
+package org.dromara.auth.service.impl;
+
+import cn.dev33.satoken.secure.BCrypt;
+import cn.dev33.satoken.stp.SaLoginModel;
+import cn.dev33.satoken.stp.StpUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.auth.domain.vo.LoginVo;
+import org.dromara.auth.form.PasswordLoginBody;
+import org.dromara.auth.properties.CaptchaProperties;
+import org.dromara.auth.service.IAuthStrategy;
+import org.dromara.auth.service.SysLoginService;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.vo.RemoteClientVo;
+import org.dromara.system.api.model.LoginUser;
+import org.springframework.stereotype.Service;
+
+/**
+ * 密码认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("pdaAuthStrategy")
+@RequiredArgsConstructor
+public class PdaAuthStrategy implements IAuthStrategy {
+
+    private final CaptchaProperties captchaProperties;
+
+    private final SysLoginService loginService;
+
+    @DubboReference
+    private RemoteUserService remoteUserService;
+
+    @Override
+    public LoginVo login(String body, RemoteClientVo client) {
+        System.out.println("PDA service");
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
+        String username = loginBody.getUsername();
+        String password = loginBody.getPassword();
+        String code = loginBody.getCode();
+        String uuid = loginBody.getUuid();
+
+        // 验证码开关
+        // if (captchaProperties.getEnabled()) {
+        //     validateCaptcha(tenantId, username, code, uuid);
+        // }
+        LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            LoginUser user = remoteUserService.getUserInfo(username, tenantId);
+            loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword()));
+            return user;
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginModel model = new SaLoginModel();
+        model.setDevice(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    private void validateCaptcha(String tenantId, String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+}

ruoyi-common/hwmom-common-mom/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hwmom-common-mom</artifactId>
+
+    <description>
+        hwmom-common-mom 通用功能
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/annotation/DataSyncPublish.java

@@ -0,0 +1,43 @@
+package org.dromara.common.annotation;
+
+import org.dromara.common.enums.OperatorType;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义数据同步记录注解
+ *
+ * @author xins
+ */
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataSyncPublish {
+    /**
+     * 数据库表名称
+     */
+    String tableName() default "";
+
+
+    /**
+     * 操作类型
+     */
+    OperatorType operatorType() default OperatorType.INSERT;
+
+//    /**
+//     * 是否保存请求的参数
+//     */
+//    boolean isSaveRequestData() default true;
+//
+//    /**
+//     * 是否保存响应的参数
+//     */
+//    boolean isSaveResponseData() default true;
+//
+//
+//    /**
+//     * 排除指定的请求参数
+//     */
+//    String[] excludeParamNames() default {};
+
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/aspect/DataSyncPublishAspect.java

@@ -0,0 +1,215 @@
+package org.dromara.common.aspect;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.dromara.common.annotation.DataSyncPublish;
+import org.dromara.common.json.utils.JsonUtils;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * 数据同步记录处理
+ *
+ * @author xins
+ */
+@Slf4j
+@Aspect
+@AutoConfiguration
+public class DataSyncPublishAspect {
+
+    /**
+     * 排除敏感属性字段
+     */
+    public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
+
+
+    /**
+     * 计时 key
+     */
+    private static final ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>();
+
+    /**
+     * 处理请求前执行
+     */
+    @Before(value = "@annotation(dataSyncPublish)")
+    public void doBefore(JoinPoint joinPoint, DataSyncPublish dataSyncPublish) {
+        StopWatch stopWatch = new StopWatch();
+        KEY_CACHE.set(stopWatch);
+        stopWatch.start();
+    }
+
+    /**
+     * 处理完请求后执行
+     *
+     * @param joinPoint 切点
+     */
+    @AfterReturning(pointcut = "@annotation(dataSyncPublish)", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, DataSyncPublish dataSyncPublish, Object jsonResult) {
+        handleDataSyncPublish(joinPoint, dataSyncPublish, null, jsonResult);
+    }
+
+    /**
+     * 拦截异常操作
+     *
+     * @param joinPoint 切点
+     * @param e         异常
+     */
+    @AfterThrowing(value = "@annotation(dataSyncPublish)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, DataSyncPublish dataSyncPublish, Exception e) {
+        handleDataSyncPublish(joinPoint, dataSyncPublish, e, null);
+    }
+
+    protected void handleDataSyncPublish(final JoinPoint joinPoint, DataSyncPublish dataSyncPublish, final Exception e, Object jsonResult) {
+        try {
+
+            System.out.println("dbname:"+dataSyncPublish.tableName());
+            System.out.println("operationType:"+dataSyncPublish.operatorType().ordinal());
+            String params = this.argsArrayToString(joinPoint.getArgs());
+            System.out.println("params:"+params);
+//            // *========数据库日志=========*//
+//            OperLogEvent operLog = new OperLogEvent();
+//            operLog.setTenantId(LoginHelper.getTenantId());
+//            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+//            // 请求的地址
+//            String ip = ServletUtils.getClientIP();
+//            operLog.setOperIp(ip);
+//            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+//            LoginUser loginUser = LoginHelper.getLoginUser();
+//            operLog.setOperName(loginUser.getUsername());
+//            operLog.setDeptName(loginUser.getDeptName());
+//
+//            if (e != null) {
+//                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+//                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+//            }
+//            // 设置方法名称
+//            String className = joinPoint.getTarget().getClass().getName();
+//            String methodName = joinPoint.getSignature().getName();
+//            operLog.setMethod(className + "." + methodName + "()");
+//            // 设置请求方式
+//            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+//            // 处理设置注解上的参数
+//            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+//            // 设置消耗时间
+//            StopWatch stopWatch = KEY_CACHE.get();
+//            stopWatch.stop();
+//            operLog.setCostTime(stopWatch.getTime());
+//            // 发布事件保存数据库
+//            SpringUtils.context().publishEvent(operLog);
+        } catch (Exception exp) {
+            // 记录本地异常日志
+            log.error("异常信息:{}", exp.getMessage());
+            exp.printStackTrace();
+        } finally {
+            KEY_CACHE.remove();
+        }
+    }
+
+    /**
+     * 获取注解中对方法的描述信息 用于Controller层注解
+     *
+     * @param log     日志
+     * @param operLog 操作日志
+     * @throws Exception
+     */
+//    public void getControllerMethodDescription(JoinPoint joinPoint, DataSyncPublish dataSyncPublish, Object jsonResult) throws Exception {
+//        // 设置action动作
+//        operLog.setBusinessType(log.businessType().ordinal());
+//        // 设置标题
+//        operLog.setTitle(log.title());
+//        // 设置操作人类别
+//        operLog.setOperatorType(log.operatorType().ordinal());
+//        // 是否需要保存request，参数和值
+//        if (log.isSaveRequestData()) {
+//            // 获取参数的信息，传入到数据库中。
+//            setRequestValue(joinPoint, operLog, log.excludeParamNames());
+//        }
+//        // 是否需要保存response，参数和值
+//        if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) {
+//            operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 2000));
+//        }
+//    }
+
+    /**
+     * 获取请求的参数，放到log中
+     *
+     * @param operLog 操作日志
+     * @throws Exception 异常
+     */
+//    private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception {
+//        Map<String, String> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+//        String requestMethod = operLog.getRequestMethod();
+//        if (MapUtil.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name())) {
+//            String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
+//            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+//        } else {
+//            MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES);
+//            MapUtil.removeAny(paramsMap, excludeParamNames);
+//            operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 2000));
+//        }
+//    }
+
+    /**
+     * 参数拼装
+     */
+    private String argsArrayToString(Object[] paramsArray) {
+        StringJoiner params = new StringJoiner(" ");
+        if (ArrayUtil.isEmpty(paramsArray)) {
+            return params.toString();
+        }
+        for (Object o : paramsArray) {
+            if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
+                String str = JsonUtils.toJsonString(o);
+                Dict dict = JsonUtils.parseMap(str);
+                if (MapUtil.isNotEmpty(dict)) {
+                    MapUtil.removeAny(dict, EXCLUDE_PROPERTIES);
+                    str = JsonUtils.toJsonString(dict);
+                }
+                params.add(str);
+            }
+        }
+        return params.toString();
+    }
+
+    /**
+     * 判断是否需要过滤的对象。
+     *
+     * @param o 对象信息。
+     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+     */
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o) {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray()) {
+            return MultipartFile.class.isAssignableFrom(clazz.getComponentType());
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            Collection collection = (Collection) o;
+            for (Object value : collection) {
+                return value instanceof MultipartFile;
+            }
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            Map map = (Map) o;
+            for (Object value : map.values()) {
+                return value instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+            || o instanceof BindingResult;
+    }
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/constant/DatabaseConstants.java

@@ -0,0 +1,16 @@
+package org.dromara.common.constant;
+
+/**
+ * 数据库常量信息
+ *
+ * @author ruoyi
+ */
+public interface DatabaseConstants {
+
+    /**
+     * 生产计划表名前缀
+     */
+    String TABLE_NAME_PROD_PLAN_INFO_PREFIX = "prod_plan_info";
+
+
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/enums/OperatorType.java

@@ -0,0 +1,23 @@
+package org.dromara.common.enums;
+
+/**
+ * 操作类型
+ *
+ * @author xins
+ */
+public enum OperatorType {
+    /**
+     * 插入
+     */
+    INSERT,
+
+    /**
+     * 更新
+     */
+    UPDATE,
+
+    /**
+     * 删除
+     */
+    DELETE
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/event/DataSyncPublishEvent.java

@@ -0,0 +1,34 @@
+package org.dromara.common.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ *  数据同步记录发布事件
+ *
+ * @author xins
+ */
+
+@Data
+public class DataSyncPublishEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据库表名称
+     */
+    private String tableName;
+
+    /**
+     *  操作类型
+     */
+    private String operationType;
+
+    /**
+     *  过滤时间（如果是创建，则createtime大于此时间，如果是更新，则updatetime大于此时间）
+     */
+    private String filterTime;
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/event/DataSyncPublishListener.java

@@ -0,0 +1,29 @@
+package org.dromara.common.event;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.system.api.RemoteLogService;
+import org.dromara.system.api.domain.bo.RemoteOperLogBo;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class DataSyncPublishListener {
+
+    @DubboReference
+    private RemoteLogService remoteLogService;
+
+    /**
+     * 保存系统日志记录
+     */
+    @EventListener
+    public void dataSyncPublish(DataSyncPublishEvent dataSyncPublishEvent) {
+//       tableName,类型，时间，删除的id；
+
+    }
+
+
+
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/mapper/DynamicBaseSqlMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.common.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.provider.DynamicBaseSqlProvider;
+
+@Mapper
+public interface DynamicBaseSqlMapper<T> extends BaseMapper<T> {
+    // 自定义动态插入方法，接收表名和对象作为参数
+    @InsertProvider(type = DynamicBaseSqlProvider.class, method = "dynamicInsert")
+    int dynamicInsert(@Param("tableName") String tableName, @Param("tableNamePrefix") String tableNamePrefix,@Param("entity") T entity);
+}

ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/provider/DynamicBaseSqlProvider.java

@@ -0,0 +1,32 @@
+package org.dromara.common.provider;
+
+import org.apache.ibatis.jdbc.SQL;
+import java.util.Map;
+
+
+public class DynamicBaseSqlProvider {
+    public String dynamicInsert(Map<String, Object> params) {
+        String tableName = (String) params.get("tableName");
+//        Object entity = params.get("entity");
+        String tableNamePrefix = (String) params.get("tableNamePrefix");
+
+        SQL sql = new SQL();
+        sql.INSERT_INTO(tableName);
+        switch(tableNamePrefix){
+            case "prod_plan_info":
+                sql.INTO_COLUMNS("plan_code", "material_id", "material_bom_id","plan_amount","dispatch_amount");
+                sql.INTO_VALUES("#{entity.planCode}", "#{entity.materialId}", "#{entity.materialBomId}", "#{entity.planAmount}", "#{entity.dispatchAmount}");
+                break;
+        }
+        return sql.toString();
+    }
+
+
+    public String selectByDynamicTableName(Map<String, Object> params) {
+        String tableName = (String) params.get("tableName");
+        return new SQL() {{
+            SELECT("*");
+            FROM(tableName);
+        }}.toString();
+    }
+}

ruoyi-common/hwmom-common-mom/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+org.dromara.common.aspect.DataSyncPublishAspect
+org.dromara.common.event.DataSyncPublishListener

ruoyi-common/pom.xml

@@ -45,6 +45,7 @@
         <module>ruoyi-common-nacos</module>
         <module>ruoyi-common-bus</module>
         <module>ruoyi-common-sse</module>
+        <module>hwmom-common-mom</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SysConstants.java

@@ -0,0 +1,21 @@
+package org.dromara.common.core.constant;
+
+/**
+ * SYS通用常量信息
+ *
+ * @author ruoyi
+ */
+public interface SysConstants {
+
+    /**
+     * SYS规则编码：更新标识(1不更新)
+     */
+    String SYS_RENEW_FLAG_NO = "1";
+
+    /**
+     * SYS规则编码：(2每日更新)
+     */
+    String SYS_RENEW_FLAG_DAY = "2";
+
+}
+

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -320,4 +320,26 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             .collect(Collectors.toList());
     }
 
+    /**
+     * * 判断一个对象是否为空
+     *
+     * @param object Object
+     * @return true：为空 false：非空
+     */
+    public static boolean isNull(Object object)
+    {
+        return object == null;
+    }
+
+    /**
+     * * 判断一个对象是否非空
+     *
+     * @param object Object
+     * @return true：非空 false：空
+     */
+    public static boolean isNotNull(Object object)
+    {
+        return !isNull(object);
+    }
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/IdUtils.java

@@ -0,0 +1,49 @@
+package org.dromara.common.core.utils.uuid;
+
+/**
+ * ID生成器工具类
+ *
+ * @author ruoyi
+ */
+public class IdUtils
+{
+    /**
+     * 获取随机UUID
+     *
+     * @return 随机UUID
+     */
+    public static String randomUUID()
+    {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 简化的UUID，去掉了横线
+     *
+     * @return 简化的UUID，去掉了横线
+     */
+    public static String simpleUUID()
+    {
+        return UUID.randomUUID().toString(true);
+    }
+
+    /**
+     * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID
+     *
+     * @return 随机UUID
+     */
+    public static String fastUUID()
+    {
+        return UUID.fastUUID().toString();
+    }
+
+    /**
+     * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
+     *
+     * @return 简化的UUID，去掉了横线
+     */
+    public static String fastSimpleUUID()
+    {
+        return UUID.fastUUID().toString(true);
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java

@@ -0,0 +1,134 @@
+package org.dromara.common.core.utils.uuid;
+
+
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author ruoyi 序列生成类
+ */
+public class Seq {
+    // 通用序列类型
+    public static final String commSeqType = "COMMON";
+
+    // 上传序列类型
+    public static final String uploadSeqType = "UPLOAD";
+
+    // 通用接口序列数
+    private static AtomicInteger commSeq = new AtomicInteger(1);
+
+    // 上传接口序列数
+    private static AtomicInteger uploadSeq = new AtomicInteger(1);
+
+    // 机器标识
+    private static final String machineCode = "A";
+
+    // 计划编号记录标识
+    public static final String mesPlanCodeSeqType = "MES_PLAN_CODE";
+
+    // 计划编号序列数
+    private static AtomicInteger mesPlanCodeSeq = new AtomicInteger(1);
+
+    // 计划编号标识
+    public static final String mesPlanCodeCode = "PL";
+
+    /**
+     * 获取通用序列号
+     *
+     * @return 序列值
+     */
+    public static String getId() {
+        return getId(commSeqType);
+    }
+
+    /**
+     * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串
+     *
+     * @return 序列值
+     */
+    public static String getId(String type) {
+        AtomicInteger atomicInt = commSeq;
+        if (uploadSeqType.equals(type)) {
+            atomicInt = uploadSeq;
+        }
+        return getId(atomicInt, 3);
+    }
+
+    /**
+     * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+    public static String getId(AtomicInteger atomicInt, int length) {
+        String result = DateUtils.dateTimeNow();
+        result += machineCode;
+        result += getSeq(atomicInt, length);
+        return result;
+    }
+
+    /**
+     * 序列循环递增字符串[1, 10 的 (length)幂次方), 用0左补齐length位数
+     *
+     * @return 序列值
+     */
+    private synchronized static String getSeq(AtomicInteger atomicInt, int length) {
+        // 先取值再+1
+        int value = atomicInt.getAndIncrement();
+
+        // 如果更新后值>=10 的 (length)幂次方则重置为1
+        int maxSeq = (int) Math.pow(10, length);
+        if (atomicInt.get() >= maxSeq) {
+            atomicInt.set(1);
+        }
+        // 转字符串，用0左补齐
+        return StringUtils.padl(value, length);
+    }
+
+
+    /**
+     * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串
+     *
+     * @return 序列值
+     */
+    public static String getId(String type,String code) {
+        AtomicInteger atomicInt = commSeq;
+        if (mesPlanCodeSeqType.equals(type)) {
+            atomicInt = mesPlanCodeSeq;
+        }
+        return getId(atomicInt, 4, code);
+    }
+
+
+    /**
+     * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+    public static String getId(AtomicInteger atomicInt, int length, String code) {
+        String result = DateUtils.dateTimeNow();
+        result += code;
+        result += getSeq(atomicInt, length);
+        return result;
+    }
+
+    /**
+     * 通用接口序列号 前缀+yyMMdd + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+    public static String getNewId(AtomicInteger atomicInt, int length, String code) {
+        String result = code;
+        result += DateUtils.dateTime();
+        result += getSeq(atomicInt, length);
+        return result;
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/UUID.java

@@ -0,0 +1,486 @@
+package org.dromara.common.core.utils.uuid;
+
+
+import cn.hutool.core.exceptions.UtilException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * 提供通用唯一识别码（universally unique identifier）（UUID）实现
+ *
+ * @author ruoyi
+ */
+public final class UUID implements java.io.Serializable, Comparable<UUID>
+{
+    private static final long serialVersionUID = -1185015143654744140L;
+
+    /**
+     * SecureRandom 的单例
+     *
+     */
+    private static class Holder
+    {
+        static final SecureRandom numberGenerator = getSecureRandom();
+    }
+
+    /** 此UUID的最高64有效位 */
+    private final long mostSigBits;
+
+    /** 此UUID的最低64有效位 */
+    private final long leastSigBits;
+
+    /**
+     * 私有构造
+     *
+     * @param data 数据
+     */
+    private UUID(byte[] data)
+    {
+        long msb = 0;
+        long lsb = 0;
+        assert data.length == 16 : "data must be 16 bytes in length";
+        for (int i = 0; i < 8; i++)
+        {
+            msb = (msb << 8) | (data[i] & 0xff);
+        }
+        for (int i = 8; i < 16; i++)
+        {
+            lsb = (lsb << 8) | (data[i] & 0xff);
+        }
+        this.mostSigBits = msb;
+        this.leastSigBits = lsb;
+    }
+
+    /**
+     * 使用指定的数据构造新的 UUID。
+     *
+     * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
+     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
+     */
+    public UUID(long mostSigBits, long leastSigBits)
+    {
+        this.mostSigBits = mostSigBits;
+        this.leastSigBits = leastSigBits;
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID fastUUID()
+    {
+        return randomUUID(false);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID()
+    {
+        return randomUUID(true);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID(boolean isSecure)
+    {
+        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+
+        byte[] randomBytes = new byte[16];
+        ng.nextBytes(randomBytes);
+        randomBytes[6] &= 0x0f; /* clear version */
+        randomBytes[6] |= 0x40; /* set to version 4 */
+        randomBytes[8] &= 0x3f; /* clear variant */
+        randomBytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(randomBytes);
+    }
+
+    /**
+     * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
+     *
+     * @param name 用于构造 UUID 的字节数组。
+     *
+     * @return 根据指定数组生成的 {@code UUID}
+     */
+    public static UUID nameUUIDFromBytes(byte[] name)
+    {
+        MessageDigest md;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException nsae)
+        {
+            throw new InternalError("MD5 not supported");
+        }
+        byte[] md5Bytes = md.digest(name);
+        md5Bytes[6] &= 0x0f; /* clear version */
+        md5Bytes[6] |= 0x30; /* set to version 3 */
+        md5Bytes[8] &= 0x3f; /* clear variant */
+        md5Bytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(md5Bytes);
+    }
+
+    /**
+     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
+     *
+     * @param name 指定 {@code UUID} 字符串
+     * @return 具有指定值的 {@code UUID}
+     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
+     *
+     */
+    public static UUID fromString(String name)
+    {
+        String[] components = name.split("-");
+        if (components.length != 5)
+        {
+            throw new IllegalArgumentException("Invalid UUID string: " + name);
+        }
+        for (int i = 0; i < 5; i++)
+        {
+            components[i] = "0x" + components[i];
+        }
+
+        long mostSigBits = Long.decode(components[0]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[1]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[2]).longValue();
+
+        long leastSigBits = Long.decode(components[3]).longValue();
+        leastSigBits <<= 48;
+        leastSigBits |= Long.decode(components[4]).longValue();
+
+        return new UUID(mostSigBits, leastSigBits);
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最低有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中的最低有效 64 位。
+     */
+    public long getLeastSignificantBits()
+    {
+        return leastSigBits;
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最高有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中最高有效 64 位。
+     */
+    public long getMostSignificantBits()
+    {
+        return mostSigBits;
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
+     * <p>
+     * 版本号具有以下含意:
+     * <ul>
+     * <li>1 基于时间的 UUID
+     * <li>2 DCE 安全 UUID
+     * <li>3 基于名称的 UUID
+     * <li>4 随机生成的 UUID
+     * </ul>
+     *
+     * @return 此 {@code UUID} 的版本号
+     */
+    public int version()
+    {
+        // Version is bits masked by 0x000000000000F000 in MS long
+        return (int) ((mostSigBits >> 12) & 0x0f);
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
+     * <p>
+     * 变体号具有以下含意：
+     * <ul>
+     * <li>0 为 NCS 向后兼容保留
+     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
+     * <li>6 保留，微软向后兼容
+     * <li>7 保留供以后定义使用
+     * </ul>
+     *
+     * @return 此 {@code UUID} 相关联的变体号
+     */
+    public int variant()
+    {
+        // This field is composed of a varying number of bits.
+        // 0 - - Reserved for NCS backward compatibility
+        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
+        // 1 1 0 Reserved, Microsoft backward compatibility
+        // 1 1 1 Reserved for future definition.
+        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
+    }
+
+    /**
+     * 与此 UUID 相关联的时间戳值。
+     *
+     * <p>
+     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
+     * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
+     *
+     * <p>
+     * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
+     */
+    public long timestamp() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (mostSigBits & 0x0FFFL) << 48//
+                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
+                | mostSigBits >>> 32;
+    }
+
+    /**
+     * 与此 UUID 相关联的时钟序列值。
+     *
+     * <p>
+     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
+     * <p>
+     * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
+     * UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的时钟序列
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public int clockSequence() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
+    }
+
+    /**
+     * 与此 UUID 相关的节点值。
+     *
+     * <p>
+     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
+     * <p>
+     * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的节点值
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public long node() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return leastSigBits & 0x0000FFFFFFFFFFFFL;
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @return 此{@code UUID} 的字符串表现形式
+     * @see #toString(boolean)
+     */
+    @Override
+    public String toString()
+    {
+        return toString(false);
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
+     * @return 此{@code UUID} 的字符串表现形式
+     */
+    public String toString(boolean isSimple)
+    {
+        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
+        // time_low
+        builder.append(digits(mostSigBits >> 32, 8));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_mid
+        builder.append(digits(mostSigBits >> 16, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_high_and_version
+        builder.append(digits(mostSigBits, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // variant_and_sequence
+        builder.append(digits(leastSigBits >> 48, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // node
+        builder.append(digits(leastSigBits, 12));
+
+        return builder.toString();
+    }
+
+    /**
+     * 返回此 UUID 的哈希码。
+     *
+     * @return UUID 的哈希码值。
+     */
+    @Override
+    public int hashCode()
+    {
+        long hilo = mostSigBits ^ leastSigBits;
+        return ((int) (hilo >> 32)) ^ (int) hilo;
+    }
+
+    /**
+     * 将此对象与指定对象比较。
+     * <p>
+     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
+     *
+     * @param obj 要与之比较的对象
+     *
+     * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if ((null == obj) || (obj.getClass() != UUID.class))
+        {
+            return false;
+        }
+        UUID id = (UUID) obj;
+        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
+    }
+
+    // Comparison Operations
+
+    /**
+     * 将此 UUID 与指定的 UUID 比较。
+     *
+     * <p>
+     * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
+     *
+     * @param val 与此 UUID 比较的 UUID
+     *
+     * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
+     *
+     */
+    @Override
+    public int compareTo(UUID val)
+    {
+        // The ordering is intentionally set up so that the UUIDs
+        // can simply be numerically compared as two numbers
+        return (this.mostSigBits < val.mostSigBits ? -1 : //
+                (this.mostSigBits > val.mostSigBits ? 1 : //
+                        (this.leastSigBits < val.leastSigBits ? -1 : //
+                                (this.leastSigBits > val.leastSigBits ? 1 : //
+                                        0))));
+    }
+
+    // -------------------------------------------------------------------------------------------------------------------
+    // Private method start
+    /**
+     * 返回指定数字对应的hex值
+     *
+     * @param val 值
+     * @param digits 位
+     * @return 值
+     */
+    private static String digits(long val, int digits)
+    {
+        long hi = 1L << (digits * 4);
+        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+    }
+
+    /**
+     * 检查是否为time-based版本UUID
+     */
+    private void checkTimeBase()
+    {
+        if (version() != 1)
+        {
+            throw new UnsupportedOperationException("Not a time-based UUID");
+        }
+    }
+
+    /**
+     * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
+     *
+     * @return {@link SecureRandom}
+     */
+    public static SecureRandom getSecureRandom()
+    {
+        try
+        {
+            return SecureRandom.getInstance("SHA1PRNG");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new UtilException(e);
+        }
+    }
+
+    /**
+     * 获取随机数生成器对象<br>
+     * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
+     *
+     * @return {@link ThreadLocalRandom}
+     */
+    public static ThreadLocalRandom getRandom()
+    {
+        return ThreadLocalRandom.current();
+    }
+}

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java

@@ -45,4 +45,7 @@ public @interface Log {
      */
     String[] excludeParamNames() default {};
 
+    String tableName() default "";
+
+
 }

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java

@@ -113,7 +113,13 @@ public class LogAspect {
             // 设置消耗时间
             StopWatch stopWatch = KEY_CACHE.get();
             stopWatch.stop();
-            operLog.setCostTime(stopWatch.getTime());
+            operLog.setCostTime(stopWatch.getTime());//毫秒（1毫秒=1000000纳秒nano）
+
+
+            operLog.setSimpleClassName(joinPoint.getTarget().getClass().getSimpleName());
+            operLog.setTableName(controllerLog.tableName());
+
+
             // 发布事件保存数据库
             SpringUtils.context().publishEvent(operLog);
         } catch (Exception exp) {

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
+import com.alibaba.fastjson2.JSONObject;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -11,6 +12,9 @@ import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.enums.BusinessStatus;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.RemoteClientService;
 import org.dromara.system.api.RemoteLogService;
@@ -20,6 +24,10 @@ import org.dromara.system.api.domain.vo.RemoteClientVo;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 异步调用日志服务
  *
@@ -34,6 +42,11 @@ public class LogEventListener {
     @DubboReference
     private RemoteClientService remoteClientService;
 
+    public static final Map<String, String> TABLE_ID_MAP = new HashMap<>();
+    static {
+        TABLE_ID_MAP.put("base_class_team_info", "class_team_id");
+    }
+
     /**
      * 保存系统日志记录
      */
@@ -41,6 +54,45 @@ public class LogEventListener {
     public void saveLog(OperLogEvent operLogEvent) {
         RemoteOperLogBo sysOperLog = BeanUtil.toBean(operLogEvent, RemoteOperLogBo.class);
         remoteLogService.saveLog(sysOperLog);
+        this.dataSyncPublish(operLogEvent);
+    }
+
+
+    private void dataSyncPublish(OperLogEvent operLogEvent) {
+        /**
+         * 默认所有表都需要同步到机台本地，如果有需要不同的话，可以配置在redis中、内存中或者数据库中
+         */
+        Integer status = operLogEvent.getStatus();
+        Integer businessType = operLogEvent.getBusinessType();
+        if (status.equals(BusinessStatus.SUCCESS.ordinal())
+            && !businessType.equals(BusinessType.OTHER.ordinal()) && !businessType.equals(BusinessType.EXPORT.ordinal())
+            && !businessType.equals(BusinessType.GENCODE.ordinal()) && !businessType.equals(BusinessType.FORCE.ordinal())) {
+            JSONObject daySyncPublishJson = new JSONObject();
+            String tableName = operLogEvent.getTableName();
+
+            if (StringUtils.isEmpty(tableName)) {
+                String simpleClassName = operLogEvent.getSimpleClassName();
+                simpleClassName = simpleClassName.replaceFirst("Controller", "");
+                tableName = camelToSnake(simpleClassName);
+            }
+
+            long costTime = operLogEvent.getCostTime();
+            long filterTimeL = System.currentTimeMillis() - costTime - 60000;//多减1分钟
+
+            daySyncPublishJson.put("tableName", "["+tableName+"]");
+            daySyncPublishJson.put("filterTime", filterTimeL);
+            daySyncPublishJson.put("businessType", operLogEvent.getBusinessType());
+            if (businessType.equals(BusinessType.DELETE.ordinal())) {
+                String tableId = TABLE_ID_MAP.get(tableName);
+                if (StringUtils.isNotEmpty(tableId)) {
+                    daySyncPublishJson.put(tableId, operLogEvent.getOperParam());
+                }
+            }
+
+            RedisUtils.setCacheObject("publish", daySyncPublishJson.toString());
+
+        }
+
     }
 
     /**
@@ -100,4 +152,31 @@ public class LogEventListener {
         return "[" + msg + "]";
     }
 
+
+    public static String camelToSnake(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+
+        StringBuilder result = new StringBuilder();
+        char[] charArray = str.toCharArray();
+
+        for (int i = 0; i < charArray.length; i++) {
+            char ch = charArray[i];
+            if (Character.isUpperCase(ch)) {
+                // 如果不是字符串的第一个字符，则在前面加上下划线
+                if (i != 0) {
+                    result.append("_");
+                }
+                // 将大写字母转为小写并追加到结果中
+                result.append(Character.toLowerCase(ch));
+            } else {
+                // 直接追加非大写的字符
+                result.append(ch);
+            }
+        }
+
+        return result.toString();
+    }
+
 }

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java

@@ -112,4 +112,15 @@ public class OperLogEvent implements Serializable {
      * 消耗时间
      */
     private Long costTime;
+
+    /**
+     * 类名（不包含package）
+     */
+    private String simpleClassName;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
 }

ruoyi-modules/hwmom-api/pom.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hwmom-api</artifactId>
+
+    <description>
+        hwmom-api系统模块
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-nacos</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sentinel</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-dict</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-dubbo</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-seata</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <!-- RuoYi Api System -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-resource</artifactId>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.mysql</groupId>-->
+<!--            <artifactId>mysql-connector-j</artifactId>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hwmom-api-mes</artifactId>
+            <version>2.2.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-job</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/HwMomApiApplication.java

@@ -0,0 +1,22 @@
+package org.dromara.api;
+
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+
+/**
+ * 系统模块
+ *
+ * @author ruoyi
+ */
+@EnableDubbo
+@SpringBootApplication
+public class HwMomApiApplication {
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(HwMomApiApplication.class);
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        application.run(args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  HwApi启动成功   ლ(´ڡ`ლ)ﾞ  ");
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/BaseMaterialInfoApiController.java

@@ -0,0 +1,41 @@
+package org.dromara.api.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.api.service.IBaseMaterialInfoApiService;
+import org.dromara.mes.api.RemoteMaterialInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+
+/**
+ * 车间信息
+ * 前端访问路由地址为:/mes/baseWorkshopInfo
+ *
+ * @author Yinq
+ * @date 2025-01-02
+ */
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/materialInfoApi")
+public class BaseMaterialInfoApiController extends BaseController {
+
+
+
+    @Autowired
+    private final IBaseMaterialInfoApiService materialInfoApiService;
+
+
+    /**
+     * 测试物料信息存储接口
+     */
+    @PostMapping ("/test")
+    public String test(String requestBody) {
+        return materialInfoApiService.insertApi(requestBody);
+    }
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/sap/SAPPortDto.java

@@ -0,0 +1,56 @@
+package org.dromara.api.domain.sap;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @Author YinQ
+ * @create 2023-09-26 14:46
+ */
+public class SAPPortDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开始时间
+     */
+    @JsonProperty(value = "NDATE")
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonProperty(value = "EDATE")
+    private String endDate;
+
+
+    /**
+     * 工厂编号
+     */
+    @JsonProperty(value = "WERKS")
+    private WERKSDto factoryCodes;
+
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public WERKSDto getFactoryCodes() {
+        return factoryCodes;
+    }
+
+    public void setFactoryCodes(WERKSDto factoryCodes) {
+        this.factoryCodes = factoryCodes;
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/sap/WERKSDto.java

@@ -0,0 +1,33 @@
+package org.dromara.api.domain.sap;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Author YinQ
+ * @create 2023-09-26 15:13
+ */
+public class WERKSDto {
+
+
+    /**
+     * 工厂请求Map
+     */
+    List<HashMap<String, String>> item;
+
+
+    public List<HashMap<String, String>> getItem() {
+        return item;
+    }
+
+    public void setItem(List<HashMap<String, String>> item) {
+        this.item = item;
+    }
+
+    @Override
+    public String toString() {
+        return "WERKSDto{" +
+                "item=" + item +
+                '}';
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/sap/vo/SAPResultVo.java

@@ -0,0 +1,61 @@
+package org.dromara.api.domain.sap.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dromara.api.domain.sap.WERKSDto;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 物料主数据
+ *
+ * @Author YinQ
+ * @create 2023-09-27 13:37
+ */
+public class SAPResultVo {
+
+    @JsonProperty(value = "O_TAB")
+    private HashMap<String,  List<HashMap<String, String>>> O_TAB;
+
+    @JsonProperty(value = "WERKS")
+    private WERKSDto WERKS;
+
+    @JsonProperty(value = "O_RETURN")
+    private WERKSDto O_RETURN;
+
+    public HashMap<String, List<HashMap<String, String>>> getO_TAB() {
+        return O_TAB;
+    }
+
+    public void setO_TAB(HashMap<String, List<HashMap<String, String>>> o_TAB) {
+        O_TAB = o_TAB;
+    }
+
+    public WERKSDto getWERKS() {
+        return WERKS;
+    }
+
+    public void setWERKS(WERKSDto WERKS) {
+        this.WERKS = WERKS;
+    }
+
+    public WERKSDto getO_RETURN() {
+        return O_RETURN;
+    }
+
+    public void setO_RETURN(WERKSDto o_RETURN) {
+        O_RETURN = o_RETURN;
+    }
+
+    public SAPResultVo() {
+    }
+
+    @Override
+    public String toString() {
+        return "SAPResultVo{" +
+                "O_TAB=" + O_TAB +
+                ", WERKS='" + WERKS + '\'' +
+                ", O_RETURN=" + O_RETURN +
+                '}';
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IBaseMaterialInfoApiService.java

@@ -0,0 +1,14 @@
+package org.dromara.api.service;
+
+
+/**
+ * API物料Service接口
+ *
+ * @author Yinq
+ * @date 2025-01-02
+ */
+public interface IBaseMaterialInfoApiService {
+
+    String insertApi(String requestBody);
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/ICommonApiService.java

@@ -0,0 +1,23 @@
+package org.dromara.api.service;
+
+import org.dromara.api.domain.sap.SAPPortDto;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
+
+import java.util.List;
+
+/**
+ * 通用APIService接口
+ *
+ * @author Yinq
+ * @date 2025-01-02
+ */
+public interface ICommonApiService {
+
+
+    String getSAPData(SAPPortDto sapPortDto);
+
+
+    List<BaseMaterialInfoBo> convertSAPToMaterialEntity(String json);
+
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/BaseMaterialInfoApiServiceImpl.java

@@ -0,0 +1,53 @@
+package org.dromara.api.service.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.api.domain.sap.SAPPortDto;
+import org.dromara.api.domain.sap.vo.SAPResultVo;
+import org.dromara.api.service.IBaseMaterialInfoApiService;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.api.service.ICommonApiService;
+import org.dromara.api.utils.SAPApiUtils;
+import org.dromara.api.utils.SAPConstants;
+import org.dromara.mes.api.RemoteMaterialInfoService;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * API物料Service业务层处理
+ *
+ * @author Yinq
+ * @date 2025-01-02
+ */
+@RequiredArgsConstructor
+@Service
+public class BaseMaterialInfoApiServiceImpl implements IBaseMaterialInfoApiService {
+
+    @Autowired
+    private final ICommonApiService commonApiService;
+
+    @DubboReference
+    private final RemoteMaterialInfoService remoteMaterialInfoService;
+
+    @Override
+    public String insertApi(String requestBody) {
+        SAPPortDto sapPortDto = new SAPPortDto();
+        //请求API接口，获取数据
+        String json = commonApiService.getSAPData(sapPortDto);
+        //解析数据，存储实体类
+        List<BaseMaterialInfoBo> list = commonApiService.convertSAPToMaterialEntity(json);
+        remoteMaterialInfoService.remoteInsertBaseMaterialInfo(list);
+        return "success";
+    }
+
+
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/CommonApiServiceImpl.java

@@ -0,0 +1,77 @@
+package org.dromara.api.service.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.dromara.api.domain.sap.SAPPortDto;
+import org.dromara.api.domain.sap.vo.SAPResultVo;
+import org.dromara.api.service.ICommonApiService;
+import org.dromara.api.utils.SAPApiUtils;
+import org.dromara.api.utils.SAPConstants;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 通用APIService接口
+ *
+ * @author Yinq
+ * @date 2025-01-02
+ */
+@Service
+public class CommonApiServiceImpl implements ICommonApiService {
+
+
+    @Override
+    public String getSAPData(SAPPortDto sapPortDto) {
+        String requestParam = null;
+        String result = null;
+        try {
+            //获取物料API
+
+            // 创建ObjectMapper实例 对象转JSON字符串
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 格式化输出
+            objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+            requestParam = objectMapper.writeValueAsString(sapPortDto);
+            result = SAPApiUtils.sendSAPHttpPost(SAPConstants.SAP_PREFIX_URL + SAPConstants.MATERIAL_URL, requestParam);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @Override
+    public List<BaseMaterialInfoBo> convertSAPToMaterialEntity(String json) {
+        SAPResultVo resultVo = null;
+        try {
+            // 处理接口返回消息
+            ObjectMapper resultMapper = new ObjectMapper();
+            // 将 JSON 字符串 转换为 Java 对象
+            resultVo = resultMapper.readValue(json, SAPResultVo.class);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        List<BaseMaterialInfoBo> materialInfoArrayList = new ArrayList<>();
+        assert resultVo != null;
+        List<HashMap<String, String>> itemList = resultVo.getO_TAB().get("item");
+        for (HashMap<String, String> map : itemList) {
+            BaseMaterialInfoBo materialInfo = new BaseMaterialInfoBo();
+            materialInfo.setMaterialCode(map.get("MATNR"));
+            materialInfo.setMaterialName(map.get("MAKTX"));
+            materialInfo.setMaterialUnit(map.get("MEINS"));
+            materialInfo.setMaterialMatkl(map.get("MATKL"));
+            materialInfoArrayList.add(materialInfo);
+        }
+        return materialInfoArrayList;
+    }
+
+
+
+
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/snailjob/MaterialInfoJobExecutor.java

@@ -0,0 +1,30 @@
+package org.dromara.api.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.core.util.JsonUtil;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.dromara.api.service.IBaseMaterialInfoApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author opensnail
+ * @date 2024-05-17
+ */
+@Component
+@JobExecutor(name = "materialInfoJobExecutor")
+public class MaterialInfoJobExecutor {
+
+    @Autowired
+    IBaseMaterialInfoApiService baseMaterialInfoApiService;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        String jobParams = String.valueOf(jobArgs.getJobParams());
+        String result = baseMaterialInfoApiService.insertApi(jobParams);
+        SnailJobLog.LOCAL.info("materialInfoJobExecutor.jobArgs:{}", JsonUtil.toJsonString(jobArgs));
+        return ExecuteResult.success(result);
+    }
+
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/utils/SAPApiUtils.java

@@ -0,0 +1,43 @@
+package org.dromara.api.utils;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+
+import java.util.Base64;
+
+/**
+ * @Author YinQ
+ * @create 2023-10-12 10:52
+ */
+public class SAPApiUtils {
+
+
+    /**
+     * POST请求json格式
+     * @param apiUrl
+     * @param jsonData
+     * @return
+     */
+    public static String sendSAPHttpPost(String apiUrl, String jsonData) {
+        try {
+            // 构建POST请求
+            HttpRequest request = HttpRequest.post(apiUrl)
+                    .header("Authorization", "Basic " + Base64.getUrlEncoder().
+                            encodeToString((SAPConstants.USER_NAME + ":" + SAPConstants.PASS_WORD).getBytes()))
+                    .body(jsonData)  // 设置JSON格式的请求体
+                    .contentType("application/json")  // 设置Content-Type为application/json
+                    .setConnectionTimeout(1000 * 10)  // 设置请求连接超时时间
+                    ;
+
+            // 发送POST请求
+            HttpResponse httpResponse = request.execute();
+
+            // 获取响应内容
+            return httpResponse.body();
+        } catch (Exception e) {
+            // 捕获异常并重新抛出自定义异常
+            throw new RuntimeException("Failed to send SAP HTTP POST request: " + e.getMessage(), e);
+        }
+
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/utils/SAPConstants.java

@@ -0,0 +1,70 @@
+package org.dromara.api.utils;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author YinQ
+ * @create 2023-09-26 15:39
+ */
+@Component
+public class SAPConstants {
+
+
+    /**
+     * SAP-URL前缀
+     */
+    public static String SAP_PREFIX_URL;
+
+    /**
+     * SAP-用户名
+     */
+    public static String USER_NAME;
+
+    /**
+     * SAP-密码
+     */
+    public static String PASS_WORD;
+
+    /**
+     * 获取物料主数据(MES2019)
+     */
+    public static final String MATERIAL_URL = "/SdGetSB/SdSapGetMaterialToMesSvcRSProxy/merge";
+
+    /**
+     * 获取生产工单(MES2019)
+     */
+    public static final String PRODUCTION_ORDERS_URL = "/SdGetSB/SdSapGetPOToMesSvcRSProxy/merge";
+
+    /**
+     * 获取设备模具信息(MES2019)
+     */
+    public static final String EQUIPMENT_URL = "/SdGetSB/SdSapGetEQToMesSvcRSProxy/merge";
+
+    /**
+     * 获取产品BOM信息(MES2019)
+     */
+    public static final String PRODUCTS_BOM_URL = "/SdGetSB/SdSapGetBomToMesSvcRSProxy/merge";
+
+    /**
+     * 工厂编号
+     */
+    public static final String FACTORY_CODE = "1301";
+
+
+//    @Value("${sap.prefix}")
+    public void setPrefix(String value) {
+        SAP_PREFIX_URL = value;
+    }
+
+//    @Value("${sap.username}")
+    public void setUserName(String value) {
+        USER_NAME = value;
+    }
+
+//    @Value("${sap.password}")
+    public void setPassWord(String value) {
+        PASS_WORD = value;
+    }
+
+}

ruoyi-modules/hwmom-api/src/main/resources/application.yml

@@ -0,0 +1,34 @@
+# Tomcat
+server:
+  port: 6016
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: hwmom-api
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+  config:
+    import:
+      - optional:nacos:application-common.yml
+      - optional:nacos:datasource.yml
+      - optional:nacos:${spring.application.name}.yml

ruoyi-modules/hwmom-api/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+    __                                                        _
+   / /_ _      ______ ___  ____  ____ ___        ____ _____  (_)
+  / __ \ | /| / / __ `__ \/ __ \/ __ `__ \______/ __ `/ __ \/ /
+ / / / / |/ |/ / / / / / / /_/ / / / / / /_____/ /_/ / /_/ / /
+/_/ /_/|__/|__/_/ /_/ /_/\____/_/ /_/ /_/      \__,_/ .___/_/
+                                                   /_/

ruoyi-modules/hwmom-api/src/main/resources/logback-plus.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/${project.artifactId}" />
+   <!-- 日志输出格式 -->
+    <property name="console.log.pattern"
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <include resource="logback-common.xml" />
+
+    <include resource="logback-logstash.xml" />
+
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+</configuration>

ruoyi-modules/hwmom-api/src/main/resources/mapper/package-info.md

@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件

ruoyi-modules/hwmom-mes/pom.xml

@@ -115,6 +115,19 @@
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hwmom-common-mom</artifactId>
+            <version>2.2.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>hwmom-api-mes</artifactId>
+            <version>2.2.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseClassTeamInfoController.java

@@ -114,4 +114,14 @@ public class BaseClassTeamInfoController extends BaseController {
     public R<List<BaseClassTeamInfoVo>>selectClassTeamList(BaseClassTeamInfoBo bo, PageQuery pageQuery) {
         return  R.ok(baseClassTeamInfoService.queryList(bo));
     }
+
+    /**
+     * 下拉框查询班组信息列表
+     */
+    @GetMapping("getBaseClassTeamInfoList")
+    public R<List<BaseClassTeamInfoVo>> getBaseClassTeamInfolist(BaseClassTeamInfoBo bo) {
+        List<BaseClassTeamInfoVo> list = baseClassTeamInfoService.queryList(bo);
+        return R.ok(list);
+    }
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java

@@ -110,7 +110,7 @@ public class BaseMaterialInfoController extends BaseController {
      */
 
     @GetMapping("getBaseMaterialInfoList")
-    public R<List<BaseMaterialInfoVo>> getBaseMaterialInfolist(BaseMaterialInfoBo bo) {
+    public R<List<BaseMaterialInfoVo>> getBaseMaterialInfoList(BaseMaterialInfoBo bo) {
         List<BaseMaterialInfoVo> list = baseMaterialInfoService.queryList(bo);
         return R.ok(list);
     }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseStructureBomController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.BaseStructureBomVo;
+import org.dromara.mes.domain.bo.BaseStructureBomBo;
+import org.dromara.mes.service.IBaseStructureBomService;
+
+/**
+ * 结构BOM信息
+ * 前端访问路由地址为:/mes/baseStructureBom
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/baseStructureBom")
+public class BaseStructureBomController extends BaseController {
+
+    private final IBaseStructureBomService baseStructureBomService;
+
+    /**
+     * 查询结构BOM信息列表
+     */
+    @SaCheckPermission("mes:baseStructureBom:list")
+    @GetMapping("/list")
+    public R<List<BaseStructureBomVo>> list(BaseStructureBomBo bo) {
+        List<BaseStructureBomVo> list = baseStructureBomService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出结构BOM信息列表
+     */
+    @SaCheckPermission("mes:baseStructureBom:export")
+    @Log(title = "结构BOM信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(BaseStructureBomBo bo, HttpServletResponse response) {
+        List<BaseStructureBomVo> list = baseStructureBomService.queryList(bo);
+        ExcelUtil.exportExcel(list, "结构BOM信息", BaseStructureBomVo.class, response);
+    }
+
+    /**
+     * 获取结构BOM信息详细信息
+     *
+     * @param structureBomId 主键
+     */
+    @SaCheckPermission("mes:baseStructureBom:query")
+    @GetMapping("/{structureBomId}")
+    public R<BaseStructureBomVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long structureBomId) {
+        return R.ok(baseStructureBomService.queryById(structureBomId));
+    }
+
+    /**
+     * 新增结构BOM信息
+     */
+    @SaCheckPermission("mes:baseStructureBom:add")
+    @Log(title = "结构BOM信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseStructureBomBo bo) {
+        return toAjax(baseStructureBomService.insertByBo(bo));
+    }
+
+    /**
+     * 修改结构BOM信息
+     */
+    @SaCheckPermission("mes:baseStructureBom:edit")
+    @Log(title = "结构BOM信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseStructureBomBo bo) {
+        return toAjax(baseStructureBomService.updateByBo(bo));
+    }
+
+    /**
+     * 删除结构BOM信息
+     *
+     * @param structureBomIds 主键串
+     */
+    @SaCheckPermission("mes:baseStructureBom:remove")
+    @Log(title = "结构BOM信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{structureBomIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] structureBomIds) {
+        return toAjax(baseStructureBomService.deleteWithValidByIds(List.of(structureBomIds), true));
+    }
+
+
+    /**
+     * 下拉框查询结构BOM信息列表
+     */
+
+    @GetMapping("getBaseStructureBomList")
+    public R<List<BaseStructureBomVo>> getBaseStructureBomlist(BaseStructureBomBo bo) {
+        List<BaseStructureBomVo> list = baseStructureBomService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseMachineInfoController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdBaseMachineInfoVo;
+import org.dromara.mes.domain.bo.ProdBaseMachineInfoBo;
+import org.dromara.mes.service.IProdBaseMachineInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 机台信息
+ * 前端访问路由地址为:/mes/prodBaseMachineInfo
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/prodBaseMachineInfo")
+public class ProdBaseMachineInfoController extends BaseController {
+
+    private final IProdBaseMachineInfoService prodBaseMachineInfoService;
+
+    /**
+     * 查询机台信息列表
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdBaseMachineInfoVo> list(ProdBaseMachineInfoBo bo, PageQuery pageQuery) {
+        return prodBaseMachineInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机台信息列表
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:export")
+    @Log(title = "机台信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdBaseMachineInfoBo bo, HttpServletResponse response) {
+        List<ProdBaseMachineInfoVo> list = prodBaseMachineInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机台信息", ProdBaseMachineInfoVo.class, response);
+    }
+
+    /**
+     * 获取机台信息详细信息
+     *
+     * @param machineId 主键
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:query")
+    @GetMapping("/{machineId}")
+    public R<ProdBaseMachineInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long machineId) {
+        return R.ok(prodBaseMachineInfoService.queryById(machineId));
+    }
+
+    /**
+     * 新增机台信息
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:add")
+    @Log(title = "机台信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseMachineInfoBo bo) {
+        return toAjax(prodBaseMachineInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改机台信息
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:edit")
+    @Log(title = "机台信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseMachineInfoBo bo) {
+        return toAjax(prodBaseMachineInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除机台信息
+     *
+     * @param machineIds 主键串
+     */
+    @SaCheckPermission("mes:prodBaseMachineInfo:remove")
+    @Log(title = "机台信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{machineIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] machineIds) {
+        return toAjax(prodBaseMachineInfoService.deleteWithValidByIds(List.of(machineIds), true));
+    }
+
+
+    /**
+     * 下拉框查询机台信息列表
+     */
+
+    @GetMapping("getProdBaseMachineInfoList")
+    public R<List<ProdBaseMachineInfoVo>> getProdBaseMachineInfolist(ProdBaseMachineInfoBo bo) {
+        List<ProdBaseMachineInfoVo> list = prodBaseMachineInfoService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessInfoController.java

@@ -95,11 +95,22 @@ public class ProdBaseProcessInfoController extends BaseController {
     @SaCheckPermission("mes:baseProcessInfo:edit")
     @Log(title = "工序信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
+    @PutMapping("/edit")
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseProcessInfoBo bo) {
         return toAjax(prodBaseProcessInfoService.updateByBo(bo));
     }
 
+    /**
+     * 修改工序信息
+     */
+    @SaCheckPermission("mes:baseProcessInfo:edit")
+    @Log(title = "工序信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/editUser")
+    public R<Void> editUser(@Validated(EditGroup.class) @RequestBody ProdBaseProcessInfoBo bo) {
+        return toAjax(prodBaseProcessInfoService.updateByBoUser(bo));
+    }
+
     /**
      * 删除工序信息
      *

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessProdLineController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdBaseProcessProdLineVo;
+import org.dromara.mes.domain.bo.ProdBaseProcessProdLineBo;
+import org.dromara.mes.service.IProdBaseProcessProdLineService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 工序关联产线
+ * 前端访问路由地址为:/mes/prodBaseProcessProdLine
+ *
+ * @author LionLi
+ * @date 2025-01-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/prodBaseProcessProdLine")
+public class ProdBaseProcessProdLineController extends BaseController {
+
+    private final IProdBaseProcessProdLineService prodBaseProcessProdLineService;
+
+    /**
+     * 查询工序关联产线列表
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdBaseProcessProdLineVo> list(ProdBaseProcessProdLineBo bo, PageQuery pageQuery) {
+        return prodBaseProcessProdLineService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工序关联产线列表
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:export")
+    @Log(title = "工序关联产线", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdBaseProcessProdLineBo bo, HttpServletResponse response) {
+        List<ProdBaseProcessProdLineVo> list = prodBaseProcessProdLineService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工序关联产线", ProdBaseProcessProdLineVo.class, response);
+    }
+
+    /**
+     * 获取工序关联产线详细信息
+     *
+     * @param processId 主键
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:query")
+    @GetMapping("/{processId}")
+    public R<ProdBaseProcessProdLineVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long processId) {
+        return R.ok(prodBaseProcessProdLineService.queryById(processId));
+    }
+
+    /**
+     * 新增工序关联产线
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:add")
+    @Log(title = "工序关联产线", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseProcessProdLineBo bo) {
+        return toAjax(prodBaseProcessProdLineService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工序关联产线
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:edit")
+    @Log(title = "工序关联产线", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseProcessProdLineBo bo) {
+        return toAjax(prodBaseProcessProdLineService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工序关联产线
+     *
+     * @param processIds 主键串
+     */
+    @SaCheckPermission("mes:prodBaseProcessProdLine:remove")
+    @Log(title = "工序关联产线", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{processIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] processIds) {
+        return toAjax(prodBaseProcessProdLineService.deleteWithValidByIds(List.of(processIds), true));
+    }
+
+
+    /**
+     * 下拉框查询工序关联产线列表
+     */
+
+    @GetMapping("getProdBaseProcessProdLineList")
+    public R<List<ProdBaseProcessProdLineVo>> getProdBaseProcessProdLinelist(ProdBaseProcessProdLineBo bo) {
+        List<ProdBaseProcessProdLineVo> list = prodBaseProcessProdLineService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessUserController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdBaseProcessUserVo;
+import org.dromara.mes.domain.bo.ProdBaseProcessUserBo;
+import org.dromara.mes.service.IProdBaseProcessUserService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 工序关联人员
+ * 前端访问路由地址为:/mes/prodBaseProcessUser
+ *
+ * @author zangch
+ * @date 2025-01-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/prodBaseProcessUser")
+public class ProdBaseProcessUserController extends BaseController {
+
+    private final IProdBaseProcessUserService prodBaseProcessUserService;
+
+    /**
+     * 查询工序关联人员列表
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdBaseProcessUserVo> list(ProdBaseProcessUserBo bo, PageQuery pageQuery) {
+        return prodBaseProcessUserService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工序关联人员列表
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:export")
+    @Log(title = "工序关联人员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdBaseProcessUserBo bo, HttpServletResponse response) {
+        List<ProdBaseProcessUserVo> list = prodBaseProcessUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工序关联人员", ProdBaseProcessUserVo.class, response);
+    }
+
+    /**
+     * 获取工序关联人员详细信息
+     *
+     * @param processId 主键
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:query")
+    @GetMapping("/{processId}")
+    public R<ProdBaseProcessUserVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long processId) {
+        return R.ok(prodBaseProcessUserService.queryById(processId));
+    }
+
+    /**
+     * 新增工序关联人员
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:add")
+    @Log(title = "工序关联人员", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseProcessUserBo bo) {
+        return toAjax(prodBaseProcessUserService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工序关联人员
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:edit")
+    @Log(title = "工序关联人员", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseProcessUserBo bo) {
+        return toAjax(prodBaseProcessUserService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工序关联人员
+     *
+     * @param processIds 主键串
+     */
+    @SaCheckPermission("mes:prodBaseProcessUser:remove")
+    @Log(title = "工序关联人员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{processIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] processIds) {
+        return toAjax(prodBaseProcessUserService.deleteWithValidByIds(List.of(processIds), true));
+    }
+
+
+    /**
+     * 下拉框查询工序关联人员列表
+     */
+
+    @GetMapping("getProdBaseProcessUserList")
+    public R<List<ProdBaseProcessUserVo>> getProdBaseProcessUserlist(ProdBaseProcessUserBo bo) {
+        List<ProdBaseProcessUserVo> list = prodBaseProcessUserService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java

@@ -107,9 +107,21 @@ public class ProdMaterialBomController extends BaseController {
     /**
      * 下拉框查询物料BOM信息列表
      */
-    @GetMapping("getProdMaterialBomList")
+    @GetMapping("/getProdMaterialBomList")
     public R<List<ProdMaterialBomVo>> getProdMaterialBomlist(ProdMaterialBomBo bo) {
         List<ProdMaterialBomVo> list = prodMaterialBomService.queryList(bo);
         return R.ok(list);
     }
+
+    /**
+     * 根据结构BOM批量插入物料清单BOM。
+     */
+    @SaCheckPermission("mes:materialBom:add")
+    @Log(title = "物料BOM信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/addBatchMaterialBom")
+    public R<Void> addBatchMaterialBom(@RequestBody List<ProdMaterialBomBo> boList) {
+        //不是单纯的批量新增，是新增BOM对话框（参考结构BOM批量新增物料BOM）
+        return toAjax(prodMaterialBomService.insertBatchByBoList(boList));
+    }
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java

@@ -6,6 +6,9 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.mes.domain.ProdBaseRouteProcess;
+import org.dromara.mes.domain.vo.MesProductPlanEditVo;
+import org.dromara.mes.service.IProdBaseRouteProcessService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -37,6 +40,8 @@ public class ProdPlanInfoController extends BaseController {
 
     private final IProdPlanInfoService prodPlanInfoService;
 
+    private final IProdBaseRouteProcessService prodBaseRouteProcessService;
+
     /**
      * 查询生产工单信息列表
      */
@@ -114,4 +119,47 @@ public class ProdPlanInfoController extends BaseController {
         List<ProdPlanInfoVo> list = prodPlanInfoService.queryList(bo);
         return R.ok(list);
     }
+
+    /**
+     * 获取派工编号
+     *
+     * @return orderCode
+     */
+    @GetMapping(value = "/getDispatchCode")
+    public R<Void> getDispatchCode() {
+        return R.ok(prodPlanInfoService.getDispatchCode());
+    }
+
+    /**
+     * 获取工序及关联生产人员信息
+     *
+     * @param prodBaseRouteProcess
+     * @return
+     */
+    @GetMapping(value = "/getBaseRouteProcesses")
+    public R<List<ProdBaseRouteProcess>> getBaseRouteProcesses(ProdBaseRouteProcess prodBaseRouteProcess) {
+        return R.ok(prodBaseRouteProcessService.selectProdBaseRouteProcessJoinList(prodBaseRouteProcess));
+    }
+
+    /**
+     * 查询生产派工List
+     *
+     * @param bo
+     * @return
+     */
+    @GetMapping("/selectProductPlans")
+    public R<List<ProdPlanInfoVo>> selectProductPlans(ProdPlanInfoBo bo) {
+        List<ProdPlanInfoVo> list = prodPlanInfoService.selectProdPlanInfoJoinProcessList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 生产工单新增生产派工List
+     */
+    @PostMapping("/orderAddProductPlanList")
+    @RepeatSubmit(message = "正在提交，请稍后")
+    public R<Void> orderAddProductPlanList(@RequestBody MesProductPlanEditVo productPlanEditVo) {
+        return toAjax(prodPlanInfoService.orderAddMesProductPlanList(productPlanEditVo));
+    }
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdTechnologyInfoController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdTechnologyInfoVo;
+import org.dromara.mes.domain.bo.ProdTechnologyInfoBo;
+import org.dromara.mes.service.IProdTechnologyInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 工序工艺信息
+ * 前端访问路由地址为:/mes/technologyInfo
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/technologyInfo")
+public class ProdTechnologyInfoController extends BaseController {
+
+    private final IProdTechnologyInfoService prodTechnologyInfoService;
+
+    /**
+     * 查询工序工艺信息列表
+     */
+    @SaCheckPermission("mes:technologyInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdTechnologyInfoVo> list(ProdTechnologyInfoBo bo, PageQuery pageQuery) {
+        return prodTechnologyInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工序工艺信息列表
+     */
+    @SaCheckPermission("mes:technologyInfo:export")
+    @Log(title = "工序工艺信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdTechnologyInfoBo bo, HttpServletResponse response) {
+        List<ProdTechnologyInfoVo> list = prodTechnologyInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工序工艺信息", ProdTechnologyInfoVo.class, response);
+    }
+
+    /**
+     * 获取工序工艺信息详细信息
+     *
+     * @param technologyId 主键
+     */
+    @SaCheckPermission("mes:technologyInfo:query")
+    @GetMapping("/{technologyId}")
+    public R<ProdTechnologyInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long technologyId) {
+        return R.ok(prodTechnologyInfoService.queryById(technologyId));
+    }
+
+    /**
+     * 新增工序工艺信息
+     */
+    @SaCheckPermission("mes:technologyInfo:add")
+    @Log(title = "工序工艺信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdTechnologyInfoBo bo) {
+        return toAjax(prodTechnologyInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工序工艺信息
+     */
+    @SaCheckPermission("mes:technologyInfo:edit")
+    @Log(title = "工序工艺信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdTechnologyInfoBo bo) {
+        return toAjax(prodTechnologyInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工序工艺信息
+     *
+     * @param technologyIds 主键串
+     */
+    @SaCheckPermission("mes:technologyInfo:remove")
+    @Log(title = "工序工艺信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{technologyIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] technologyIds) {
+        return toAjax(prodTechnologyInfoService.deleteWithValidByIds(List.of(technologyIds), true));
+    }
+
+
+    /**
+     * 下拉框查询工序工艺信息列表
+     */
+
+    @GetMapping("getProdTechnologyInfoList")
+    public R<List<ProdTechnologyInfoVo>> getProdTechnologyInfolist(ProdTechnologyInfoBo bo) {
+        List<ProdTechnologyInfoVo> list = prodTechnologyInfoService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdTechnologyStepInfoController.java

@@ -0,0 +1,117 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdTechnologyStepInfoVo;
+import org.dromara.mes.domain.bo.ProdTechnologyStepInfoBo;
+import org.dromara.mes.service.IProdTechnologyStepInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 工艺步序信息
+ * 前端访问路由地址为:/mes/technologyStepInfo
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/technologyStepInfo")
+public class ProdTechnologyStepInfoController extends BaseController {
+
+    private final IProdTechnologyStepInfoService prodTechnologyStepInfoService;
+
+    /**
+     * 查询工艺步序信息列表
+     */
+    @SaCheckPermission("mes:technologyStepInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdTechnologyStepInfoVo> list(ProdTechnologyStepInfoBo bo, PageQuery pageQuery) {
+        return prodTechnologyStepInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工艺步序信息列表
+     */
+    @SaCheckPermission("mes:technologyStepInfo:export")
+    @Log(title = "工艺步序信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdTechnologyStepInfoBo bo, HttpServletResponse response) {
+        List<ProdTechnologyStepInfoVo> list = prodTechnologyStepInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工艺步序信息", ProdTechnologyStepInfoVo.class, response);
+    }
+
+    /**
+     * 获取工艺步序信息详细信息
+     *
+     * @param stepId 主键
+     */
+    @SaCheckPermission("mes:technologyStepInfo:query")
+    @GetMapping("/{stepId}")
+    public R<ProdTechnologyStepInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long stepId) {
+        return R.ok(prodTechnologyStepInfoService.queryById(stepId));
+    }
+
+    /**
+     * 新增工艺步序信息
+     */
+    @SaCheckPermission("mes:technologyStepInfo:add")
+    @Log(title = "工艺步序信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdTechnologyStepInfoBo bo) {
+        return toAjax(prodTechnologyStepInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工艺步序信息
+     */
+    @SaCheckPermission("mes:technologyStepInfo:edit")
+    @Log(title = "工艺步序信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdTechnologyStepInfoBo bo) {
+        return toAjax(prodTechnologyStepInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工艺步序信息
+     *
+     * @param stepIds 主键串
+     */
+    @SaCheckPermission("mes:technologyStepInfo:remove")
+    @Log(title = "工艺步序信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{stepIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] stepIds) {
+        return toAjax(prodTechnologyStepInfoService.deleteWithValidByIds(List.of(stepIds), true));
+    }
+
+
+    /**
+     * 下拉框查询工艺步序信息列表
+     */
+
+    @GetMapping("getProdTechnologyStepInfoList")
+    public R<List<ProdTechnologyStepInfoVo>> getProdTechnologyStepInfolist(ProdTechnologyStepInfoBo bo) {
+        List<ProdTechnologyStepInfoVo> list = prodTechnologyStepInfoService.queryList(bo);
+        return R.ok(list);
+    }
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseClassTeamInfo.java

@@ -72,18 +72,24 @@ public class BaseClassTeamInfo extends TenantEntity {
      * BaseShiftInfo的班次名称
      */
     @TableField(exist = false)
-    private String shiftName;
+    private String shiftName;//映射字段
 
     /**
      * ProdBaseStationInfo工位名称
      */
     @TableField(exist = false)
-    private String stationName;
+    private String stationName;//映射字段
 
 
     /**
      * ProdBaseProcessInfo工序名称
      */
     @TableField(exist = false)
-    private String processName;
+    private String processName;//映射字段
+
+    /**
+     * 班组负责人
+     */
+    @TableField(exist = false)
+    private String teamHeadName;//映射字段
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java

@@ -270,4 +270,11 @@ public class BaseMaterialInfo extends TenantEntity {
      */
     @TableField(exist = false)
     private String factoryName; //映射字段
+
+    /**
+     * 物料类型名称
+     */
+    @TableField(exist = false)
+    private String matrialTypeName;//映射字段
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java

@@ -0,0 +1,81 @@
+package org.dromara.mes.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 结构BOM信息对象 base_structure_bom
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("base_structure_bom")
+public class BaseStructureBom extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "structure_bom_id", type = IdType.AUTO)
+    private Long structureBomId;
+
+    /**
+     * 父级标识
+     */
+    private Long parentId;
+
+    /**
+     * 物料类型ID
+     */
+    private String materialTypeId;
+
+    /**
+     * 物料类型名称
+     */
+    private String materialTypeName;
+
+    /**
+     * 结构BOM说明
+     */
+    private String structureBomDesc;
+
+    /**
+     * 结构BOM版本
+     */
+    private String structureBomVersion;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 层级
+     */
+    private Long level;
+
+    /**
+     * 顶级标识(1是 0否)
+     */
+    private Long topFlag;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java

@@ -0,0 +1,76 @@
+package org.dromara.mes.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 机台信息对象 prod_base_machine_info
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prod_base_machine_info")
+public class ProdBaseMachineInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "machine_id", type = IdType.AUTO)
+    private Long machineId;
+
+    /**
+     * 机台编号
+     */
+    private String machineCode;
+
+    /**
+     * 机台名称
+     */
+    private String machineName;
+
+    /**
+     * 资产编号
+     */
+    private String assetNumber;
+
+    /**
+     * 机台位置
+     */
+    private String machineLocation;
+
+    /**
+     * 机台类型
+     */
+    private String machineType;
+
+    /**
+     * 机台规格
+     */
+    private String machineSpec;
+
+    /**
+     * 供应商
+     */
+    private String supplierId;
+
+    /**
+     * 机台状态(0停用 1启用 2报废)
+     */
+    private String machineStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.util.List;
 
 /**
  * 工序信息对象 prod_base_process_info
@@ -62,5 +63,18 @@ public class ProdBaseProcessInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 工序关联产线信息
+     */
+    @TableField(exist = false)
+    private List<ProdBaseProcessProdLine> prodBaseProcessProdlineList;//工序关联产线信息，映射字段
+
+    /** 工序关联人员信息 */
+    @TableField(exist = false)
+    private List<ProdBaseProcessUser> prodBaseProcessUserList;//工序关联人员信息，映射字段
+
+    @TableField(exist = false)
+    private String processPercentage;//映射字段
+
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessProdLine.java

@@ -0,0 +1,69 @@
+package org.dromara.mes.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 工序关联产线对象 prod_base_process_prod_line
+ *
+ * @author LionLi
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode()
+@TableName("prod_base_process_prod_line")
+public class ProdBaseProcessProdLine {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    private Long processId;
+
+    /**
+     * 所属产线ID
+     */
+    private Long prodLineId;
+
+
+
+    /*删除继承BaseEntity*/
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessUser.java

@@ -0,0 +1,73 @@
+package org.dromara.mes.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 工序关联人员对象 prod_base_process_user
+ *
+ * @author zangch
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode()
+@TableName("prod_base_process_user")
+public class ProdBaseProcessUser  {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    private Long processId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+
+    /*删除继承BaseEntity*/
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteProcess.java

@@ -48,4 +48,18 @@ public class ProdBaseRouteProcess extends BaseEntity {
     private String remark;
 
 
+
+    /**
+     * 工序名称
+     */
+    @TableField(exist = false)
+    private String processName;//映射字段
+
+    /**
+     * 工序类别（1生产工序 2质检工序）
+     */
+    @TableField(exist = false)
+    private String processType;//映射字段
+
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java

@@ -72,8 +72,14 @@ public class ProdBaseStationInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 机台ID
+     */
+    private Long machineId;
+
     @TableField(exist = false)
     private String processName;//字段映射
 
-
+    @TableField(exist = false)
+    private String machineName;//字段映射
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOrderInfo.java

@@ -165,4 +165,27 @@ public class ProdOrderInfo extends TenantEntity {
     private String remark;
 
 
+    /**
+     * 物料编码
+     */
+    @TableField(exist = false)
+    private String materialCode;//映射字段
+
+    /**
+     * 物料名称
+     */
+    @TableField(exist = false)
+    private String materialName;//映射字段
+
+    /**
+     *
+     */
+    @TableField(exist = false)
+    private String dispatchName;//映射字段
+
+    /**
+     * 工艺路线名称
+     */
+    @TableField(exist = false)
+    private String routeName;//映射字段
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java

@@ -179,5 +179,26 @@ public class ProdPlanInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 工序类别（1生产工序 2质检工序）
+     */
+    @TableField(exist = false)
+    private String processType;//映射字段
+
+    /**
+     * 工序名称
+     */
+    @TableField(exist = false)
+    private String processName;//映射字段
+
+    /**
+     * 单位生产时间(秒)
+     */
+    @TableField(exist = false)
+    private Long processProductionTime;//映射字段
+
+
+    @TableField(exist = false)
+    private String releaseName;//映射字段
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java

@@ -0,0 +1,75 @@
+package org.dromara.mes.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 工序工艺信息对象 prod_technology_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prod_technology_info")
+public class ProdTechnologyInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "technology_id", type = IdType.AUTO)
+    private Long technologyId;
+
+    /**
+     * 工序ID
+     */
+    private Long processId;
+
+    /**
+     * 物料ID
+     */
+    private Long materialId;
+
+    /**
+     * 机台类型（1类一 2类二）
+     */
+    private String machineType;
+
+    /**
+     * 工艺类型（1量产 2限产）
+     */
+    private String technologyType;
+
+    /**
+     * 工艺版本
+     */
+    private String technologyVersion;
+
+    /**
+     * 硫化标准时间（秒）
+     */
+    private Long standardTime;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(exist = false)
+    private String processName;
+
+    @TableField(exist = false)
+    private String materialName;
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java

@@ -0,0 +1,71 @@
+package org.dromara.mes.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 工艺步序信息对象 prod_technology_step_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prod_technology_step_info")
+public class ProdTechnologyStepInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @TableId(value = "step_id", type = IdType.AUTO)
+    private Long stepId;
+
+    /**
+     * 工艺ID
+     */
+    private Long technologyId;
+
+    /**
+     * 步序编号
+     */
+    private Long stepCode;
+
+    /**
+     * 步序名称
+     */
+    private String stepName;
+
+    /**
+     * 步序时间（秒）
+     */
+    private Long stepTime;
+
+    /**
+     * 步序参数
+     */
+    private String stepParameter;
+
+    /**
+     * 阀门状态
+     */
+    private String valueState;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java

@@ -30,7 +30,7 @@ public class BaseMaterialInfoBo extends BaseEntity {
     /**
      * ERP信息
      */
-    @NotBlank(message = "ERP信息不能为空", groups = { AddGroup.class, EditGroup.class })
+/*    @NotBlank(message = "ERP信息不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String erpId;
 
     /**

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseStructureBomBo.java

@@ -0,0 +1,80 @@
+package org.dromara.mes.domain.bo;
+
+import org.dromara.mes.domain.BaseStructureBom;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 结构BOM信息业务对象 base_structure_bom
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BaseStructureBom.class, reverseConvertGenerate = false)
+public class BaseStructureBomBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long structureBomId;
+
+    /**
+     * 父级标识
+     */
+    private Long parentId;
+
+    /**
+     * 物料类型ID
+     */
+    @NotBlank(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String materialTypeId;
+
+    /**
+     * 物料类型名称
+     */
+    private String materialTypeName;
+
+    /**
+     * 结构BOM说明
+     */
+    private String structureBomDesc;
+
+    /**
+     * 结构BOM版本
+     */
+    private String structureBomVersion;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 层级
+     */
+    private Long level;
+
+    /**
+     * 顶级标识(1是 0否)
+     */
+    private Long topFlag;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java

@@ -0,0 +1,80 @@
+package org.dromara.mes.domain.bo;
+
+import org.dromara.mes.domain.ProdBaseMachineInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 机台信息业务对象 prod_base_machine_info
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProdBaseMachineInfo.class, reverseConvertGenerate = false)
+public class ProdBaseMachineInfoBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long machineId;
+
+    /**
+     * 机台编号
+     */
+    @NotBlank(message = "机台编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String machineCode;
+
+    /**
+     * 机台名称
+     */
+    @NotBlank(message = "机台名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String machineName;
+
+    /**
+     * 资产编号
+     */
+    private String assetNumber;
+
+    /**
+     * 机台位置
+     */
+    private String machineLocation;
+
+    /**
+     * 机台类型
+     */
+    private String machineType;
+
+    /**
+     * 机台规格
+     */
+    private String machineSpec;
+
+    /**
+     * 供应商
+     */
+    private String supplierId;
+
+    /**
+     * 机台状态(0停用 1启用 2报废)
+     */
+    private String machineStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 工序
+     */
+    private Long processId;
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessInfoBo.java

@@ -1,5 +1,6 @@
 package org.dromara.mes.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.mes.domain.ProdBaseProcessInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -8,6 +9,10 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+import org.dromara.mes.domain.ProdBaseProcessProdLine;
+import org.dromara.mes.domain.ProdBaseProcessUser;
+
+import java.util.List;
 
 /**
  * 工序信息业务对象 prod_base_process_info
@@ -65,4 +70,14 @@ public class ProdBaseProcessInfoBo extends BaseEntity {
     private String remark;
 
 
+    /**
+     * 工序关联产线信息
+     */
+    private List<ProdBaseProcessProdLineBo> prodBaseProcessProdlineBoList;//工序关联产线信息，映射字段
+
+    /** 工序关联人员信息 */
+    private List<ProdBaseProcessUserBo> prodBaseProcessUserBoList;//工序关联人员信息，映射字段
+
+    private String processPercentageBo;//映射字段
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessProdLineBo.java

@@ -0,0 +1,83 @@
+package org.dromara.mes.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.dromara.mes.domain.ProdBaseProcessProdLine;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 工序关联产线业务对象 prod_base_process_prod_line
+ *
+ * @author LionLi
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode()
+@AutoMapper(target = ProdBaseProcessProdLine.class, reverseConvertGenerate = false)
+public class ProdBaseProcessProdLineBo  {
+
+    /**
+     * 工序ID
+     */
+    @NotNull(message = "工序ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long processId;
+
+    /**
+     * 所属产线ID
+     */
+    @NotNull(message = "所属产线ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long prodLineId;
+
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
+     * 租户编号
+     */
+    @TableField(exist = false)
+    private String tenantId;
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessUserBo.java

@@ -0,0 +1,81 @@
+package org.dromara.mes.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.dromara.mes.domain.ProdBaseProcessUser;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 工序关联人员业务对象 prod_base_process_user
+ *
+ * @author zangch
+ * @date 2025-01-09
+ */
+@Data
+@EqualsAndHashCode()
+@AutoMapper(target = ProdBaseProcessUser.class, reverseConvertGenerate = false)
+public class ProdBaseProcessUserBo  {
+
+    /**
+     * 工序ID
+     */
+    @NotNull(message = "工序ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long processId;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseStationInfoBo.java

@@ -74,5 +74,5 @@ public class ProdBaseStationInfoBo extends BaseEntity {
      */
     private String remark;
 
-
+    private Long machineId;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdOrderInfoBo.java

@@ -32,7 +32,6 @@ public class ProdOrderInfoBo extends BaseEntity {
     /**
      * 订单编号
      */
-    @NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
     private String orderCode;
 
     /**

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java

@@ -45,7 +45,7 @@ public class ProdPlanInfoBo extends BaseEntity {
     /**
      * 工单编号
      */
-    @NotBlank(message = "工单编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "工单编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String planCode;
 
     /**
@@ -56,13 +56,13 @@ public class ProdPlanInfoBo extends BaseEntity {
     /**
      * 物料ID;成品ID
      */
-    @NotNull(message = "物料ID;成品ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "物料不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialId;
 
     /**
      * 物料BOM_ID
      */
-    @NotNull(message = "物料BOM_ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "物料BOM不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialBomId;
 
     /**
@@ -109,7 +109,7 @@ public class ProdPlanInfoBo extends BaseEntity {
     /**
      * 派工数量
      */
-    @NotNull(message = "派工数量不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "派工数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dispatchAmount;
 
     /**
@@ -182,5 +182,7 @@ public class ProdPlanInfoBo extends BaseEntity {
      */
     private String remark;
 
+    private Long workshopId;
+
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java

@@ -0,0 +1,75 @@
+package org.dromara.mes.domain.bo;
+
+import org.dromara.mes.domain.ProdTechnologyInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.mes.domain.ProdTechnologyStepInfo;
+
+import java.util.List;
+
+/**
+ * 工序工艺信息业务对象 prod_technology_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProdTechnologyInfo.class, reverseConvertGenerate = false)
+public class ProdTechnologyInfoBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long technologyId;
+
+    /**
+     * 工序ID
+     */
+    @NotNull(message = "工序ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long processId;
+
+    /**
+     * 物料ID
+     */
+    @NotNull(message = "物料ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long materialId;
+
+    /**
+     * 机台类型（1类一 2类二）
+     */
+    private String machineType;
+
+    /**
+     * 工艺类型（1量产 2限产）
+     */
+    private String technologyType;
+
+    /**
+     * 工艺版本
+     */
+    private String technologyVersion;
+
+    /**
+     * 硫化标准时间（秒）
+     */
+    private Long standardTime;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<ProdTechnologyStepInfo> prodTechnologyStepInfoList;
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java

@@ -0,0 +1,72 @@
+package org.dromara.mes.domain.bo;
+
+import org.dromara.mes.domain.ProdTechnologyStepInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 工艺步序信息业务对象 prod_technology_step_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProdTechnologyStepInfo.class, reverseConvertGenerate = false)
+public class ProdTechnologyStepInfoBo extends BaseEntity {
+
+    /**
+     * 主键标识
+     */
+    private Long stepId;
+
+    /**
+     * 工艺ID
+     */
+    @NotNull(message = "工艺ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long technologyId;
+
+    /**
+     * 步序编号
+     */
+    @NotNull(message = "步序编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long stepCode;
+
+    /**
+     * 步序名称
+     */
+    @NotBlank(message = "步序名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String stepName;
+
+    /**
+     * 步序时间（秒）
+     */
+    private Long stepTime;
+
+    /**
+     * 步序参数
+     */
+    private String stepParameter;
+
+    /**
+     * 阀门状态
+     */
+    private String valueState;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseClassTeamInfoVo.java

@@ -116,23 +116,29 @@ public class BaseClassTeamInfoVo implements Serializable {
      * 更新时间
      */
     @ExcelProperty(value = "更新时间")
-    private Date updateTime;
+    private Date updateTime;//映射字段
 
     /**
      * 班次名称
      */
     @ExcelProperty(value = "班次名称")
-    private String shiftName;
+    private String shiftName;//映射字段
 
     /**
      * 工位名称
      */
     @ExcelProperty(value = "工位名称")
-    private String stationName;
+    private String stationName;//映射字段
 
     /**
      * 工序名称
      */
     @ExcelProperty(value = "工序名称")
-    private String processName;
+    private String processName;//映射字段
+
+    /**
+     * 班组负责人名称
+     */
+    @ExcelProperty(value = "班组负责人名称")
+    private String teamHeadName;//映射字段
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java

@@ -373,6 +373,12 @@ public class BaseMaterialInfoVo implements Serializable {
      * 所属工厂
      */
     @ExcelProperty(value = "所属工厂")
-    private String factoryName;
+    private String factoryName;//映射字段
+
+    /**
+     * 物料类型名称
+     */
+    @ExcelProperty(value = "物料类型名称")
+    private String matrialTypeName;//映射字段
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java

@@ -131,7 +131,7 @@ public class BaseMaterialTypeVo implements Serializable {
      * 工序名称
      */
     @ExcelProperty(value = "工序名称")
-    private String processName;
+    private String processName;//工序名称
 
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseStructureBomVo.java

@@ -0,0 +1,136 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.BaseStructureBom;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 结构BOM信息视图对象 base_structure_bom
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = BaseStructureBom.class)
+public class BaseStructureBomVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long structureBomId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 父级标识
+     */
+    @ExcelProperty(value = "父级标识")
+    private Long parentId;
+
+    /**
+     * 物料类型ID
+     */
+    @ExcelProperty(value = "物料类型ID")
+    private String materialTypeId;
+
+    /**
+     * 物料类型名称
+     */
+    @ExcelProperty(value = "物料类型名称")
+    private String materialTypeName;
+
+    /**
+     * 结构BOM说明
+     */
+    @ExcelProperty(value = "结构BOM说明")
+    private String structureBomDesc;
+
+    /**
+     * 结构BOM版本
+     */
+    @ExcelProperty(value = "结构BOM版本")
+    private String structureBomVersion;
+
+    /**
+     * 祖级列表
+     */
+    @ExcelProperty(value = "祖级列表")
+    private String ancestors;
+
+    /**
+     * 层级
+     */
+    @ExcelProperty(value = "层级")
+    private Long level;
+
+    /**
+     * 顶级标识(1是 0否)
+     */
+    @ExcelProperty(value = "顶级标识(1是 0否)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "top_flag")
+    private Long topFlag;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "active_flag")
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/MesProductPlanEditVo.java

@@ -0,0 +1,25 @@
+package org.dromara.mes.domain.vo;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.mes.domain.ProdPlanInfo;
+import org.dromara.mes.domain.bo.ProdPlanInfoBo;
+
+import java.util.List;
+
+@Data
+public class MesProductPlanEditVo {
+    //生产工单ID
+    @NotBlank(message = "生产工单Id必须输入")
+    private Long productOrderId;
+
+    //此次生产派工数量
+    private Long dispatchAmount;
+
+    //保存的生产计划
+    @NotBlank(message = "没有修改的生产派工提交")
+    private List<ProdPlanInfoBo> mesProductPlanList;
+
+    //待删除的生产计划ID
+    private Long[] toDeletedPlanIds;
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java

@@ -0,0 +1,129 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdBaseMachineInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 机台信息视图对象 prod_base_machine_info
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdBaseMachineInfo.class)
+public class ProdBaseMachineInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long machineId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 机台编号
+     */
+    @ExcelProperty(value = "机台编号")
+    private String machineCode;
+
+    /**
+     * 机台名称
+     */
+    @ExcelProperty(value = "机台名称")
+    private String machineName;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty(value = "资产编号")
+    private String assetNumber;
+
+    /**
+     * 机台位置
+     */
+    @ExcelProperty(value = "机台位置")
+    private String machineLocation;
+
+    /**
+     * 机台类型
+     */
+    @ExcelProperty(value = "机台类型")
+    private String machineType;
+
+    /**
+     * 机台规格
+     */
+    @ExcelProperty(value = "机台规格")
+    private String machineSpec;
+
+    /**
+     * 供应商
+     */
+    @ExcelProperty(value = "供应商")
+    private String supplierId;
+
+    /**
+     * 机台状态(0停用 1启用 2报废)
+     */
+    @ExcelProperty(value = "机台状态(0停用 1启用 2报废)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "machine_status")
+    private String machineStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java

@@ -1,5 +1,7 @@
 package org.dromara.mes.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.mes.domain.ProdBaseProcessInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -7,11 +9,13 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.mes.domain.ProdBaseProcessProdLine;
+import org.dromara.mes.domain.ProdBaseProcessUser;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -115,5 +119,17 @@ public class ProdBaseProcessInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    /**
+     * 工序关联产线信息
+     */
+    @ExcelIgnore
+    private List<ProdBaseProcessProdLineVo> prodBaseProcessProdlineVoList;//工序关联产线信息，映射字段
+
+    /** 工序关联人员信息 */
+    @ExcelIgnore
+    private List<ProdBaseProcessUserVo> prodBaseProcessUserVoList;//工序关联人员信息，映射字段
+
+    @ExcelIgnore
+    private String processPercentageVo;//映射字段
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessProdLineVo.java

@@ -0,0 +1,62 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdBaseProcessProdLine;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 工序关联产线视图对象 prod_base_process_prod_line
+ *
+ * @author LionLi
+ * @date 2025-01-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdBaseProcessProdLine.class)
+public class ProdBaseProcessProdLineVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    @ExcelProperty(value = "工序ID")
+    private Long processId;
+
+    /**
+     * 所属产线ID
+     */
+    @ExcelProperty(value = "所属产线ID")
+    private Long prodLineId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessUserVo.java

@@ -0,0 +1,68 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdBaseProcessUser;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 工序关联人员视图对象 prod_base_process_user
+ *
+ * @author zangch
+ * @date 2025-01-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdBaseProcessUser.class)
+public class ProdBaseProcessUserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工序ID
+     */
+    @ExcelProperty(value = "工序ID")
+    private Long processId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 用户名称
+     */
+    @ExcelProperty(value = "用户名称")
+    private String userName;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java

@@ -59,4 +59,19 @@ public class ProdBaseRouteProcessVo implements Serializable {
     private String remark;
 
 
+
+
+    /**
+     * 工序名称
+     */
+    @ExcelProperty(value = "工序名称")
+    private String processName;
+
+    /**
+     * 工序类别（1生产工序 2质检工序）
+     */
+    @ExcelProperty(value = "工序类别", converter = ExcelDictConvert.class)
+    private String processType;
+
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java

@@ -1,5 +1,6 @@
 package org.dromara.mes.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import org.dromara.mes.domain.ProdBaseRoute;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -95,6 +96,10 @@ public class ProdBaseRouteVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    /**
+     * 工艺路线
+     */
+    @ExcelIgnore
     private List<ProdBaseRouteProcessVo> routeProcessVoList;
 
 

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseStationInfoVo.java

@@ -131,5 +131,11 @@ public class ProdBaseStationInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    private Long machineId;
 
+    /**
+     * 机台名称
+     */
+    @ExcelProperty(value = "机台名称")
+    private String machineName;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOrderInfoVo.java

@@ -36,6 +36,13 @@ public class ProdOrderInfoVo implements Serializable {
     @ExcelProperty(value = "主键标识")
     private Long productOrderId;
 
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+
     /**
      * 订单编号
      */
@@ -205,5 +212,55 @@ public class ProdOrderInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 物料名称
+     */
+    @ExcelProperty(value = "物料名称")
+    private String materialName;//映射字段
+
+    /**
+     * 物料编码
+     */
+    @ExcelProperty(value = "物料编码")
+    private String materialCode;//映射字段
+
+
+    /**
+     * 工艺路线名称
+     */
+    @ExcelProperty(value = "工艺路线名称")
+    private String dispatchName;//映射字段
+
+
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java

@@ -1,6 +1,8 @@
 package org.dromara.mes.domain.vo;
 
 import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.mes.domain.ProdPlanInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -222,5 +224,21 @@ public class ProdPlanInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String materialCode;
+    private String materialName;
+    private String processName;
+    private String shiftName;
+    private String teamName;
+    private String materialBomName;
+    private String releaseName;
+
+    /**
+     * 工序类别（1生产工序 2质检工序）
+     */
+    @ExcelIgnore
+    private String processType;
+
+    @ExcelIgnore
+    private Long processProductionTime;
 
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java

@@ -0,0 +1,96 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdTechnologyInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mes.domain.ProdTechnologyStepInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 工序工艺信息视图对象 prod_technology_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdTechnologyInfo.class)
+public class ProdTechnologyInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long technologyId;
+
+    /**
+     * 工序ID
+     */
+    @ExcelProperty(value = "工序ID")
+    private Long processId;
+
+    /**
+     * 物料ID
+     */
+    @ExcelProperty(value = "物料ID")
+    private Long materialId;
+
+    /**
+     * 机台类型（1类一 2类二）
+     */
+    @ExcelProperty(value = "机台类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_machine_type")
+    private String machineType;
+
+    /**
+     * 工艺类型（1量产 2限产）
+     */
+    @ExcelProperty(value = "工艺类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_technology_type")
+    private String technologyType;
+
+    /**
+     * 工艺版本
+     */
+    @ExcelProperty(value = "工艺版本")
+    private String technologyVersion;
+
+    /**
+     * 硫化标准时间（秒）
+     */
+    @ExcelProperty(value = "硫化标准时间", converter = ExcelDictConvert.class)
+    private Long standardTime;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "active_flag")
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    @ExcelProperty(value = "工序名称")
+    private String processName;
+
+    @ExcelProperty(value = "物料名称")
+    private String materialName;
+
+    private List<ProdTechnologyStepInfo> prodTechnologyStepInfoList;
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java

@@ -0,0 +1,87 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdTechnologyStepInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 工艺步序信息视图对象 prod_technology_step_info
+ *
+ * @author Yinq
+ * @date 2025-01-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdTechnologyStepInfo.class)
+public class ProdTechnologyStepInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    @ExcelProperty(value = "主键标识")
+    private Long stepId;
+
+    /**
+     * 工艺ID
+     */
+    @ExcelProperty(value = "工艺ID")
+    private Long technologyId;
+
+    /**
+     * 步序编号
+     */
+    @ExcelProperty(value = "步序编号")
+    private Long stepCode;
+
+    /**
+     * 步序名称
+     */
+    @ExcelProperty(value = "步序名称")
+    private String stepName;
+
+    /**
+     * 步序时间（秒）
+     */
+    @ExcelProperty(value = "步序时间", converter = ExcelDictConvert.class)
+    private Long stepTime;
+
+    /**
+     * 步序参数
+     */
+    @ExcelProperty(value = "步序参数")
+    private String stepParameter;
+
+    /**
+     * 阀门状态
+     */
+    @ExcelProperty(value = "阀门状态")
+    private String valueState;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "active_flag")
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/dubbo/RemoteMaterialInfoServiceImpl.java

@@ -0,0 +1,49 @@
+package org.dromara.mes.dubbo;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.mes.api.RemoteMaterialInfoService;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
+import org.dromara.mes.domain.BaseMaterialInfo;
+import org.dromara.mes.mapper.BaseMaterialInfoMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 物料接口实现类
+ *
+ * @author Yinq
+ */
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteMaterialInfoServiceImpl implements RemoteMaterialInfoService {
+
+    private final BaseMaterialInfoMapper materialInfoMapper;
+
+    /**
+     * 批量新增物料信息接口
+     * @param bos
+     * @return true成功，false失败
+     */
+    @Override
+    public Boolean remoteInsertBaseMaterialInfo(List<BaseMaterialInfoBo> bos) {
+        List<BaseMaterialInfo> list = new ArrayList<>();
+        for (BaseMaterialInfoBo bo : bos) {
+            //校验物料是否已存在，若存在则更新数据
+            BaseMaterialInfo add = MapstructUtils.convert(bo, BaseMaterialInfo.class);
+            list.add(add);
+        }
+        if (list.size() == 0){
+            return false;
+        }
+        return materialInfoMapper.insertBatch(list);
+    }
+
+
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseStructureBomMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mes.mapper;
+
+import org.dromara.mes.domain.BaseStructureBom;
+import org.dromara.mes.domain.vo.BaseStructureBomVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 结构BOM信息Mapper接口
+ *
+ * @author zangch
+ * @date 2025-01-20
+ */
+public interface BaseStructureBomMapper extends BaseMapperPlus<BaseStructureBom, BaseStructureBomVo> {
+
+}