feat:1.生产订单增加领用弹窗(数据输入和输出) 2.对应领用出库

liding

12 小时以前 cf984315319d060fa55b1f35cd95403690a30762

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -64,6 +64,7 @@
        pm.model,
        si.remark,
        pm.unit,
        pm.uid_no as uidNo,
        p.product_name
        from stock_inventory si
        left join product_model pm on si.product_model_id = pm.id
@@ -94,6 +95,7 @@
        select sir.*,si.qualitity as current_stock,
        pm.model,
        pm.unit,
        pm.uid_no as uidNo,
        p.product_name,
        su.nick_name as create_by
        from
@@ -199,14 +201,16 @@
    </select>

    <select id="selectStorageProductCountByDate" resultType="int">
        SELECT COUNT(*)
        FROM (SELECT create_time
        SELECT SUM(total_count)
        FROM (SELECT COUNT(*) as total_count
              FROM stock_inventory
              WHERE create_time &gt;= #{startDate}
                AND create_time &lt;= #{endDate}
              UNION ALL
              SELECT create_time
              FROM stock_uninventory) combined
        WHERE create_time &gt;= #{startDate}
          AND create_time &lt;= #{endDate}
              SELECT COUNT(*) as total_count
              FROM stock_uninventory
              WHERE create_time &gt;= #{startDate}
                AND create_time &lt;= #{endDate}) AS combined_counts
    </select>

    <select id="selectDailyStockInCounts" resultType="java.util.Map">
@@ -235,4 +239,22 @@
        ORDER BY DATE(sor.create_time) ASC
    </select>

    <select id="getStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
        SELECT
        p.product_name,
        pm.model,
        pm.unit,
        si.*
        FROM
        product_model pm
        LEFT JOIN product p ON p.id = pm.product_id
        LEFT JOIN stock_inventory si ON si.product_model_id = pm.id
        WHERE
        pm.id IN
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        ORDER BY pm.id
    </select>

</mapper>