工具管理-刀具准备单代码生成

cuilei

2025-06-10 123b81e8a7d6b78fc4b0729f5fd6b32a876cf740

工具管理-刀具准备单代码生成

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

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

import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.jeecg.common.api.vo.Result;
import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import org.jeecg.modules.tms.entity.PreparationOrder;
import org.jeecg.modules.tms.service.IPreparationOrderService;
import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
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.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
@Api(tags="刀具准备单")
@RestController
@RequestMapping("/tms/preparationOrder")
@Slf4j
public class PreparationOrderController extends JeecgController<PreparationOrder, IPreparationOrderService> {

    @Autowired
    private IPreparationOrderService preparationOrderService;

    @Autowired
    private IPreparationOrderDetailService preparationOrderDetailService;


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

    /**
     * åˆ†é¡µåˆ—表查询
     * @param preparationOrder
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "刀具准备单-分页列表查询")
    @ApiOperation(value="刀具准备单-分页列表查询", notes="刀具准备单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<PreparationOrder>> queryPageList(PreparationOrder preparationOrder,
                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                         HttpServletRequest req) {
        QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, req.getParameterMap());
        Page<PreparationOrder> page = new Page<PreparationOrder>(pageNo, pageSize);
        IPage<PreparationOrder> pageList = preparationOrderService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     *   æ·»åŠ 
     * @param preparationOrder
     * @return
     */
    @AutoLog(value = "刀具准备单-添加")
    @ApiOperation(value="刀具准备单-添加", notes="刀具准备单-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody PreparationOrder preparationOrder) {
        preparationOrderService.save(preparationOrder);
        return Result.OK("添加成功！");
    }

    /**
     *  ç¼–辑
     * @param preparationOrder
     * @return
     */
    @AutoLog(value = "刀具准备单-编辑")
    @ApiOperation(value="刀具准备单-编辑", notes="刀具准备单-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody PreparationOrder preparationOrder) {
        preparationOrderService.updateById(preparationOrder);
        return Result.OK("编辑成功!");
    }


