feat: 生产订单和工单增加优先级和批号字段

yuan

9 小时以前 6a82db6be22da10b24a4c5bb7754760a95a48d7c

feat: 生产订单和工单增加优先级和批号字段

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

@@ -46,6 +46,19 @@
    private Long routeId;

    /**
     * 优先级
     */
    @ApiModelProperty(value = "优先级")
    private String priority;

    /**
     * 优先级
     */
    @ApiModelProperty(value = "生产批号")
    private String lotNo;


    /**
     * 生产订单号
     */
    @ApiModelProperty(value = "生产订单号")

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

@@ -41,6 +41,18 @@
    private Long productOrderId;

    /**
     * 优先级
     */
    @ApiModelProperty(value = "优先级")
    private String priority;

    /**
     * 生产批号
     */
    @ApiModelProperty(value = "生产批号")
    private String lotNo;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")

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

@@ -111,6 +111,8 @@
                String workOrderNoStr = "GD" + String.format("%s%03d", datePrefix, sequenceNumber);
                ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                productWorkOrder.setPriority(productOrder.getPriority());
                productWorkOrder.setLotNo(productOrder.getLotNo());
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());

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

@@ -160,6 +160,8 @@
            ProductWorkOrder productWorkOrder = new ProductWorkOrder();
            productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
            productWorkOrder.setProductOrderId(productProcessRouteItem.getProductOrderId());
            productWorkOrder.setLotNo(productOrder.getLotNo());
            productWorkOrder.setPriority(productOrder.getPriority());
            productWorkOrder.setPlanQuantity(productOrder.getQuantity());
            productWorkOrder.setWorkOrderNo(workOrderNoStr);
            productWorkOrder.setStatus(1);

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

@@ -48,6 +48,7 @@
            <if test="c.productOrderId != null and c.productOrderId != ''">
               and pwo.product_order_id = #{c.productOrderId}
            </if>
        order by pwo.priority
    </select>
    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
        SELECT