[CODE]: 仓储业务添加筛选条件

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -185,10 +185,10 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         if (StringUtils.isNull(tWarehouseAgreement.getfId())) {
             // 如果是新数据
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
+            tWarehouseAgreement.setCreateTime(new Date());
             // 业务编码
             String billNo = billnoSerialServiceImpl.getBillNo("WA", new Date());
             tWarehouseAgreement.setfBillno(billNo);
-            tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
             tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
             tWarehouseAgreement.setfStatus("1"); // 停用

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -233,9 +233,11 @@
             <if test="fBankcorpid != null ">and bill.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and bill.f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
+            <if test="fItemsStatus != null  and fItemsStatus != ''">and bill.f_items_status = #{fItemsStatus}</if>
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
         </where>
-            ${params.dataScope}
+            ORDER BY bill.f_bsdate  DESC
+        ${params.dataScope}
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">