Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-23 50ecf03ea7c6185123e36d02a106b447d48a3509

Merge remote-tracking branch 'origin/master'

 db/Êý¾Ý¿â²úÆ·»¯Éè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-5-20 16:52:50",
  "updatedTime": "2025-5-22 15:02:23",
  "dbConns": [],
  "profile": {
    "default": {
@@ -15013,6 +15013,24 @@
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "00B8A82A-3C40-4DA3-927F-D5F8460E2A72"
        },
        {
          "defKey": "spare_part_into_type",
          "defName": "备件出入库类型",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "7EB4AF36-3551-4569-A5F7-F7D65AE872A6"
        }
      ],
      "correlations": [],
@@ -16730,8 +16748,8 @@
          "id": "0B8261B7-C8DA-4A5E-910D-9F86FFE80053"
        },
        {
          "defKey": "inventory_id",
          "defName": "库存ID",
          "defKey": "spare_parts_id",
          "defName": "备件ID",
          "comment": "",
          "type": "",
          "len": "",

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

@@ -21,6 +21,8 @@
    String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
    //设备借出归还
    String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
    //设备封存启封
    String SEAL_UP_CODE_RULE = "EquipmentSealUpCodeRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentSealUpStatusEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.eam.constant;

/**
 * @author cuikaidong
 * @date 2025/5/22
 */
public enum EquipmentSealUpStatusEnum {
    WAIT_SUBMIT, //待提交
    WAIT_CHECK, //待审核
    SEALED, //已封存
    COMPLETE, //已完成
    ;

    public static EquipmentSealUpStatusEnum getInstance(String code) {
        EquipmentSealUpStatusEnum[] values = EquipmentSealUpStatusEnum.values();
        for (EquipmentSealUpStatusEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java

@@ -1,167 +1,193 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

 /**
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: è®¾å¤‡å°å­˜å¯å°
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date: 2025-05-13
 * @Version: V1.0
 */
@Slf4j
@Api(tags="设备封存启封")
@Api(tags = "设备封存启封")
@RestController
@RequestMapping("/eam/eamEquipmentSealUp")
public class EamEquipmentSealUpController extends JeecgController<EamEquipmentSealUp, IEamEquipmentSealUpService> {
    @Autowired
    private IEamEquipmentSealUpService eamEquipmentSealUpService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamEquipmentSealUp
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备封存启封-分页列表查询")
    @ApiOperation(value="设备封存启封-分页列表查询", notes="设备封存启封-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamEquipmentSealUp eamEquipmentSealUp,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamEquipmentSealUp> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentSealUp, req.getParameterMap());
        Page<EamEquipmentSealUp> page = new Page<EamEquipmentSealUp>(pageNo, pageSize);
        IPage<EamEquipmentSealUp> pageList = eamEquipmentSealUpService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * æ·»åŠ 
     *
     * @param eamEquipmentSealUp
     * @return
     */
    @AutoLog(value = "设备封存启封-添加")
    @ApiOperation(value="设备封存启封-添加", notes="设备封存启封-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentSealUp eamEquipmentSealUp) {
        eamEquipmentSealUpService.save(eamEquipmentSealUp);
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param eamEquipmentSealUp
     * @return
     */
    @AutoLog(value = "设备封存启封-编辑")
    @ApiOperation(value="设备封存启封-编辑", notes="设备封存启封-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentSealUp eamEquipmentSealUp) {
        eamEquipmentSealUpService.updateById(eamEquipmentSealUp);
        return Result.OK("编辑成功!");
    }
	
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-通过id删除")
    @ApiOperation(value="设备封存启封-通过id删除", notes="设备封存启封-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        eamEquipmentSealUpService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "设备封存启封-批量删除")
    @ApiOperation(value="设备封存启封-批量删除", notes="设备封存启封-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamEquipmentSealUpService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-通过id查询")
    @ApiOperation(value="设备封存启封-通过id查询", notes="设备封存启封-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamEquipmentSealUp eamEquipmentSealUp = eamEquipmentSealUpService.getById(id);
        return Result.OK(eamEquipmentSealUp);
    }
    @Autowired
    private IEamEquipmentSealUpService eamEquipmentSealUpService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

  /**
   * å¯¼å‡ºexcel
   *
   * @param request
   * @param eamEquipmentSealUp
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, EamEquipmentSealUp eamEquipmentSealUp) {
      return super.exportXls(request, eamEquipmentSealUp, EamEquipmentSealUp.class, "设备封存启封");
  }
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备封存启封-分页列表查询")
    @ApiOperation(value = "设备封存启封-分页列表查询", notes = "设备封存启封-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamEquipmentSealUpQuery query,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        Page<EamEquipmentSealUp> page = new Page<EamEquipmentSealUp>(pageNo, pageSize);
        IPage<EamEquipmentSealUp> pageList = eamEquipmentSealUpService.queryPageList(page, query);
        return Result.OK(pageList);
    }

  /**
   * é€šè¿‡excel导入数据
   *
   * @param request
   * @param response
   * @return
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      return super.importExcel(request, response, EamEquipmentSealUp.class);
  }
    /**
     * æ·»åŠ 
     *
     * @param request
     * @return
     */
    @AutoLog(value = "设备封存启封-添加")
    @ApiOperation(value = "设备封存启封-添加", notes = "设备封存启封-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipmentSealUp request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        request.setCode(businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SEAL_UP_CODE_RULE));
        request.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        boolean b = eamEquipmentSealUpService.addSealUp(request);
        if (!b) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param request
     * @return
     */
    @AutoLog(value = "设备封存启封-编辑")
    @ApiOperation(value = "设备封存启封-编辑", notes = "设备封存启封-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentSealUp request) {
        if (request == null) {
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamEquipmentSealUpService.editSealUp(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-通过id删除")
    @ApiOperation(value = "设备封存启封-通过id删除", notes = "设备封存启封-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        EamEquipmentSealUp entity = eamEquipmentSealUpService.getById(id);
        if (entity != null) {
            entity.setDelFlag(CommonConstant.DEL_FLAG_1);
            eamEquipmentSealUpService.updateById(entity);
        }
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "设备封存启封-批量删除")
    @ApiOperation(value = "设备封存启封-批量删除", notes = "设备封存启封-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));
        list.forEach(id -> {
            EamEquipmentSealUp entity = eamEquipmentSealUpService.getById(id);
            if (entity != null) {
                entity.setDelFlag(CommonConstant.DEL_FLAG_1);
                eamEquipmentSealUpService.updateById(entity);
            }
        });
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-通过id查询")
    @ApiOperation(value = "设备封存启封-通过id查询", notes = "设备封存启封-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamEquipmentSealUp eamEquipmentSealUp = eamEquipmentSealUpService.getById(id);
        if (eamEquipmentSealUp == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamEquipmentSealUp);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("reportUser", eamEquipmentSealUp.getReportUser(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

    /**
     * æäº¤
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-提交")
    @ApiOperation(value = "设备封存启封-提交", notes = "设备封存启封-提交")
    @GetMapping(value = "/submit")
    public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamEquipmentSealUpService.submit(id);
        if (!b) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -67,7 +68,10 @@
    @ApiOperation(value = "备件库存信息-添加", notes = "备件库存信息-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamSparePartInventory eamSparePartInventory) {
        eamSparePartInventoryService.save(eamSparePartInventory);
        List<EamSparePartInventory> eamSparePartInventories = eamSparePartInventory.getEamSparePartInventories();
        for (EamSparePartInventory sparePartInventory : eamSparePartInventories) {
            eamSparePartInventoryService.save(sparePartInventory);
        }
        return Result.OK("添加成功！");
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java

@@ -8,7 +8,9 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.eam.entity.EamSparePartInventory;
import org.jeecg.modules.eam.entity.EamSpareParts;
import org.jeecg.modules.eam.service.IEamSparePartInventoryService;
import org.jeecg.modules.eam.service.IEamSparePartsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,6 +39,9 @@
    @Resource
    private IEamSparePartsService eamSparePartsService;

    @Autowired
    private IEamSparePartInventoryService eamSparePartInventoryService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -55,6 +60,12 @@
        QueryWrapper<EamSpareParts> queryWrapper = QueryGenerator.initQueryWrapper(eamSpareParts, req.getParameterMap());
        Page<EamSpareParts> page = new Page<EamSpareParts>(pageNo, pageSize);
        IPage<EamSpareParts> pageList = eamSparePartsService.page(page, queryWrapper);
        for (EamSpareParts record : pageList.getRecords()) {
            QueryWrapper<EamSparePartInventory> wrapper = new QueryWrapper<>();
            wrapper.eq("spare_part_id",record.getId()).select("sum(inventory) as inventory");
            EamSparePartInventory one = eamSparePartInventoryService.getOne(wrapper);
            record.setTotalQuantity(one.getInventory().toString());
        }
        return Result.OK(pageList);
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java

@@ -1,14 +1,18 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
@@ -58,12 +62,17 @@
    /**申请人*/
    @Excel(name = "申请人", width = 15)
    @ApiModelProperty(value = "申请人")
    @Dict(dicCode = "sys_user, realname, username")
    private String reportUser;
    /**封存开始时间*/
    @ApiModelProperty(value = "封存开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealStartTime;
    /**封存结束时间*/
    @ApiModelProperty(value = "封存结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealEndTime;
    /**封存原因*/
    @Excel(name = "封存原因", width = 15)
@@ -72,6 +81,7 @@
    /**封存状态*/
    @Excel(name = "封存状态", width = 15)
    @ApiModelProperty(value = "封存状态")
    @Dict(dicCode = "equipment_seal_up_status")
    private String sealStatus;
    /**审核人*/
    @Excel(name = "审核人", width = 15)
@@ -79,9 +89,18 @@
    private String approvalUser;
    /**审核时间*/
    @ApiModelProperty(value = "审核时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java

@@ -1,17 +1,20 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @Description: å¤‡ä»¶åº“存信息
@@ -34,6 +37,14 @@
    @Excel(name = "备品备件ID", width = 15)
    @ApiModelProperty(value = "备品备件ID")
    private String sparePartId;

    /**
     * æ¥æºç±»åž‹
     */
    @Excel(name = "备件来源类型", width = 15)
    @ApiModelProperty(value = "备件来源类型")
    @Dict(dicCode = "spare_part_into_type")
    private String sparePartIntoType;
    /**
     * æ‰¹æ¬¡å·
     */
@@ -68,4 +79,7 @@
    @Excel(name = "存放位置", width = 15)
    @ApiModelProperty(value = "存放位置")
    private String location;

    @TableField(exist = false)
    private List<EamSparePartInventory> eamSparePartInventories;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java

@@ -1,11 +1,16 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

@@ -31,8 +36,10 @@
     * åˆ é™¤æ ‡è®°
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    @JsonIgnore
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)", hidden = true)
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**
     * å¤‡ä»¶ç¼–码
     */
@@ -50,6 +57,7 @@
     */
    @Excel(name = "备件分类", width = 15)
    @ApiModelProperty(value = "备件分类")
    @Dict(dicCode = "spare_part_category")
    private String partCategory;
    /**
     * å¤‡ä»¶åž‹å·
@@ -111,4 +119,10 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * åº“存总数量
     */
    @TableField(exist = false)
    private String totalQuantity;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java

@@ -2,7 +2,12 @@

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -13,5 +18,12 @@
 * @Version: V1.0
 */
public interface EamEquipmentSealUpMapper extends BaseMapper<EamEquipmentSealUp> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentSealUp> queryWrapper);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml

@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentSealUp">
        select wmo.*, e.equipment_code, e.equipment_name
        from eam_equipment_seal_up wmo
                 inner join eam_equipment e
                            on wmo.equipment_id = e.id
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.eam.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@Data
public class EamEquipmentSealUpQuery {
    private String code;
    private String equipmentId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date leanDateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date leanDateEnd;
    private String sealStatus;

    private String column;
    private String order;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package org.jeecg.modules.eam.request;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: è®¾å¤‡å°å­˜å¯å°
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class EamEquipmentSealUpRequest extends FlowTaskVo implements Serializable {
    
    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    /**设备ID*/
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**单据号*/
    @ApiModelProperty(value = "单据号")
    private String code;
    /**申请人*/
    @ApiModelProperty(value = "申请人")
    private String reportUser;
    /**封存开始时间*/
    @ApiModelProperty(value = "封存开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealStartTime;
    /**封存结束时间*/
    @ApiModelProperty(value = "封存结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sealEndTime;
    /**封存原因*/
    @ApiModelProperty(value = "封存原因")
    private String sealUpReason;
    /**封存状态*/
    @ApiModelProperty(value = "封存状态")
    @Dict(dicCode = "equipment_seal_up_status")
    private String sealStatus;
    /**审核人*/
    @ApiModelProperty(value = "审核人")
    private String approvalUser;
    /**审核时间*/
    @ApiModelProperty(value = "审核时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;
    /**备注*/
    @ApiModelProperty(value = "备注")
    private String remark;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java

@@ -1,14 +1,58 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;

/**
 * @Description: è®¾å¤‡å°å­˜å¯å°
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date: 2025-05-13
 * @Version: V1.0
 */
public interface IEamEquipmentSealUpService extends IService<EamEquipmentSealUp> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param query
     * @return
     */
    IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, EamEquipmentSealUpQuery query);

    /**
     * æ·»åŠ å°å­˜è®°å½•
     *
     * @param request
     * @return
     */
    boolean addSealUp(EamEquipmentSealUp request);

    /**
     * ç¼–辑
     *
     * @param request
     * @return
     */
    boolean editSealUp(EamEquipmentSealUp request);

    /**
     * æäº¤ç”³è¯·
     *
     * @param id
     * @return
     */
    boolean submit(String id);

    /**
     * å®¡æ‰¹æµç¨‹æŽ§åˆ¶
     *
     * @param request
     * @return
     */
    EamEquipmentSealUp approval(EamEquipmentSealUpRequest request);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java

@@ -1,19 +1,261 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: è®¾å¤‡å°å­˜å¯å°
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Date: 2025-05-13
 * @Version: V1.0
 */
@Service
public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService {
@Service("IEamEquipmentSealUpService")
public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService, FlowCallBackServiceI {

    @Resource
    private EamEquipmentSealUpMapper equipmentSealUpMapper;
    @Autowired
    private IEamEquipmentService eamEquipmentService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private IFlowTaskService flowTaskService;

    @Autowired
    private ISysUserService sysUserService;


    @Override
    public IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, EamEquipmentSealUpQuery query) {
        QueryWrapper<EamEquipmentSealUp> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return page;
        }
        if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
            //选择了设备，根据设备id过滤设备
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
        }
        //控制待提交状态的数据只能本人查看
        queryWrapper.and(i -> i.ne("wmo.seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername()));
        //查询条件过滤
        if (query != null) {
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
                queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
            }
            if (StringUtils.isNotBlank(query.getCode())) {
                queryWrapper.like("wmo.code", query.getCode());
            }
            if (StringUtils.isNotBlank(query.getSealStatus())) {
                queryWrapper.eq("wmo.seal_status", query.getSealStatus());
            }
            if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
                queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
                String column = query.getColumn();
                if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
                    column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
                }
                if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
                    queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
                } else {
                    queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
                }
            } else {
                queryWrapper.orderByDesc("wmo.create_time");
            }
        } else {
            queryWrapper.orderByDesc("wmo.create_time");
        }

        return equipmentSealUpMapper.queryPageList(page, queryWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addSealUp(EamEquipmentSealUp request) {
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许借出！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
        }
        request.setReportUser(sysUser.getUsername());
        return equipmentSealUpMapper.insert(request) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editSealUp(EamEquipmentSealUp request) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
        if (entity == null) {
            throw new JeecgBootException("要编辑的数据不存在，请刷新重试！");
        }
        if (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑借用记录！");
        }
        UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("equipment_id", request.getEquipmentId());
        updateWrapper.set("remark", request.getRemark());
        updateWrapper.set("seal_up_reason", request.getSealUpReason());
        updateWrapper.eq("id", request.getId());
        updateWrapper.eq("report_user", sysUser.getUsername());
        return super.update(updateWrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(String id) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑封存记录！");
        }
        UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
        updateWrapper.eq("id", id);
        updateWrapper.eq("report_user", sysUser.getUsername());
        boolean success = super.update(updateWrapper);
        if (success) {
            equipment.setAssetStatus(AssetStatusEnum.SEAL_UP.name()); // è®¾å¤‡å°å­˜
            eamEquipmentService.updateById(equipment);
        }
        //启动审批流程
        flowCommonService.initActBusiness("工单号:" + entity.getCode() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备封存",
                entity.getId(), "IEamEquipmentSealUpService", "equipment_seal_up", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getSealUpReason())) {
            variables.put("organization", "新增封存默认启动流程");
            variables.put("comment", "新增封存工单默认启动流程");
        } else {
            variables.put("organization", entity.getSealUpReason());
            variables.put("comment", entity.getSealUpReason());
        }
        variables.put("proofreading", true);
        // åˆ†é…ç»™è®¾å¤‡ç®¡ç†å‘˜
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给设备管理员，无法进入下级审批！");
        }
        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_seal_up", variables);
        if (result != null) {
            entity.setSealStartTime(new Date());
            entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_CHECK.name());
            //保存工单
            equipmentSealUpMapper.updateById(entity);
            return result.isSuccess();
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
        return null;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java

@@ -1,5 +1,9 @@
package org.jeecg.modules.tms.controller;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +11,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
@@ -56,6 +62,13 @@
    @Autowired
    private IOutboundDetailService outboundDetailService;

    @Autowired
    private ObjectMapper objectMapper;

    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;



    /*---------------------------------主表处理-begin-------------------------------------*/

@@ -79,6 +92,28 @@
        Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
        IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }

    @ApiOperation(value="tms_outbound_order-通过id查询", notes="tms_outbound_order-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam("id") String id) {
        OutboundOrder outboundOrder = outboundOrderService.getById(id);
        if (outboundOrder == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String jsonStr = objectMapper.writeValueAsString(outboundOrder);
            JSONObject item = JSONObject.parseObject(jsonStr, Feature.OrderedField);
            translateDictTextUtils.translateField("outStorehouseType", outboundOrder.getOutStorehouseType(), item, "out_storehouse_type");
            translateDictTextUtils.translateField("handler", outboundOrder.getHandler(), item, "sys_user,realname,id");
            translateDictTextUtils.translateField("orderStatus", outboundOrder.getOrderStatus(), item, "out_bill_status");
            translateDictTextUtils.translateField("outStatus", outboundOrder.getOutStatus(), item, "out_storehouse_status");
            translateDictTextUtils.translateField("createBy", outboundOrder.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("updateBy", outboundOrder.getUpdateBy(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

    /**
@@ -130,14 +165,18 @@
    @ApiOperation(value="tms_outbound_order-提交出库申请单", notes="tms_outbound_order-提交出库申请单")
    @GetMapping(value = "/submit")
    public Result<String> submit(@RequestParam(name="id") String id) {
        OutboundOrder order = new OutboundOrder();
        order.setId(id);
        order.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
        outboundOrderService.updateById(order);
        //开启流程
        outboundOrderService.submit(id);
        return Result.OK("提交成功!");
    }

     @AutoLog(value = "审批流程")
     @ApiOperation(value = "出库申请单-审批流程", notes = "出库申请单-审批流程")
     @PostMapping("/approval")
     public Result<?> approval(@RequestBody OutBoundOrderFlowDto outBoundOrderFlowDto) {
        outboundOrderService.approvalProcess(outBoundOrderFlowDto);
        return Result.OK("操作成功");
     }

    /**
     * é€šè¿‡id删除
     * @param id

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundOrderFlowDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package org.jeecg.modules.tms.entity.dto;

import lombok.Data;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;

@Data
public class OutBoundOrderFlowDto extends FlowTaskVo {
    //审批状态
    private String status;
    //审批意见
    private String approvalOpinion;
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBoundStatusEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package org.jeecg.modules.tms.enums;

import lombok.Getter;

/**
 * å‡ºåº“状态枚举
 */
@Getter
public enum OutBoundStatusEnum {
    /**
     * æœªå‡ºåº“
     */
    NOT_OUTBOUND("1", "未出库"),

    /**
     * éƒ¨åˆ†å‡ºåº“
     */
    PARTIAL_OUTBOUND("2", "部分出库"),

    /**
     * å‡ºåº“完成
     */
    COMPLETED("3", "出库完成");

    private final String value;
    private final String description;

    OutBoundStatusEnum(String value, String description) {
        this.value = value;
        this.description = description;
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java

@@ -5,6 +5,7 @@
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.OutboundOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
@@ -40,4 +41,8 @@
    IPage<OutboundOrder> queryPageList(Page<OutboundOrder> page, Map<String, String[]> parameterMap);

    void editTotal(OutboundOrderAndDetailDto outboundOrder);

    void submit(String id);

    void approvalProcess(OutBoundOrderFlowDto outBoundOrderFlowDto);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java

@@ -2,19 +2,36 @@

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.OutboundOrder;
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.jeecg.modules.tms.enums.OutBoundStatusEnum;
import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
import org.jeecg.modules.tms.mapper.OutboundOrderMapper;
import org.jeecg.modules.tms.service.IOutboundDetailService;
@@ -24,10 +41,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.util.List;
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
import java.util.*;

/**
 * @Description: tms_outbound_order
@@ -35,13 +49,24 @@
 * @Date:   2025-05-16
 * @Version: V1.0
 */
@Slf4j
@Service
public class OutboundOrderServiceImpl extends ServiceImpl<OutboundOrderMapper, OutboundOrder> implements IOutboundOrderService {
public class OutboundOrderServiceImpl extends ServiceImpl<OutboundOrderMapper, OutboundOrder> implements IOutboundOrderService, FlowCallBackServiceI {

    @Autowired
    private IOutboundDetailService outboundDetailService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private IFlowTaskService flowTaskService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Autowired
    private OutboundOrderMapper outboundOrderMapper;
    @Autowired
@@ -73,6 +98,7 @@
        save(order);
        List<OutboundDetail> detailList = CollectionUtil.newArrayList();
        outboundOrder.getOutboundDetailList().forEach(item->{
            item.setId(null);
            item.setOutStorehouseId(order.getId());
            detailList.add(item);
        });
@@ -122,7 +148,96 @@
        outboundDetailService.saveBatch(detailList);
    }

    private LoginUser getCurrentUser() {
    @Override
    public void submit(String id) {
        OutboundOrder outboundOrder = getById(id);
        if (outboundOrder == null) {
            throw new JeecgBootException("出库单申请单不存在，无法提交！");
        }
        if (!Objects.equals(outboundOrder.getOrderStatus(), OutBillStatus.DRAFT.getValue())) {
            throw new JeecgBootException("无法提交非草稿状态的出库申请单！");
        }
        //启动流程
        if (triggerProcess(outboundOrder)) {
            outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
        }
        updateById(outboundOrder);
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public void approvalProcess(OutBoundOrderFlowDto outBoundOrderFlowDto) {
        if (StrUtil.isBlank(outBoundOrderFlowDto.getTaskId()) || StrUtil.isBlank(outBoundOrderFlowDto.getDataId())) {
            throw new JeecgBootException("非法参数！");
        }

        // èŽ·å–当前登录用户
        LoginUser user = getCurrentUser();
        if (user == null || StrUtil.isBlank(user.getId())) {
            throw new JeecgBootException("账号不存在");
        }

        //获取出库申请单信息
        OutboundOrder outboundOrder = getById(outBoundOrderFlowDto.getDataId());
        if (outboundOrder == null) {
            throw new JeecgBootException("未找到对应的出库申请单！");
        }

        //获取流程业务记录
        FlowMyBusiness flowMyBusiness = getFlowMyBusiness(outBoundOrderFlowDto.getInstanceId());
        if (flowMyBusiness == null) {
            throw new JeecgBootException("流程记录不存在");
        }

        // æ£€æŸ¥ç”¨æˆ·æ˜¯å¦æœ‰æƒé™æ“ä½œä»»åŠ¡
        if (!isUserAuthorized(flowMyBusiness, user)) {
            throw new JeecgBootException("用户无权操作此任务");
        }

        // è®¤é¢†ä»»åŠ¡
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领");
        }

        //设置流程变量
        setupProcessVariables(outBoundOrderFlowDto, outboundOrder, user);

        //完成流程任务
        Result result = flowTaskService.complete(outBoundOrderFlowDto);

        //根据任务完成结果更新申请单状态
        if (result.isSuccess()) {
            outboundOrder.setOrderStatus(outBoundOrderFlowDto.getStatus());
            if (OutBillStatus.APPROVED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
                outboundOrder.setOutStatus(OutBoundStatusEnum.NOT_OUTBOUND.getValue());
            }
            outboundOrder.setAuditDate(new Date());
            outboundOrder.setApprovalOpinion(outBoundOrderFlowDto.getApprovalOpinion());
            updateById(outboundOrder);
        }
    }

    public boolean triggerProcess(OutboundOrder outboundOrder) {
        flowCommonService.initActBusiness("单号为：" + outboundOrder.getOutNum() + " çš„出库申请，开始进行审批",
                outboundOrder.getId(), "outboundOrderServiceImpl", "tool_out_storage", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", outboundOrder.getId());
        if (StrUtil.isEmpty(outboundOrder.getRemark())) {
            variables.put("organization", "新增出库申请单默认启动流程");
            variables.put("comment", "新增出库申请单默认启动流程");
        } else {
            variables.put("organization", outboundOrder.getRemark());
            variables.put("comment", outboundOrder.getRemark());
        }
        variables.put("proofreading", true);
        List<String> usernames = new ArrayList<>();
        usernames.add(outboundOrder.getReviewer());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("tool_out_storage", variables);
        return result.isSuccess();
    }

    private LoginUser getCurrentUser() {
        // èŽ·å–当前认证的登录用户信息
        Subject currentUser = SecurityUtils.getSubject();
        if (currentUser != null && currentUser.isAuthenticated()) {
@@ -133,4 +248,64 @@
        }
        return null;
    }

    private FlowMyBusiness getFlowMyBusiness(String instanceId) {
        List<FlowMyBusiness> businessList = flowMyBusinessService.list(
                new LambdaQueryWrapper<FlowMyBusiness>().eq(FlowMyBusiness::getProcessInstanceId, instanceId));
        return businessList.isEmpty() ? null : businessList.get(0);
    }

    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
        List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
        return todoUsers != null && todoUsers.contains(user.getUsername());
    }

    private boolean claimTask(String taskId, LoginUser user) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (task == null) {
            return false;
        }
        if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
            return false;
        }
        taskService.claim(taskId, user.getUsername());
        return true;
    }

    private void setupProcessVariables(OutBoundOrderFlowDto outBoundOrderFlowDto, OutboundOrder outboundOrder, LoginUser user) {
        if (OutBillStatus.SUBMITTED.getValue().equals(outboundOrder.getOrderStatus()) && user.getUsername().equals(outboundOrder.getReviewer())) {
            Map<String, Object> values = new HashMap<>();
            values.put("dataId", outboundOrder.getId());
            values.put("organization", outBoundOrderFlowDto.getApprovalOpinion());
            values.put("comment", outBoundOrderFlowDto.getApprovalOpinion());
            values.put("status", outBoundOrderFlowDto.getStatus());
            values.put("NextAssignee", Collections.singletonList(outboundOrder.getReviewer()));
            outBoundOrderFlowDto.setValues(values);
        }
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return Collections.emptyMap();
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}