Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-invent...

chenhj

12 小时以前 640add74fe75427df3e9a9da3ffdf98ae3da3272

Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

 src/main/java/com/ruoyi/production/controller/ProductParameterController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.ruoyi.production.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductParameterDto;
import com.ruoyi.production.service.ProductParameterService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * å‚数配置表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 01:38:54
 */
@RestController
@RequestMapping("/productParameter")
public class ProductParameterController {

    @Autowired
    private ProductParameterService productParameterService;


    @ApiOperation("生产记录 åˆ†é¡µæŸ¥è¯¢")
    @GetMapping("listPage")
    @Log(title = "生产记录 åˆ†é¡µæŸ¥è¯¢", businessType = BusinessType.OTHER)
    public AjaxResult page(ProductParameterDto productParameter, Page<ProductParameterDto> page) {
        return AjaxResult.success(productParameterService.pageProductParameter(page, productParameter));
    }

    @ApiOperation("生产记录 æ–°å¢ž")
    @PostMapping("/addProductParameter")
    @Log(title = "生产记录 æ–°å¢ž", businessType = BusinessType.INSERT)
    public AjaxResult addProductParameter(@RequestBody ProductParameterDto productParameter) {
        productParameterService.addProductParameter(productParameter);
        return AjaxResult.success();
    }


    @ApiOperation("生产记录 ä¿®æ”¹")
    @PutMapping("updProductParameter")
    @Log(title = "生产记录 ä¿®æ”¹", businessType = BusinessType.UPDATE)
    public AjaxResult updProductParameter(@RequestBody ProductParameterDto productParameter) {
        productParameterService.updProductParameter(productParameter);
        return AjaxResult.success();
    }

    @ApiOperation("生产记录 åˆ é™¤")
    @DeleteMapping("/{ids}")
    @Log(title = "生产记录 åˆ é™¤", businessType = BusinessType.DELETE)
    public AjaxResult delete(@PathVariable("ids") List<Long> ids) {
        productParameterService.removeBatchByIds(ids);
        return AjaxResult.success();
    }


}

 src/main/java/com/ruoyi/production/controller/ProductProcessParameterController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.ruoyi.production.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessParameterDto;
import com.ruoyi.production.pojo.ProductProcessParameter;
import com.ruoyi.production.service.ProductProcessParameterService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * å·¥åºå‚数表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 03:45:15
 */
@RestController
@RequestMapping("/productProcessParameter")
public class ProductProcessParameterController {

    @Autowired
    private ProductProcessParameterService productProcessParameterService;


    @ApiOperation("工序生产记录 åˆ†é¡µæŸ¥è¯¢")
    @GetMapping("listPage")
    @Log(title = "工序生产记录 åˆ†é¡µæŸ¥è¯¢", businessType = BusinessType.OTHER)
    public AjaxResult page(ProductProcessParameterDto productProcessParameter, Page<ProductProcessParameterDto> page) {
        return AjaxResult.success(productProcessParameterService.pageProductProcessParameter(page, productProcessParameter));
    }

    @ApiOperation("工序生产记录 æ–°å¢žå¤šæ¡")
    @PostMapping("/addProductProcessParameter/{processId}")
    @Log(title = "工序生产记录 æ–°å¢žå¤šæ¡", businessType = BusinessType.INSERT)
    public AjaxResult addProductProcessParameter(@RequestBody List<ProductProcessParameter> productProcessParameters, @PathVariable Long processId) {
        productProcessParameterService.addProductProcessParameter(productProcessParameters, processId);
        return AjaxResult.success();
    }


    @ApiOperation("工序生产记录 ä¿®æ”¹")
    @PutMapping("updProductProcessParameter")
    @Log(title = "工序生产记录 ä¿®æ”¹", businessType = BusinessType.UPDATE)
    public AjaxResult updProductProcessParameter(@RequestBody ProductProcessParameterDto productProcessParameter) {
        productProcessParameterService.updateById(productProcessParameter);
        return AjaxResult.success();
    }

    @ApiOperation("工序生产记录 åˆ é™¤å¤šæ¡")
    @DeleteMapping("/{ids}")
    @Log(title = "工序生产记录 åˆ é™¤å¤šæ¡", businessType = BusinessType.DELETE)
    public AjaxResult delete(@PathVariable("ids") List<Long> ids) {
        productProcessParameterService.removeBatchByIds(ids);
        return AjaxResult.success();
    }
}

 src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java

@@ -13,7 +13,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;

