1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -531,7 +531,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     @TableField(exist = false)
     private String cargoRights;
-
+    /**
+     * 打印标识
+     */
+    @TableField(exist = false)
+    private String printFlag;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2826,6 +2826,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("searchKeyWord", warehouseInOutInfo.getSearchKeyWord());
         pageView.put("startDate", warehouseInOutInfo.getStartDate());
         pageView.put("endDate", warehouseInOutInfo.getEndDate());
+        pageView.put("printFlag", warehouseInOutInfo.getPrintFlag());
         pageView.put("printStartDate", warehouseInOutInfo.getPrintStartDate());
         pageView.put("printEndDate", warehouseInOutInfo.getPrintEndDate());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -40,6 +40,9 @@
             AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") <=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
+        <if test="printFlag != null and printFlag != ''">
+            AND w.in_out_type !='折转出库' AND w.in_out_type !='折转入库'
+        </if>
         <if test="printStartDate != null">
             AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%i%s") &gt;=
             DATE_FORMAT(#{printStartDate},"%Y%m%d%H%i%s"))
@@ -172,6 +175,9 @@
                 and wbi.person_phone = #{phone}
             </if>
         </if>
+        <if test="printFlag != null and printFlag != ''">
+            AND w.in_out_type !='折转出库' AND w.in_out_type !='折转入库'
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))