Browse Source

[fix] 工程管理 采购管理

修改开发修改单查询集合数据方法:新增根据审核状态升序
修改开发修改单领料查询集合数据方法:新增根据审核状态升序
修改采购订单查询集合数据方法:新增根据审核状态升序
dev
liuxiaoxu 7 months ago
parent
commit
22c5d4469a
  1. 2
      ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
  2. 2
      ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml
  3. 2
      ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml

2
ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml

@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null "> and user_id = #{userId}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
</where>
order by create_time desc
order by audit_status asc ,create_time desc
</select>
<select id="selectErpDevelopModifyorderById" parameterType="Long" resultMap="ErpDevelopModifyorderResult">

2
ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderPickingMapper.xml

@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pickUser != null and pickUser != ''"> and pick_user = #{pickUser}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
order by create_time desc
order by audit_status asc ,create_time desc
</select>
<select id="selectErpDevelopModifyorderPickingById" parameterType="Long" resultMap="ErpDevelopModifyorderPickingResult">

2
ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml

@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pur.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
order by pur.create_time desc
order by pur.audit_status asc, pur.create_time desc
</select>
<select id="selectPurchaseOrderById" parameterType="Long" resultMap="PurchaseOrderResult">

Loading…
Cancel
Save