@RequestMapping("productionProductMain")
@RequestMapping("/productionProductMain")
@RestController
@Api(value = "生产报工")
public class ProductionProductMainController {

 src/main/java/com/ruoyi/production/dto/ProductParameterDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.ruoyi.production.dto;

import com.ruoyi.production.pojo.ProductParameter;
import lombok.Data;

/**
 * @author yuan
 * @date 2026-03-14 13:42
 * @description
 */
@Data
public class ProductParameterDto extends ProductParameter {
}

 src/main/java/com/ruoyi/production/dto/ProductProcessParameterDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.production.dto;

import com.ruoyi.production.pojo.ProductProcessParameter;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * @author yuan
 * @date 2026-03-14 15:47
 * @description
 */
@EqualsAndHashCode(callSuper = true)
@Data
public class ProductProcessParameterDto extends ProductProcessParameter {
}

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -60,6 +60,8 @@
    private BigDecimal workHours;
    private BigDecimal wages;

    @ApiModelProperty(value = "投入总量(kg)")
    private BigDecimal totalInvestment;

    private BigDecimal inspectedQuantity;
}

 src/main/java/com/ruoyi/production/mapper/ProductParameterMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.production.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductParameterDto;
import com.ruoyi.production.pojo.ProductParameter;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
 * å‚数配置表 Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 01:38:54
 */
@Mapper
public interface ProductParameterMapper extends BaseMapper<ProductParameter> {

    IPage<ProductParameterDto> pageProductParameter(@Param("page") Page<ProductParameterDto> page, @Param("productParameter") ProductParameterDto productParameter);
}

 src/main/java/com/ruoyi/production/mapper/ProductProcessParameterMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.production.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductProcessParameterDto;
import com.ruoyi.production.pojo.ProductProcessParameter;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
 * å·¥åºå‚数表 Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 03:45:15
 */
@Mapper
public interface ProductProcessParameterMapper extends BaseMapper<ProductProcessParameter> {

    IPage<ProductProcessParameterDto> pageProductProcessParameter(@Param("page") Page<ProductProcessParameterDto> page, @Param("productProcessParameter") ProductProcessParameterDto productProcessParameter);
}

 src/main/java/com/ruoyi/production/pojo/ProductOrder.java

@@ -109,11 +109,11 @@
     * åˆ¶é€ ç­ç»„
     */
    private String manufacturingTeam;

    /**
     * æ‰¹å·
     */
    @ApiModelProperty(value = "批号")
    @Excel(name = "批号")
    private String batchNo;

}

 src/main/java/com/ruoyi/production/pojo/ProductParameter.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
package com.ruoyi.production.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * å‚数配置表
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 01:38:54
 */
@Data
@TableName("product_parameter")
@ApiModel(value = "ProductParameter对象", description = "参数配置表")
public class ProductParameter implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("参数编码")
    private String code;

    @ApiModelProperty("参数项")
    private String parameterItem;

    @ApiModelProperty("参数类型（0：数字格式，1：文本格式）")
    private String type;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("参数格式")
    private String parameterFormat;

    @ApiModelProperty("字典值")
    private String dict;

    @ApiModelProperty("是否必填（0：否，1：是）")
    private String isRequired;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private String createUser;

    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private String updateUser;

    @ApiModelProperty("租户ID")
    @TableField(fill = FieldFill.INSERT)
    private String tenantId;
}

 src/main/java/com/ruoyi/production/pojo/ProductProcessParameter.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.ruoyi.production.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * å·¥åºå‚数表
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 03:45:15
 */
@Getter
@Setter
@TableName("product_process_parameter")
@ApiModel(value = "ProductProcessParameter对象", description = "工序参数表")
public class ProductProcessParameter implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("参数编码")
    private String code;

    @ApiModelProperty("工序id")
    private Long processId;

    @ApiModelProperty("参数项")
    private String parameterItem;

    @ApiModelProperty("参数类型（0：数字格式，1：文本格式）")
    private String type;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("参数格式")
    private String parameterFormat;

    @ApiModelProperty("字典值")
    private String dict;

    @ApiModelProperty("填写值")
    private String value;

    @ApiModelProperty("是否必填（0：否，1：是）")
    private String isRequired;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private String createUser;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private String updateUser;

    @ApiModelProperty("租户ID")
    @TableField(fill = FieldFill.INSERT)
    private String tenantId;
}

 src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -121,5 +120,11 @@
    @ApiModelProperty(value = "完成数量")
    private BigDecimal completeQuantity;

    /**
     * æŠ•å…¥æ€»é‡
     */
    @ApiModelProperty(value = "投入总量(kg)")
    private BigDecimal totalInvestment;


}

 src/main/java/com/ruoyi/production/service/ProductParameterService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.production.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductParameterDto;