    @AutoLog(value = "刀具准备单-确认完成")
    @ApiOperation(value="刀具准备单-调机员修正确认", notes = "刀具准备单-调机员修正确认")
    @RequestMapping(value = "/editTotal", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> editTotal(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
        preparationOrderService.editTotal(preparationOrderAndDetailDto);
        return Result.OK("确认完成！");
    }

    /**
     * é€šè¿‡id删除
     * @param id
     * @return
     */
    @AutoLog(value = "刀具准备单-通过id删除准备单及明细")
    @ApiOperation(value="刀具准备单-通过id删除准备单及明细", notes="刀具准备单-通过id删除准备单及明细")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        preparationOrderService.delMain(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具准备单-批量删除")
    @ApiOperation(value="刀具准备单-批量删除", notes="刀具准备单-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * å¯¼å‡º
     * @return
     */
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, PreparationOrder preparationOrder) {
        return super.exportXls(request, preparationOrder, PreparationOrder.class, "刀具准备单");
    }

    /**
     * å¯¼å…¥
     * @return
     */
    //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PreparationOrder.class);
    }
    /*---------------------------------主表处理-end-------------------------------------*/


    /*--------------------------------子表处理-刀具准备单明细-begin----------------------------------------------*/
    /**
     * é€šè¿‡ä¸»è¡¨ID查询
     * @return
     */
    //@AutoLog(value = "刀具准备单明细-通过主表ID查询")
    @ApiOperation(value="刀具准备单明细-通过主表ID查询", notes="刀具准备单明细-通过主表ID查询")
    @GetMapping(value = "/listPreparationOrderDetailByMainId")
    public Result<IPage<PreparationOrderDetail>> listPreparationOrderDetailByMainId(PreparationOrderDetail preparationOrderDetail,
                                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                                    HttpServletRequest req) {
        QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, req.getParameterMap());
        Page<PreparationOrderDetail> page = new Page<PreparationOrderDetail>(pageNo, pageSize);
        IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     * @param preparationOrderDetail
     * @return
     */
    @AutoLog(value = "刀具准备单明细-添加")
    @ApiOperation(value="刀具准备单明细-添加", notes="刀具准备单明细-添加")
    @PostMapping(value = "/addPreparationOrderDetail")
    public Result<String> addPreparationOrderDetail(@RequestBody PreparationOrderDetail preparationOrderDetail) {
        preparationOrderDetailService.save(preparationOrderDetail);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     * @param preparationOrderDetail
     * @return
     */
    @AutoLog(value = "刀具准备单明细-编辑")
    @ApiOperation(value="刀具准备单明细-编辑", notes="刀具准备单明细-编辑")
    @RequestMapping(value = "/editPreparationOrderDetail", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> editPreparationOrderDetail(@RequestBody PreparationOrderDetail preparationOrderDetail) {
        preparationOrderDetailService.updateById(preparationOrderDetail);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     * @param id
     * @return
     */
    @AutoLog(value = "刀具准备单明细-通过id删除")
    @ApiOperation(value="刀具准备单明细-通过id删除", notes="刀具准备单明细-通过id删除")
    @DeleteMapping(value = "/deletePreparationOrderDetail")
    public Result<String> deletePreparationOrderDetail(@RequestParam(name="id",required=true) String id) {
        preparationOrderDetailService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     * @return
     */
    @AutoLog(value = "刀具准备单明细-批量删除")
    @ApiOperation(value="刀具准备单明细-批量删除", notes="刀具准备单明细-批量删除")
    @DeleteMapping(value = "/deleteBatchPreparationOrderDetail")
    public Result<String> deleteBatchPreparationOrderDetail(@RequestParam(name="ids",required=true) String ids) {
        this.preparationOrderDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * å¯¼å‡º
     * @return
     */
    @RequestMapping(value = "/exportPreparationOrderDetail")
    public ModelAndView exportPreparationOrderDetail(HttpServletRequest request, PreparationOrderDetail preparationOrderDetail) {
        // Step.1 ç»„装查询条件
        QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, request.getParameterMap());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

        // Step.2 èŽ·å–导出数据
        List<PreparationOrderDetail> pageList = preparationOrderDetailService.list(queryWrapper);
        List<PreparationOrderDetail> exportList = null;

        // è¿‡æ»¤é€‰ä¸­æ•°æ®
        String selections = request.getParameter("selections");
        if (oConvertUtils.isNotEmpty(selections)) {
            List<String> selectionList = Arrays.asList(selections.split(","));
            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
        } else {
            exportList = pageList;
        }

        // Step.3 AutoPoi å¯¼å‡ºExcel
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        //此处设置的filename无效,前端会重更新设置一下
        mv.addObject(NormalExcelConstants.FILE_NAME, "刀具准备单明细");
        mv.addObject(NormalExcelConstants.CLASS, PreparationOrderDetail.class);
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("刀具准备单明细报表", "导出人:" + sysUser.getRealname(), "刀具准备单明细"));
        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
        return mv;
    }

    /**
     * å¯¼å…¥
     * @return
     */
    @RequestMapping(value = "/importPreparationOrderDetail/{mainId}")
    public Result<?> importPreparationOrderDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<PreparationOrderDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), PreparationOrderDetail.class, params);
                for (PreparationOrderDetail temp : list) {
                    temp.setPreparationOrderId(mainId);
                }
                long start = System.currentTimeMillis();
                preparationOrderDetailService.saveBatch(list);
                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                return Result.OK("文件导入成功！数据行数：" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.error("文件导入失败！");
    }

    /*--------------------------------子表处理-刀具准备单明细-end----------------------------------------------*/




}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/convert/PreparationOrderConvert.java

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

import org.jeecg.modules.tms.entity.PreparationOrder;
import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

/**
 * ä½¿ç”¨ MapStruct æ–¹å¼è¿›è¡Œå±žæ€§å¤åˆ¶
 * æ³¨æ„ä¸èƒ½æ”¾åœ¨ mybatis扫描的mapper包下面，否则会报错
 */
@Mapper
public interface PreparationOrderConvert {

    PreparationOrderConvert INSTANCE = Mappers.getMapper(PreparationOrderConvert.class);

    PreparationOrder convert(PreparationOrderAndDetailDto dto);
}

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

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

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecgframework.poi.excel.annotation.Excel;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
@Data
@TableName("tms_preparation_order")
@ApiModel(value="tms_preparation_order对象", description="刀具准备单")
public class PreparationOrder implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**准备单编号*/
    @Excel(name = "准备单编号", width = 15)
    @ApiModelProperty(value = "准备单编号")
    private String preparationOrderNum;
    /**零件图号*/
    @Excel(name = "零件图号", width = 15)
    @ApiModelProperty(value = "零件图号")
    private String partDrawingNo;
    /**零件名称*/
    @Excel(name = "零件名称", width = 15)
    @ApiModelProperty(value = "零件名称")
    private String partName;
    /**零件材料*/
    @Excel(name = "零件材料", width = 15)
    @ApiModelProperty(value = "零件材料")
    private String partMaterial;
    /**工序（工步号）*/
    @Excel(name = "工序（工步号）", width = 15)
    @ApiModelProperty(value = "工序（工步号）")
    private String productionProcessesNo;
    /**加工批次*/
    @Excel(name = "加工批次", width = 15)
    @ApiModelProperty(value = "加工批次")
    private String batchCode;
    /**加工数量*/
    @Excel(name = "加工数量", width = 15)
    @ApiModelProperty(value = "加工数量")
    private String machiningCount;
    /**加工设备*/
    @Excel(name = "加工设备", width = 15)
    @ApiModelProperty(value = "加工设备")
    private String equipmentCode;
    /**程序名*/
    @Excel(name = "程序名", width = 15)
    @ApiModelProperty(value = "程序名")
    private String ncName;
    /**准备单出库数量*/
    @Excel(name = "准备单出库数量", width = 15)
    @ApiModelProperty(value = "准备单出库数量")
    private java.math.BigDecimal outboundQuantity;
    /**单子状态;1.未审核；2.调机员已审核；3.已转出库申请*/
    @Excel(name = "单子状态;1.未审核；2.调机员已审核；3.已转出库申请", width = 15)
    @ApiModelProperty(value = "单子状态;1.未审核；2.调机员已审核；3.已转出库申请")
    private String orderStatus;
    /**准备单提交时间;提交至出库申请单的时间*/
    @Excel(name = "准备单提交时间;提交至出库申请单的时间", width = 15, format = "yyyy-MM-dd HH:mm")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "准备单提交时间;提交至出库申请单的时间")
    private Date outboundTime;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**租户号*/
    @Excel(name = "租户号", width = 15)
    @ApiModelProperty(value = "租户号")
    private String tenantId;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间;DNC推送数据时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "创建时间;DNC推送数据时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
}

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

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

