添加反馈列表查询条件

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

@@ -194,6 +194,12 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     @TableField(exist = false)
     private String searchType;
 
+    /**
+     * 反馈查询标识
+     */
+    @TableField(exist = false)
+    private String feedbackFlag;
+
     /**
      * 模糊查询
      */

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

@@ -58,6 +58,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         pageView.put("pageSize", tranProcessInfo.getPageSize());
         pageView.put("currentPage", tranProcessInfo.getCurrentPage());
         pageView.put("tranTypeKey",tranProcessInfo.getTranTypeKey());
+        pageView.put("feedbackFlag",tranProcessInfo.getFeedbackFlag());
         // 查询汽运调度总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<TranProcessInfo> dataList = baseMapper.getListByCondition(pageView);

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

@@ -170,6 +170,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
         } else {
             //判断出入库
+            //常用库入库
             if ("2".equals(warehouseInOutInfo.getInOutFlag()) && "1".equals(warehouseBaseInfo.getWarehouseType())) {
                 //判断是否有货
                 if (warehouseBaseInfo != null) {
@@ -200,7 +201,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                     }
                 }
-            } else if ("1".equals(warehouseInOutInfo.getInOutFlag()) && "1".equals(warehouseBaseInfo.getWarehouseType())) {
+            }
+            //常用库出库
+            else if ("1".equals(warehouseInOutInfo.getInOutFlag()) && "1".equals(warehouseBaseInfo.getWarehouseType())) {
                 //判断是否有货
                 if (warehouseBaseInfo != null) {
                     //  查询库位
@@ -238,7 +241,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     throw new YException(YExceptionEnum.WAREHOUSE_NO_ERROR);
                 }
             }
-
             //插入记录
             if (StringUtils.isEmpty(warehouseInOutInfo.getId())) {
                 warehouseInOutInfo.setId(IdGenerator.generateUUID());

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

@@ -19,6 +19,14 @@
                 AND p.process_status_flag = '3'
             </if>
         </if>
+        <if test="feedbackFlag != null and feedbackFlag != ''">
+            <if test="feedbackFlag == 1">
+                AND p.feedback_status_flag = '1'
+            </if>
+            <if test="feedbackFlag == 2">
+                AND p.feedback_status_flag = '3'
+            </if>
+        </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
             <if test="tranTypeKey == 1">
                 AND p.tran_type_key = '1'
@@ -79,6 +87,14 @@
                 AND p.process_status_flag = '3'
             </if>
         </if>
+        <if test="feedbackFlag != null and feedbackFlag != ''">
+            <if test="feedbackFlag == 1">
+                AND p.feedback_status_flag = '1'
+            </if>
+            <if test="feedbackFlag == 2">
+                AND p.feedback_status_flag = '3'
+            </if>
+        </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
             <if test="tranTypeKey == 1">
                 AND p.tran_type_key = '1'