import com.ruoyi.production.pojo.ProductParameter;

/**
 * <p>
 * å‚数配置表 æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 01:38:54
 */
public interface ProductParameterService extends IService<ProductParameter> {

    IPage<ProductParameterDto> pageProductParameter(Page<ProductParameterDto> page, ProductParameterDto productParameter);

    void addProductParameter(ProductParameterDto productParameter);

    void updProductParameter(ProductParameterDto productParameter);
}

 src/main/java/com/ruoyi/production/service/ProductProcessParameterService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.production.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductProcessParameterDto;
import com.ruoyi.production.pojo.ProductProcessParameter;

import java.util.List;

/**
 * <p>
 * å·¥åºå‚数表 æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 03:45:15
 */
public interface ProductProcessParameterService extends IService<ProductProcessParameter> {

    IPage<ProductProcessParameterDto> pageProductProcessParameter(Page<ProductProcessParameterDto> page, ProductProcessParameterDto productProcessParameter);

    void addProductProcessParameter(List<ProductProcessParameter> productProcessParameters, Long processId);
}

 src/main/java/com/ruoyi/production/service/impl/ProductParameterServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.ruoyi.production.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.production.dto.ProductParameterDto;
import com.ruoyi.production.mapper.ProductParameterMapper;
import com.ruoyi.production.pojo.ProductParameter;
import com.ruoyi.production.service.ProductParameterService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
 * å‚数配置表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 01:38:54
 */
@Service
public class ProductParameterServiceImpl extends ServiceImpl<ProductParameterMapper, ProductParameter> implements ProductParameterService {

    @Override
    public IPage<ProductParameterDto> pageProductParameter(Page<ProductParameterDto> page, ProductParameterDto productParameter) {
        return baseMapper.pageProductParameter(page, productParameter);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addProductParameter(ProductParameterDto productParameter) {
        boolean save = this.save(productParameter);
        if (save) {
            String no = "BP" + String.format("%06d", productParameter.getId());
            productParameter.setCode(no);
            this.updateById(productParameter);
        }
    }

    @Override
    public void updProductParameter(ProductParameterDto productParameter) {
        this.updateById(productParameter);
    }
}

 src/main/java/com/ruoyi/production/service/impl/ProductProcessParameterServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.ruoyi.production.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.production.dto.ProductProcessParameterDto;
import com.ruoyi.production.mapper.ProductProcessParameterMapper;
import com.ruoyi.production.pojo.ProductProcessParameter;
import com.ruoyi.production.service.ProductProcessParameterService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * <p>
 * å·¥åºå‚数表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-14 03:45:15
 */
@Service
public class ProductProcessParameterServiceImpl extends ServiceImpl<ProductProcessParameterMapper, ProductProcessParameter> implements ProductProcessParameterService {

    @Override
    public IPage<ProductProcessParameterDto> pageProductProcessParameter(Page<ProductProcessParameterDto> page, ProductProcessParameterDto productProcessParameter) {
        return baseMapper.pageProductProcessParameter(page, productProcessParameter);
    }

    @Override
    @Transactional
    public void addProductProcessParameter(List<ProductProcessParameter> productProcessParameters, Long processId) {
        productProcessParameters.forEach(productProcessParameter -> {
            productProcessParameter.setId(null);
            productProcessParameter.setCreateTime(null);
            productProcessParameter.setUpdateTime(null);
            productProcessParameter.setCreateUser(null);
            productProcessParameter.setUpdateUser(null);
            productProcessParameter.setTenantId(null);
            productProcessParameter.setProcessId(processId);
        });
        this.saveBatch(productProcessParameters);
    }
}

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -141,7 +141,7 @@
        productionProductMainMapper.insert(productionProductMain);
        /*新增报工投入表*/
        List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId());
        if (productStructureDtos.size() == 0) {
        if (productStructureDtos.isEmpty()) {
            //如果该工序没有产品结构的投入品,那这个投入品和产出品是同一个
            ProductStructureDto productStructureDto = new ProductStructureDto();
            productStructureDto.setProductModelId(productProcessRouteItem.getProductModelId());
@@ -155,8 +155,6 @@
            productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity()));
            productionProductInput.setProductMainId(productionProductMain.getId());
            productionProductInputMapper.insert(productionProductInput);
            stockUtils.substractStock(productStructureDto.getProductModelId(), productionProductInput.getQuantity(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId());

        }
        /*新增报工产出表*/
        ProductionProductOutput productionProductOutput = new ProductionProductOutput();
