Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

15 小时以前 372d212912401059defe5fe83379c50d1033c06e

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

@@ -232,7 +232,7 @@
                and po.create_time < #{endTime}
            </if>
        </where>
        order by po.id desc
        order by po.nps_no desc
        limit #{offset}, #{size}
    </select>


 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -30,7 +30,7 @@
        pm.model as specification_model,
        pm.unit as unit,
        CASE
        WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >0 THEN 1
        WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
        ELSE 0
        END as has_sufficient_stock,
        (IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) as no_quantity,