物资车入场申请

huimv-receive/src/main/java/com/huimv/receive/entity/vo/CleanAndDryVo2.java

@@ -93,25 +93,7 @@ public class CleanAndDryVo2 {
 
     private Integer imgStatus;
     private Integer type;
-
-
     private String cleanTime;
     private String dryTime;
     private String dryTem;
-
-    private Integer goodsType;
-
-    private String goodsTypeName;
-
-    private String goodsNums;
-
-    private String goodsName;
-
-    private String goodsUnit;
-
-    private Integer billAdmission;
-
-    private String currentLocation;
-
-    private Integer currentLocationId;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/vo/CleanDryGoodsVo.java

@@ -30,4 +30,8 @@ public class CleanDryGoodsVo {
 
     private Integer type;
 
+    private Integer billStatus;
+
+    private Integer imgStatus;
+
 }

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillCleanMapper.xml

@@ -51,7 +51,7 @@
     </select>
 
     <select id="CleanAndDry" resultType="com.huimv.receive.entity.vo.CleanAndDryVo2">
-        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        select *,null,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
         and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -121,7 +121,7 @@ ORDER BY
     DATE(sub_date)
     </select>
     <select id="listCleanDryGoods" resultType="com.huimv.receive.entity.vo.CleanDryGoodsVo">
-        select id,vistitType,test_location,admission_user_name,carNum,cleanTime,null as 'dryTime',check_date,subDate,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        select id,vistit_Type,test_location,admission_user_name,car_num,clean_time,null as 'dryTime',check_date,sub_date,bill_status,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
         and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -131,7 +131,7 @@ ORDER BY
             #{statu}
         </foreach>
         union all
-        select id,vistitType,test_location,admission_user_name,carNum,null as 'cleanTime',dryTime,check_date,subDate,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
+        select id,vistit_Type,test_location,admission_user_name,car_num,null as 'cleanTime',dry_time,check_date,sub_date,bill_status,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
         and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -141,7 +141,7 @@ ORDER BY
             #{statu}
         </foreach>
         union all
-        select id,'5' as 'vistitType',current_location as 'testLocation',admission_user_name,carNum,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,subDate,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
+        select id,'5' as 'vistitType',current_location as 'testLocation',admission_user_name,car_num,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,sub_date,status as 'billStatus' ,null,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
         and current_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}