import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
@Data
@TableName("tms_preparation_order_detail")
@ApiModel(value="tms_preparation_order_detail对象", description="刀具准备单明细")
public class PreparationOrderDetail implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**准备单号*/
    @ApiModelProperty(value = "准备单号")
    private String preparationOrderId;
    /**刀具编码*/
    @Excel(name = "刀具编码", width = 15)
    @ApiModelProperty(value = "刀具编码")
    private String toolCode;
    /**刀具编号*/
    @Excel(name = "刀具编号", width = 15)
    @ApiModelProperty(value = "刀具编号")
    private String toolId;
    /**申请出库数量*/
    @Excel(name = "申请出库数量", width = 15)
    @ApiModelProperty(value = "申请出库数量")
    private java.math.BigDecimal outboundQuantity;
    /**租户号*/
    @Excel(name = "租户号", width = 15)
    @ApiModelProperty(value = "租户号")
    private String tenantId;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;

@Data
public class PreparationOrderAndDetailDto {

    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**准备单编号*/
    @ApiModelProperty(value = "准备单编号")
    private String preparationOrderNum;
    /**零件图号*/
    @ApiModelProperty(value = "零件图号")
    private String partDrawingNo;
    /**零件名称*/
    @ApiModelProperty(value = "零件名称")
    private String partName;
    /**零件材料*/
    @ApiModelProperty(value = "零件材料")
    private String partMaterial;
    /**工序（工步号）*/
    @ApiModelProperty(value = "工序（工步号）")
    private String productionProcessesNo;
    /**加工批次*/
    @ApiModelProperty(value = "加工批次")
    private String batchCode;
    /**加工数量*/
    @ApiModelProperty(value = "加工数量")
    private String machiningCount;
    /**加工设备*/
    @ApiModelProperty(value = "加工设备")
    private String equipmentCode;
    /**程序名*/
    @ApiModelProperty(value = "程序名")
    private String ncName;
    /**准备单出库数量*/
    @ApiModelProperty(value = "准备单出库数量")
    private java.math.BigDecimal outboundQuantity;
    /**单子状态;1.未审核；2.调机员已审核；3.已转出库申请*/
    @ApiModelProperty(value = "单子状态;1.未审核；2.调机员已审核；3.已转出库申请")
    private String orderStatus;
    /**准备单提交时间;提交至出库申请单的时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "准备单提交时间;提交至出库申请单的时间")
    private Date outboundTime;
    /**备注*/
    @ApiModelProperty(value = "备注")
    private String remark;
    /**刀具准备单明细*/
    @ApiModelProperty(value = "刀具准备单明细")
    private List<PreparationOrderDetail> preparationOrderDetailList;
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderDetailMapper.java

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

import java.util.List;
import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
public interface PreparationOrderDetailMapper extends BaseMapper<PreparationOrderDetail> {

    /**
     * é€šè¿‡ä¸»è¡¨id删除子表数据
     *
     * @param mainId ä¸»è¡¨id
     * @return boolean
     */
    public boolean deleteByMainId(@Param("mainId") String mainId);

