zss
19 小时以前 367402f05144b484390568227d3a6a1d40778a14
代码注释完善
已修改6个文件
25 ■■■■ 文件已修改
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/pojo/ProductOrder.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/pojo/ProductProcess.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductOrderMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -55,5 +55,6 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate deliveryDate;
    //是否发货(台账页面颜色控制)
    private Boolean isFh;
}
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -17,10 +17,6 @@
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
    IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
    /**
     * 根据订单ID查询工单报工
     */
     ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);
    List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -30,12 +30,13 @@
    /**
     * 销售台账产品id(sales_ledger_product)
     */
    @ApiModelProperty(value = "销售台账产品id")
    private Long saleLedgerProductId;
    /**
     * 销售台账产品id(sales_ledger_product)
     * 产品规格id
     */
    @ApiModelProperty(value = "销售台账产品id")
    @ApiModelProperty(value = "产品规格id")
    private Long productModelId;
    /**
src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -70,7 +71,7 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    @ApiModelProperty(value ="是否质检")
    private Boolean isQuality;
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -141,6 +141,7 @@
    private Integer deliveryDaysDiff;
    @TableField(exist = false)
    //是否发货(台账页面颜色控制)
    private Boolean isFh;
}
src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -62,17 +62,6 @@
            </if>
        </where>
    </select>
    <select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
        select po.*,
               pwo.work_order_no,
               pwo.report_work,
               pwo.status,
               pwo.quantity,
               pwo.plan_quantity
        from product_order po
                 left join product_work_order pwo on po.id = pwo.product_order_id
        where po.id = #{c.id}
    </select>
    <select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
        select pr.*
        from process_route pr