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

2c2c2c
1 parent a9a1fac9
Showing 2 changed files with 5 additions and 7 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-ui/src/views/ask/ask/index.vue
@@ -636,7 +636,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     garOrderMatchAsk.setGarOrderNumber(generateAssociationNumber(order.getGarOrderAddress()));
                     garOrderMatchAsk.setGarOrderId(dto.getGarOrderId());
                     garOrderMatchAsk.setGarOrderTime(order.getGarCreateTime());
-                    garOrderMatchAsk.setDropCarNum(order.getGarRealCarCount());
+
                     //获取处置场所
                     List<GarOrderMatchDisposal> disposalList = garOrderMatchDisposalService.queryObjByOrderId(dto.getGarOrderId());
@@ -667,6 +667,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     break;
                 }
             }
+            int dropCarNum = 0;
             for (GarOrderMatchAsk garOrderMatchAsk : askList) {
                 //判断该车是否已经结束上一趟次的配送
                 if(garOrderMatchAsk.getGarCarCode()!=null && garOrderMatchAsk.getGarCarCode().equals(dto.getCarPlate()) && garOrderMatchAsk.getGarUpdateTime() == null){
@@ -674,6 +675,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 }
                 //每次只判断一次
                 if(garOrderMatchAsk.getGarCarCode()==null && garOrderMatchAsk.getGarUpdateTime() == null){
+                    garOrderMatchAsk.setDropCarNum(++dropCarNum);
                     garOrderMatchAsk.setGarCreateTime(new Date());
                     garOrderMatchAsk.setGarCarCode(dto.getCarPlate());
                     askService.updateById(garOrderMatchAsk);
@@ -190,7 +190,7 @@
             <td>联系电话</td>
             <td>{{ form.garOrderPhone || '-' }}</td>
             <td>车次</td>
-            <td>{{ dropCarNum }}/{{ form.dropCarNum || '-' }}</td>
+            <td>{{ form.dropCarNum }}/{{ dropCarNum }}</td>
           </tr>
           <tr>
             <td>投放地址</td>
@@ -413,11 +413,7 @@ export default {
       this.dropCarNum = 0;
       const garId = row.garId || this.ids
       listAsk({"garOrderId":row.garOrderId}).then(response => {
-        for(let i = 0;i<response.rows.length;i++){
-          if(response.rows[i].garHandlerCarCode!=null && response.rows[i].garHandlerCarCode !== ''){
-            this.dropCarNum++;
-          }
-        }
+        this.dropCarNum = response.total;
       });
       getAsk(garId).then(response => {
         this.form = response.data;