    /**
     * é€šè¿‡ä¸»è¡¨id查询子表数据
     *
     * @param mainId ä¸»è¡¨id
     * @return List<PreparationOrderDetail>
     */
    public List<PreparationOrderDetail> selectByMainId(@Param("mainId") String mainId);

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderMapper.java

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

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.PreparationOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
public interface PreparationOrderMapper extends BaseMapper<PreparationOrder> {

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderDetailMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper">

    <delete id="deleteByMainId" parameterType="java.lang.String">
        DELETE
        FROM  tms_preparation_order_detail
        WHERE
            preparation_order_id = #{mainId}
    </delete>

    <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.tms.entity.PreparationOrderDetail">
        SELECT *
        FROM  tms_preparation_order_detail
        WHERE
            preparation_order_id = #{mainId}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.PreparationOrderMapper">

</mapper>

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

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

import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
public interface IPreparationOrderDetailService extends IService<PreparationOrderDetail> {

  /**
   * é€šè¿‡ä¸»è¡¨id查询子表数据
   *
   * @param mainId
   * @return List<PreparationOrderDetail>
   */
    public List<PreparationOrderDetail> selectByMainId(String mainId);
}

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

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

import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import org.jeecg.modules.tms.entity.PreparationOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
public interface IPreparationOrderService extends IService<PreparationOrder> {

    /**
     * åˆ é™¤ä¸€å¯¹å¤š
     *
     * @param id
     */
    public void delMain (String id);
	
    /**
     * æ‰¹é‡åˆ é™¤ä¸€å¯¹å¤š
     *
     * @param idList
     */
    public void delBatchMain (Collection<? extends Serializable> idList);


    void editTotal(PreparationOrderAndDetailDto preparationOrderAndDetailDto);
}

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

@@ -155,7 +155,7 @@
        //删除所有明细
        outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
                .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
        OutboundOrder outboundOrderUpdate = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
        OutboundOrder outboundOrderUpdate = OutboundOrderConvert.INSTANCE.convert(outboundOrder);
        outboundOrderMapper.updateById(outboundOrderUpdate);
        List<OutboundDetail> detailList = CollectionUtil.newArrayList();
        outboundOrder.getOutboundDetailList().forEach(item->{

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

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

import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper;
import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
@Service
public class PreparationOrderDetailServiceImpl extends ServiceImpl<PreparationOrderDetailMapper, PreparationOrderDetail> implements IPreparationOrderDetailService {
	
    @Autowired
    private PreparationOrderDetailMapper preparationOrderDetailMapper;
	
    @Override
    public List<PreparationOrderDetail> selectByMainId(String mainId) {
        return preparationOrderDetailMapper.selectByMainId(mainId);
    }
}

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

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

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.tms.convert.PreparationOrderConvert;
import org.jeecg.modules.tms.entity.PreparationOrder;
import org.jeecg.modules.tms.entity.PreparationOrderDetail;
import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
import org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper;
import org.jeecg.modules.tms.mapper.PreparationOrderMapper;
import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
import org.jeecg.modules.tms.service.IPreparationOrderService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;

/**
 * @Description: åˆ€å…·å‡†å¤‡å•
 * @Author: jeecg-boot
 * @Date:   2025-06-09
 * @Version: V1.0
 */
@Service
public class PreparationOrderServiceImpl extends ServiceImpl<PreparationOrderMapper, PreparationOrder> implements IPreparationOrderService {

    @Autowired
    private PreparationOrderMapper preparationOrderMapper;
    @Autowired
    private PreparationOrderDetailMapper preparationOrderDetailMapper;
    @Autowired
    private IPreparationOrderDetailService preparationOrderDetailService;
	
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delMain(String id) {
        preparationOrderDetailMapper.deleteByMainId(id);
        preparationOrderMapper.deleteById(id);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delBatchMain(Collection<? extends Serializable> idList) {
        for(Serializable id:idList) {
            preparationOrderDetailMapper.deleteByMainId(id.toString());
            preparationOrderMapper.deleteById(id);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void editTotal(PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
        //先删除所有明细
        preparationOrderDetailMapper.delete(new LambdaQueryWrapper<PreparationOrderDetail>()
                .eq(PreparationOrderDetail::getPreparationOrderId, preparationOrderAndDetailDto.getId()));
        PreparationOrder preparationOrder = PreparationOrderConvert.INSTANCE.convert(preparationOrderAndDetailDto);
        updateById(preparationOrder);
        List<PreparationOrderDetail> detailUpdateList = CollectionUtil.newArrayList();
        preparationOrderAndDetailDto.getPreparationOrderDetailList().forEach(item->{
            item.setPreparationOrderId(preparationOrder.getId());
            detailUpdateList.add(item);
        });
        preparationOrderDetailService.saveBatch(detailUpdateList);
    }

}