youxiw2000 / trash · Commits

Commit 3447dcb8a81458e96edc1caeb27f21323823be4c

Authored by 2c2c2c
1 parent 123f2bc9
build: skipped

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

Inline Side-by-side
Showing 5 changed files with 48 additions and 65 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
  View file @3447dcb
... ... @@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
22 22 @TableName(value ="gar_order_match_ask")
23 23 @EqualsAndHashCode
24 24 @ToString
25   -public class GarOrderMatchAsk extends BaseEntity implements Serializable {
  25 +public class GarOrderMatchAsk implements Serializable {
26 26 /**
27 27 *
28 28 */
... ... @@ -107,7 +107,7 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
107 107 private String garOrderHandlerCompanyName;
108 108  
109 109 /**
110   - * 车牌号
  110 + * 接收车牌号
111 111 */
112 112 private String garHandlerCarCode;
113 113  
... ... @@ -183,10 +183,10 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
183 183  
184 184  
185 185 /**
186   - * 到达处置场所车牌号
  186 + * 装车车牌号
187 187 */
188   - @Excel(name = "到达处置场所车牌号")
189   - private String garHandlerCarCodeEnd;
  188 + @Excel(name = "车牌号")
  189 + private String garCarCode;
190 190  
191 191  
192 192 /**
... ... @@ -201,6 +201,14 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
201 201 @Excel(name = "投放点管理员联系方式")
202 202 private String dropCustodianPhone;
203 203  
  204 + /** 更新时间 */
  205 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  206 + private Date updateTime;
  207 +
  208 + /** 创建时间 */
  209 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  210 + private Date createTime;
  211 +
204 212 public Date getGarOrderTime() {
205 213 return garOrderTime;
206 214 }
... ... @@ -233,12 +241,12 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
233 241 this.dropCarNum = dropCarNum;
234 242 }
235 243  
236   - public String getGarHandlerCarCodeEnd() {
237   - return garHandlerCarCodeEnd;
  244 + public String getGarCarCode() {
  245 + return garCarCode;
238 246 }
239 247  
240   - public void setGarHandlerCarCodeEnd(String garHandlerCarCodeEnd) {
241   - this.garHandlerCarCodeEnd = garHandlerCarCodeEnd;
  248 + public void setGarCarCode(String garCarCode) {
  249 + this.garCarCode = garCarCode;
242 250 }
243 251  
244 252 @TableField(exist = false)
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderAssociationServiceAsync.java
  View file @3447dcb
... ... @@ -113,9 +113,9 @@ public class GarOrderAssociationServiceAsync {
113 113 garOrderMatchAsk.setGarOrderType("1");
114 114 log.info("{} 车辆卸车地点不在处置场所 {} 区域内", carPlate, garOrderMatchAsk.getDisposalSiteName());
115 115 if(garOrderMatchAsk.getGarRemark()==null){
116   - garOrderMatchAsk.setGarRemark(carPlate + "车辆卸车地点不在处置场所 " + garOrderMatchAsk.getDisposalSiteName() + " 不在区域内");
  116 + garOrderMatchAsk.setGarRemark(carPlate + "车辆卸车地点未在处置场所<" + garOrderMatchAsk.getDisposalSiteName() + ">区域内");
117 117 }else{
118   - garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()+";"+carPlate + "车辆卸车地点不在处置场所 " + garOrderMatchAsk.getDisposalSiteName() + " 不在区域内");
  118 + garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()+";"+carPlate + "车辆卸车地点未在处置场所<" + garOrderMatchAsk.getDisposalSiteName() + ">区域内");
119 119 }
120 120  
121 121 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @3447dcb
... ... @@ -605,6 +605,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
605 605 }
606 606  
607 607 @Override
  608 + @Transactional
608 609 public String uploadImageUrlByType(UploadDto dto) {
609 610 List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
610 611 for (String imageUrl : dto.getImageUrls()) {
... ... @@ -618,7 +619,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
618 619 GarOrder order = getById(dto.getGarOrderId());
619 620 //判断是否已开始装车
620 621 if (dto.getType() == 1) {
621   - if (!order.getGarAskStatus().equals("1")) {
  622 + if (order.getGarAskStatus() == null || !order.getGarAskStatus().equals("1")) {
622 623 //修改是否已开始装车状态，为已装车
623 624 order.setGarAskStatus("1");
624 625 updateById(order);
... ... @@ -631,6 +632,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
631 632 GarOrderMatchAsk garOrderMatchAsk = new GarOrderMatchAsk();
632 633 garOrderMatchAsk.setGarOrderPhone(orderDetailVo.getGarOrderContactTel());
633 634 garOrderMatchAsk.setGarOrderName(orderDetailVo.getGarOrderContactName());
  635 + // 查询当前日期+行政区划代码的流水编号
634 636 garOrderMatchAsk.setGarOrderNumber(generateAssociationNumber(order.getGarOrderAddress()));
635 637 garOrderMatchAsk.setGarOrderId(dto.getGarOrderId());
636 638 garOrderMatchAsk.setGarOrderTime(order.getGarCreateTime());
... ... @@ -653,16 +655,27 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
653 655 askService.save(garOrderMatchAsk);
654 656 }
655 657 }
656   - // 查询当前日期+行政区划代码的流水编号
  658 +
657 659 LambdaQueryWrapper<GarOrderMatchAsk> qw = new LambdaQueryWrapper<>();
658 660 qw.eq(GarOrderMatchAsk::getGarOrderId, dto.getGarOrderId());
659 661 List<GarOrderMatchAsk> askList = askService.list(qw);
660 662 for (GarOrderMatchAsk garOrderMatchAsk : askList) {
661 663 //每次只判断一次
662   - if(garOrderMatchAsk.getGarOrderType()==null){
  664 + if(garOrderMatchAsk.getGarOrderType()==null && garOrderMatchAsk.getDropPointId() != 0){
663 665 //判断车辆上传装车图片时是否在投放点区域内
664 666 garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dto.getCarPlate(), garOrderMatchAsk, dto);
  667 + break;
  668 + }
  669 + }
  670 + for (GarOrderMatchAsk garOrderMatchAsk : askList) {
  671 + //判断该车是否已经结束上一趟次的配送
  672 + if(garOrderMatchAsk.getGarCarCode()!=null && garOrderMatchAsk.getGarCarCode().equals(dto.getCarPlate()) && garOrderMatchAsk.getGarUpdateTime() == null){
  673 + break;
  674 + }
  675 + //每次只判断一次
  676 + if(garOrderMatchAsk.getGarCarCode()==null && garOrderMatchAsk.getGarUpdateTime() == null){
665 677 garOrderMatchAsk.setGarCreateTime(new Date());
  678 + garOrderMatchAsk.setGarCarCode(dto.getCarPlate());
666 679 askService.updateById(garOrderMatchAsk);
667 680 break;
668 681 }
... ... @@ -670,51 +683,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
670 683  
671 684 }
672 685  
673   -// //上传装车图片生成订单关联台账,卸车图片结束订单关联台账
674   -// if(dto.getType() == 1){
675   -// // 获取当前日期，格式为YYYYMMDD
676   -// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
677   -// String associationNumber = dateFormat.format(new Date()) + "430101";
678   -// // 查询当前日期+行政区划代码的流水编号
679   -// int sequenceNumber = garOrderAssociationService.queryAssociationNumber(associationNumber);
680   -// // 流水编号自增
681   -// sequenceNumber++;
682   -// // 组合生成最终的编号
683   -// associationNumber = associationNumber + String.format("%06d", sequenceNumber); // 保证6位数字，不足前面补0
684   -//
685   -// //新增趟次关联台账
686   -// GarOrderMatchAsk garOrderMatchAsk = new GarOrderMatchAsk();
687   -// garOrderMatchAsk.setGarOrderPhone(orderDetailVo.getGarOrderContactTel());
688   -// garOrderMatchAsk.setGarOrderNumber(associationNumber);
689   -// garOrderMatchAsk.setGarCreateTime(new Date());
690   -//
691   -// //获取处置场所
692   -// List<GarOrderMatchDisposal> disposalList = garOrderMatchDisposalService.queryObjByOrderId(dto.getGarOrderId());
693   -// garOrderMatchAsk.setDisposalId(disposalList.get(0).getGarOrderDisposalId());
694   -// garOrderMatchAsk.setDisposalSiteName(disposalList.get(0).getGarOrderDisposalCompanyName());
695   -//
696   -// List<DropPointInfo> dropPointInfoList = dropPointInfoService.selectDropPointInfoListByPhone(garOrderMatchAsk.getGarOrderPhone());
697   -//
698   -// if(!dropPointInfoList.isEmpty()){
699   -// //判断车辆上传装车图片时是否在投放点区域内
700   -// garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dropPointInfoList.get(0), dto.getCarPlate(), garOrderMatchAsk,dto);
701   -// garOrderMatchAsk.setDropPointId(Integer.parseInt(dropPointInfoList.get(0).getId().toString()));
702   -// garOrderMatchAsk.setDropPointName(dropPointInfoList.get(0).getDropPointName());
703   -// }
704   -// garOrderMatchAsk.setGarCreateBy(dto.getDriver());
705   -//
706   -// }else{
707   -// //修改趟次关联台账
708   -// Long id = redisCache.getCacheObject(dto.getGarOrderId());
709   -// if(id==null){
710   -//
711   -// }
712   -// GarOrderAssociation garOrderAssociation = garOrderAssociationService.selectGarOrderAssociationById(id);
713   -//
714   -// garOrderAssociationService.updateGarOrderAssociation(garOrderAssociation);
715   -// }
716   -
717   -
718 686 garOrderImageService.saveBatch(garOrderImages);
719 687 return "上传成功！";
720 688 }
... ... @@ -1484,7 +1452,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1484 1452 BeanUtils.copyProperties(dto, garOrderMatchAsk);
1485 1453 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
1486 1454 garOrderMatchAsk.setGarUpdateTime(new Date());
1487   - garOrderMatchAsk.setGarHandlerCarCodeEnd(dto.getGarHandlerCarCode());
1488 1455 garOrderAssociationServiceAsync.isWithinDisposal(dto.getGarHandlerCarCode(), garOrderMatchAsk, dto);
1489 1456 askService.updateById(garOrderMatchAsk);
1490 1457 // 保存图片url
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
  View file @3447dcb
... ... @@ -52,10 +52,18 @@
52 52 <result property="garOrderNumber" column="gar_order_number" />
53 53 <result property="garOrderPhone" column="gar_order_phone" />
54 54 <result property="garOrderName" column="gar_order_name" />
  55 + <result property="dropCustodianPhone" column="drop_custodian_phone" />
  56 + <result property="dropAddress" column="drop_address" />
  57 + <result property="dropCarNum" column="drop_car_num" />
  58 + <result property="garCarCode" column="gar_car_code" />
  59 + <result property="createTime" column="create_time" />
  60 + <result property="updateTime" column="update_time" />
  61 + <result property="garOrderTime" column="gar_order_time" />
  62 +
55 63 </resultMap>
56 64  
57 65 <sql id="selectGarOrderMatchAskVo">
58   - 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
  66 + 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
59 67 </sql>
60 68  
61 69 <select id="selectGarOrderMatchAskList" parameterType="GarOrderMatchAsk" resultMap="GarOrderMatchAskResult">
... ...
trash-ui/src/views/ask/ask/index.vue
  View file @3447dcb
... ... @@ -122,9 +122,9 @@
122 122 <el-table-column label="运输驾驶员" align="center" prop="garOrderHandlerName" />
123 123 <el-table-column label="车牌号" align="center" prop="garHandlerCarCode" />
124 124 <el-table-column label="处理场所" align="center" prop="disposalSiteName" />
125   - <el-table-column label="接收时间" align="center" prop="garCreateTime" width="180">
  125 + <el-table-column label="接收时间" align="center" prop="garUpdateTime" width="180">
126 126 <template slot-scope="scope">
127   - <span>{{ parseTime(scope.row.garCreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
  127 + <span>{{ parseTime(scope.row.garUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
128 128 </template>
129 129 </el-table-column>
130 130 <el-table-column label="接收量(吨)" align="center" prop="garReceptionQuantity" />
... ... @@ -211,7 +211,7 @@
211 211 </tr>
212 212 <tr>
213 213 <td>车牌号</td>
214   - <td>{{ form.garHandlerCarCode || '-' }}</td>
  214 + <td>{{ form.garCarCode || '-' }}</td>
215 215 <td>驾驶员</td>
216 216 <td>{{ form.garOrderHandlerName || '-' }}</td>
217 217 </tr>
... ... @@ -230,7 +230,7 @@
230 230 </tr>
231 231 <tr>
232 232 <td>接收车牌</td>
233   - <td>{{ form.garHandlerCarCodeEnd || '-' }}</td>
  233 + <td>{{ form.garHandlerCarCode || '-' }}</td>
234 234 <td>接收量(吨)</td>
235 235 <td>{{ form.garReceptionQuantity || '-' }}</td>
236 236 </tr>
... ...