Explorar o código

关联批次,新增查看采购订单失效(已删除)的批次

liyg %!s(int64=2) %!d(string=hai) anos
pai
achega
90874f21d8

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/DilBatchMapper.xml

@@ -399,7 +399,7 @@
     ON DB.BATCH_ID=APO.BATCH_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID=DB.MATERIAL_ID
-    where DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL AND RM.MATERIAL_NAME IS NOT NULL
+    where DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL AND RM.MATERIAL_NAME IS NOT NULL AND APO.DELETED = 0
     <if test="con!=null">
       and (instr(DB.RESULT_FOREIGN_SHIP_NAME , #{con}) > 0  or instr(RM.MATERIAL_NAME , #{con}) > 0 )
     </if>
@@ -460,6 +460,7 @@
         ADN.DELETED = 0
         AND DB.INSERT_UPDATE_REMARK='人工录入'
         AND APO.PURCHASE_ORDER_NO is null
+        OR APO.DELETED = 1
         <if test="materialName!=null and materialName!=''.toString()">
         AND   RM.MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{materialName},'%'))
         </if>