电子联单bug 修复，导出联单，打印联单

2c2c2c
1 parent 3705bf27
Showing 3 changed files with 4 additions and 7 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-ui/src/views/ask/ask/index.vue
@@ -681,6 +681,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     askService.updateById(garOrderMatchAsk);
                     break;
                 }
+                dropCarNum = garOrderMatchAsk.getDropCarNum();
             }
         }
@@ -43,7 +43,6 @@
         <result property="garUpdateBy"    column="gar_update_by"    />
         <result property="garRemark"    column="gar_remark"    />
         <result property="garCarryingWeight"    column="gar_carrying_weight"    />
-        <result property="garReceptionQuantity"    column="gar_reception_quantity"    />
         <result property="dropPointId"    column="drop_point_id"    />
         <result property="dropPointName"    column="drop_point_name"    />
         <result property="garOrderType"    column="gar_order_type"    />
@@ -63,7 +62,7 @@
     </resultMap>
     <sql id="selectGarOrderMatchAskVo">
-        select gar_id,gar_order_id,gar_order_handler_tel,gar_order_handler_name,gar_order_container_volume,gar_order_handler_id,gar_handler_car_code,gar_order_handler_company_id,gar_order_handler_company_name,gar_create_time,gar_update_time,gar_create_by,gar_update_by,gar_remark,gar_carrying_weight,gar_reception_quantity,drop_point_id,drop_point_name,gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,gar_order_name,drop_custodian_phone,drop_address,drop_car_num,gar_car_code,create_time,create_by,update_time,update_by,gar_order_time from gar_order_match_ask
+        select gar_id,gar_order_id,gar_order_handler_tel,gar_order_handler_name,gar_order_container_volume,gar_order_handler_id,gar_handler_car_code,gar_order_handler_company_id,gar_order_handler_company_name,gar_create_time,gar_update_time,gar_create_by,gar_update_by,gar_remark,gar_carrying_weight,drop_point_id,drop_point_name,gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,gar_order_name,drop_custodian_phone,drop_address,drop_car_num,gar_car_code,create_time,create_by,update_time,update_by,gar_order_time from gar_order_match_ask
     </sql>
     <select id="selectGarOrderMatchAskList" parameterType="GarOrderMatchAsk" resultMap="GarOrderMatchAskResult">
@@ -83,7 +82,6 @@
             <if test="garUpdateBy != null  and garUpdateBy != ''"> and gar_update_by = #{garUpdateBy}</if>
             <if test="garRemark != null  and garRemark != ''"> and gar_remark = #{garRemark}</if>
             <if test="garCarryingWeight != null "> and gar_carrying_weight = #{garCarryingWeight}</if>
-            <if test="garReceptionQuantity != null "> and gar_reception_quantity = #{garReceptionQuantity}</if>
             <if test="dropPointName != null  and dropPointName != ''"> and drop_point_name like concat('%', #{dropPointName}, '%')</if>
             <if test="garOrderType != null  and garOrderType != ''"> and gar_order_type = #{garOrderType}</if>
             <if test="disposalId != null  and disposalId != ''"> and disposal_id = #{disposalId}</if>
@@ -117,7 +115,6 @@
             <if test="garUpdateBy != null">gar_update_by,</if>
             <if test="garRemark != null">gar_remark,</if>
             <if test="garCarryingWeight != null">gar_carrying_weight,</if>
-            <if test="garReceptionQuantity != null">gar_reception_quantity,</if>
             <if test="dropPointId != null">drop_point_id,</if>
             <if test="dropPointName != null">drop_point_name,</if>
             <if test="garOrderType != null">gar_order_type,</if>
@@ -143,7 +140,6 @@
             <if test="garUpdateBy != null">#{garUpdateBy},</if>
             <if test="garRemark != null">#{garRemark},</if>
             <if test="garCarryingWeight != null">#{garCarryingWeight},</if>
-            <if test="garReceptionQuantity != null">#{garReceptionQuantity},</if>
             <if test="dropPointId != null">#{dropPointId},</if>
             <if test="dropPointName != null">#{dropPointName},</if>
             <if test="garOrderType != null">#{garOrderType},</if>
@@ -172,7 +168,6 @@
             <if test="garUpdateBy != null">gar_update_by = #{garUpdateBy},</if>
             <if test="garRemark != null">gar_remark = #{garRemark},</if>
             <if test="garCarryingWeight != null">gar_carrying_weight = #{garCarryingWeight},</if>
-            <if test="garReceptionQuantity != null">gar_reception_quantity = #{garReceptionQuantity},</if>
             <if test="dropPointId != null">drop_point_id = #{dropPointId},</if>
             <if test="dropPointName != null">drop_point_name = #{dropPointName},</if>
             <if test="garOrderType != null">gar_order_type = #{garOrderType},</if>
@@ -190,7 +190,8 @@
             <td>联系电话</td>
             <td>{{ form.garOrderPhone || '-' }}</td>
             <td>车次</td>
-            <td>{{ form.dropCarNum }}/{{ dropCarNum }}</td>
+            <td v-if="form.dropCarNum!==0">{{ form.dropCarNum }}/{{ dropCarNum }}</td>
+            <td v-if="form.dropCarNum===0">-</td>
           </tr>
           <tr>
             <td>投放地址</td>