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

2c2c2c
1 parent 123f2bc9
Showing 5 changed files with 48 additions and 65 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderAssociationServiceAsync.java
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
@@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @TableName(value ="gar_order_match_ask")
 @EqualsAndHashCode
 @ToString
-public class GarOrderMatchAsk extends BaseEntity implements Serializable {
+public class GarOrderMatchAsk implements Serializable {
     /**
      * 
      */
@@ -107,7 +107,7 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private String garOrderHandlerCompanyName;
     /**
-     * 车牌号
+     * 接收车牌号
      */
     private String garHandlerCarCode;
@@ -183,10 +183,10 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     /**
-     * 到达处置场所车牌号
+     * 装车车牌号
      */
-    @Excel(name = "到达处置场所车牌号")
-    private String garHandlerCarCodeEnd;
+    @Excel(name = "车牌号")
+    private String garCarCode;
     /**
@@ -201,6 +201,14 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     @Excel(name = "投放点管理员联系方式")
     private String dropCustodianPhone;
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     public Date getGarOrderTime() {
         return garOrderTime;
     }
@@ -233,12 +241,12 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
         this.dropCarNum = dropCarNum;
     }
-    public String getGarHandlerCarCodeEnd() {
-        return garHandlerCarCodeEnd;
+    public String getGarCarCode() {
+        return garCarCode;
     }
-    public void setGarHandlerCarCodeEnd(String garHandlerCarCodeEnd) {
-        this.garHandlerCarCodeEnd = garHandlerCarCodeEnd;
+    public void setGarCarCode(String garCarCode) {
+        this.garCarCode = garCarCode;
     }
     @TableField(exist = false)
@@ -113,9 +113,9 @@ public class GarOrderAssociationServiceAsync {
                 garOrderMatchAsk.setGarOrderType("1");
                 log.info("{} 车辆卸车地点不在处置场所 {} 区域内", carPlate, garOrderMatchAsk.getDisposalSiteName());
                 if(garOrderMatchAsk.getGarRemark()==null){
-                    garOrderMatchAsk.setGarRemark(carPlate + "车辆卸车地点不在处置场所 " + garOrderMatchAsk.getDisposalSiteName() + " 不在区域内");
+                    garOrderMatchAsk.setGarRemark(carPlate + "车辆卸车地点未在处置场所<" + garOrderMatchAsk.getDisposalSiteName() + ">区域内");
                 }else{
-                    garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()+";"+carPlate + "车辆卸车地点不在处置场所 " + garOrderMatchAsk.getDisposalSiteName() + " 不在区域内");
+                    garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()+";"+carPlate + "车辆卸车地点未在处置场所<" + garOrderMatchAsk.getDisposalSiteName() + ">区域内");
                 }
             }
@@ -605,6 +605,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
+    @Transactional
     public String uploadImageUrlByType(UploadDto dto) {
         List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
         for (String imageUrl : dto.getImageUrls()) {
@@ -618,7 +619,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         GarOrder order = getById(dto.getGarOrderId());
         //判断是否已开始装车
         if (dto.getType() == 1) {
-            if (!order.getGarAskStatus().equals("1")) {
+            if (order.getGarAskStatus() == null || !order.getGarAskStatus().equals("1")) {
                 //修改是否已开始装车状态，为已装车
                 order.setGarAskStatus("1");
                 updateById(order);
@@ -631,6 +632,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     GarOrderMatchAsk garOrderMatchAsk = new GarOrderMatchAsk();
                     garOrderMatchAsk.setGarOrderPhone(orderDetailVo.getGarOrderContactTel());
                     garOrderMatchAsk.setGarOrderName(orderDetailVo.getGarOrderContactName());
+                    // 查询当前日期+行政区划代码的流水编号
                     garOrderMatchAsk.setGarOrderNumber(generateAssociationNumber(order.getGarOrderAddress()));
                     garOrderMatchAsk.setGarOrderId(dto.getGarOrderId());
                     garOrderMatchAsk.setGarOrderTime(order.getGarCreateTime());
@@ -653,16 +655,27 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     askService.save(garOrderMatchAsk);
                 }
             }
-            // 查询当前日期+行政区划代码的流水编号
+
             LambdaQueryWrapper<GarOrderMatchAsk> qw = new LambdaQueryWrapper<>();
             qw.eq(GarOrderMatchAsk::getGarOrderId, dto.getGarOrderId());
             List<GarOrderMatchAsk> askList = askService.list(qw);
             for (GarOrderMatchAsk garOrderMatchAsk : askList) {
                 //每次只判断一次
-                if(garOrderMatchAsk.getGarOrderType()==null){
+                if(garOrderMatchAsk.getGarOrderType()==null && garOrderMatchAsk.getDropPointId() != 0){
                     //判断车辆上传装车图片时是否在投放点区域内
                     garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dto.getCarPlate(), garOrderMatchAsk, dto);
+                    break;
+                }
+            }
+            for (GarOrderMatchAsk garOrderMatchAsk : askList) {
+                //判断该车是否已经结束上一趟次的配送
+                if(garOrderMatchAsk.getGarCarCode()!=null && garOrderMatchAsk.getGarCarCode().equals(dto.getCarPlate()) && garOrderMatchAsk.getGarUpdateTime() == null){
+                    break;
+                }
+                //每次只判断一次
+                if(garOrderMatchAsk.getGarCarCode()==null && garOrderMatchAsk.getGarUpdateTime() == null){
                     garOrderMatchAsk.setGarCreateTime(new Date());
+                    garOrderMatchAsk.setGarCarCode(dto.getCarPlate());
                     askService.updateById(garOrderMatchAsk);
                     break;
                 }
@@ -670,51 +683,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
-//        //上传装车图片生成订单关联台账,卸车图片结束订单关联台账
-//        if(dto.getType() == 1){
-//            // 获取当前日期，格式为YYYYMMDD
-//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-//            String associationNumber = dateFormat.format(new Date()) + "430101";
-//            // 查询当前日期+行政区划代码的流水编号
-//            int sequenceNumber = garOrderAssociationService.queryAssociationNumber(associationNumber);
-//            // 流水编号自增
-//            sequenceNumber++;
-//            // 组合生成最终的编号
-//            associationNumber = associationNumber + String.format("%06d", sequenceNumber); // 保证6位数字，不足前面补0
-//
-//            //新增趟次关联台账
-//            GarOrderMatchAsk garOrderMatchAsk = new GarOrderMatchAsk();
-//            garOrderMatchAsk.setGarOrderPhone(orderDetailVo.getGarOrderContactTel());
-//            garOrderMatchAsk.setGarOrderNumber(associationNumber);
-//            garOrderMatchAsk.setGarCreateTime(new Date());
-//
-//            //获取处置场所
-//            List<GarOrderMatchDisposal> disposalList = garOrderMatchDisposalService.queryObjByOrderId(dto.getGarOrderId());
-//            garOrderMatchAsk.setDisposalId(disposalList.get(0).getGarOrderDisposalId());
-//            garOrderMatchAsk.setDisposalSiteName(disposalList.get(0).getGarOrderDisposalCompanyName());
-//
-//            List<DropPointInfo> dropPointInfoList = dropPointInfoService.selectDropPointInfoListByPhone(garOrderMatchAsk.getGarOrderPhone());
-//
-//            if(!dropPointInfoList.isEmpty()){
-//                //判断车辆上传装车图片时是否在投放点区域内
-//                garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dropPointInfoList.get(0), dto.getCarPlate(),  garOrderMatchAsk,dto);
-//                garOrderMatchAsk.setDropPointId(Integer.parseInt(dropPointInfoList.get(0).getId().toString()));
-//                garOrderMatchAsk.setDropPointName(dropPointInfoList.get(0).getDropPointName());
-//            }
-//            garOrderMatchAsk.setGarCreateBy(dto.getDriver());
-//
-//        }else{
-//            //修改趟次关联台账
-//            Long id = redisCache.getCacheObject(dto.getGarOrderId());
-//            if(id==null){
-//
-//            }
-//            GarOrderAssociation garOrderAssociation = garOrderAssociationService.selectGarOrderAssociationById(id);
-//
-//            garOrderAssociationService.updateGarOrderAssociation(garOrderAssociation);
-//        }
-
-
         garOrderImageService.saveBatch(garOrderImages);
         return "上传成功！";
     }
@@ -1484,7 +1452,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 BeanUtils.copyProperties(dto, garOrderMatchAsk);
                 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
                 garOrderMatchAsk.setGarUpdateTime(new Date());
-                garOrderMatchAsk.setGarHandlerCarCodeEnd(dto.getGarHandlerCarCode());
                 garOrderAssociationServiceAsync.isWithinDisposal(dto.getGarHandlerCarCode(), garOrderMatchAsk, dto);
                 askService.updateById(garOrderMatchAsk);
                 // 保存图片url
@@ -52,10 +52,18 @@
         <result property="garOrderNumber"    column="gar_order_number"    />
         <result property="garOrderPhone"    column="gar_order_phone"    />
         <result property="garOrderName"    column="gar_order_name"    />
+        <result property="dropCustodianPhone"    column="drop_custodian_phone"    />
+        <result property="dropAddress"    column="drop_address"    />
+        <result property="dropCarNum"    column="drop_car_num"    />
+        <result property="garCarCode"    column="gar_car_code"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="garOrderTime"    column="gar_order_time"    />
+
     </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 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,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
     </sql>
     <select id="selectGarOrderMatchAskList" parameterType="GarOrderMatchAsk" resultMap="GarOrderMatchAskResult">
@@ -122,9 +122,9 @@
       <el-table-column label="运输驾驶员" align="center" prop="garOrderHandlerName" />
       <el-table-column label="车牌号" align="center" prop="garHandlerCarCode" />
       <el-table-column label="处理场所" align="center" prop="disposalSiteName" />
-      <el-table-column label="接收时间" align="center" prop="garCreateTime" width="180">
+      <el-table-column label="接收时间" align="center" prop="garUpdateTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.garCreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.garUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="接收量(吨)" align="center" prop="garReceptionQuantity" />
@@ -211,7 +211,7 @@
           </tr>
           <tr>
             <td>车牌号</td>
-            <td>{{ form.garHandlerCarCode || '-' }}</td>
+            <td>{{ form.garCarCode || '-' }}</td>
             <td>驾驶员</td>
             <td>{{ form.garOrderHandlerName || '-' }}</td>
           </tr>
@@ -230,7 +230,7 @@
           </tr>
           <tr>
             <td>接收车牌</td>
-            <td>{{ form.garHandlerCarCodeEnd || '-' }}</td>
+            <td>{{ form.garHandlerCarCode || '-' }}</td>
             <td>接收量(吨)</td>
             <td>{{ form.garReceptionQuantity || '-' }}</td>
           </tr>