소스 검색

大中型产品设置了应收款则进入收款预警需认领实收款

wucl 10 달 전
부모
커밋
82ce396a85
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      dao/src/main/resources/mapper/MajorProductionMapper.xml
  2. 1 1
      dao/src/main/resources/mapper/ProductionOutWarehouseMapper.xml

+ 1 - 0
dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -670,6 +670,7 @@
             m.deleted = 0
           AND	mp.deleted = 0
           AND m.client_manager_id = #{vo.clientManagerId}
+            and off.production_should_amount>0
         <if test="vo!=null and vo.name!=null and vo.name !=''">
             and mp.name like concat ('%',#{vo.name},'%')
         </if>

+ 1 - 1
dao/src/main/resources/mapper/ProductionOutWarehouseMapper.xml

@@ -91,7 +91,7 @@
             and pow.department_check_state is null
         </if>
         <if test="vo!=null and vo.nCode!=null and (vo.nCode=='REPORT_OUT_FINANCE_CHECK' or vo.nCode=='LETTER_OUT_FINANCE_CHECK')">
-            and pow.department_check_state = '审核通过'
+            and (pow.department_check_state = '审核通过' or pow.department_check_state is null)
             and pow.finance_check_state is null
         </if>
         <if test="keyword!=null and keyword!='' ">