@@ -165,8 +163,8 @@
        productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
        productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
        productionProductOutputMapper.insert(productionProductOutput);
        //合格数量=报工数量-报废数量
        BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
        //合格数量=报工数量
        BigDecimal productQty = productionProductOutput.getQuantity();
        //只有合格数量>0才能增加相应数据
        if (productQty.compareTo(BigDecimal.ZERO) > 0) {
            /*新增质检*/
@@ -230,6 +228,7 @@
            if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) {
                productWorkOrder.setActualEndTime(LocalDate.now());//实际结束时间
            }
            productWorkOrder.setTotalInvestment(dto.getTotalInvestment());
            productWorkOrderMapper.updateById(productWorkOrder);
            //生产订单
            ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
@@ -27,19 +26,15 @@
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.production.service.impl.ProductionProductMainServiceImpl;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -770,7 +765,7 @@
                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProductMapper.insert(salesLedgerProduct);
                // æ·»åŠ ç”Ÿäº§æ•°æ®
                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
//                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
            }
        }
    }

 src/main/resources/mapper/production/ProductParameterMapper.xml

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

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductParameter">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="parameter_item" property="parameterItem" />
        <result column="type" property="type" />
        <result column="unit" property="unit" />
        <result column="parameter_format" property="parameterFormat" />
        <result column="dict" property="dict" />
        <result column="is_required" property="isRequired" />
        <result column="create_time" property="createTime" />
        <result column="create_user" property="createUser" />
        <result column="update_time" property="updateTime" />
        <result column="update_user" property="updateUser" />
        <result column="tenant_id" property="tenantId" />
    </resultMap>
    <select id="pageProductParameter" resultType="com.ruoyi.production.dto.ProductParameterDto">
        select pp.*
        from
        product_parameter pp
        <where>
            <if test="productParameter.code != null and productParameter.code != ''">
                and pp.code like concat('%',#{productParameter.code},'%')
            </if>
            <if test="productParameter.parameterItem != null and productParameter.parameterItem != ''">
                and pp.parameter_item like concat('%',#{productParameter.parameterItem},'%')
            </if>
            <if test="productParameter.type != null and productParameter.type != ''">
                and pp.type like concat('%',#{productParameter.type},'%')
            </if>
        </where>
        order by pp.id
    </select>

</mapper>

 src/main/resources/mapper/production/ProductProcessParameterMapper.xml

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

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductProcessParameter">
        <id column="id" property="id" />
        <result column="process_id" property="processId" />
        <result column="code" property="code" />
        <result column="parameter_item" property="parameterItem" />
        <result column="type" property="type" />
        <result column="unit" property="unit" />
        <result column="parameter_format" property="parameterFormat" />
        <result column="dict" property="dict" />
        <result column="value" property="value" />
        <result column="is_required" property="isRequired" />
        <result column="create_time" property="createTime" />
        <result column="create_user" property="createUser" />
        <result column="update_time" property="updateTime" />
        <result column="update_user" property="updateUser" />
        <result column="tenant_id" property="tenantId" />
    </resultMap>
    <select id="pageProductProcessParameter" resultType="com.ruoyi.production.dto.ProductProcessParameterDto">
        SELECT
            *
        FROM product_process_parameter
        WHERE 1=1
        <if test="productProcessParameter.code != null and productProcessParameter.code != ''">
            AND code LIKE concat('%',#{productProcessParameter.code},'%')
        </if>
        <if test="productProcessParameter.parameterItem != null and productProcessParameter.parameterItem != ''">
            AND parameter_item LIKE concat('%',#{productProcessParameter.parameterItem},'%')
        </if>
        <if test="productProcessParameter.processId != null and productProcessParameter.processId != ''">
            AND process_id = #{productProcessParameter.processId}
        </if>
    </select>

</mapper>

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -16,6 +16,7 @@
        select ppm.*,
        pwo.work_order_no as workOrderNo,
        pwo.status as workOrderStatus,
        pwo.total_investment as totalInvestment,
        u.nick_name as nickName,
        p.product_name as productName,
        pp.name as process,