|
|
@@ -51,6 +51,10 @@ import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
|
|
|
import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
|
|
|
import vip.xiaonuo.biz.modular.bizexcessconfig.entity.BizExcessConfig;
|
|
|
import vip.xiaonuo.biz.modular.bizexcessconfig.service.BizExcessConfigService;
|
|
|
+import vip.xiaonuo.biz.modular.bizloadappoint.entity.BizLoadAppoint;
|
|
|
+import vip.xiaonuo.biz.modular.bizloadappoint.service.BizLoadAppointService;
|
|
|
+import vip.xiaonuo.biz.modular.bizloadappointsupplier.entity.BizLoadAppointSupplier;
|
|
|
+import vip.xiaonuo.biz.modular.bizloadappointsupplier.service.BizLoadAppointSupplierService;
|
|
|
import vip.xiaonuo.biz.modular.bizorder.entity.BizOrder;
|
|
|
import vip.xiaonuo.biz.modular.bizorder.param.BizOrderEditParam;
|
|
|
import vip.xiaonuo.biz.modular.bizorder.service.BizOrderService;
|
|
|
@@ -127,6 +131,12 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
@Resource
|
|
|
private BizSupplierTransportService bizSupplierTransportService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private BizLoadAppointService bizLoadAppointService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private BizLoadAppointSupplierService bizLoadAppointSupplierService;
|
|
|
+
|
|
|
@Override
|
|
|
public Page<BizRecord> page(BizRecordPageParam bizRecordPageParam) {
|
|
|
QueryWrapper<BizRecord> queryWrapper = getQueryWrapper(bizRecordPageParam);
|
|
|
@@ -208,9 +218,15 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderNumber())){
|
|
|
queryWrapper.like("bo.order_number",bizRecordPageParam.getOrderNumber());
|
|
|
}
|
|
|
+ if (ObjectUtil.isNotEmpty(bizRecordPageParam.getLoadNumber())){
|
|
|
+ queryWrapper.like("bla.load_number",bizRecordPageParam.getLoadNumber());
|
|
|
+ }
|
|
|
if (ObjectUtil.isNotEmpty(bizRecordPageParam.getCustomerName())){
|
|
|
queryWrapper.like("bc.name",bizRecordPageParam.getCustomerName());
|
|
|
}
|
|
|
+ if (ObjectUtil.isNotEmpty(bizRecordPageParam.getServiceCustomerName())){
|
|
|
+ queryWrapper.like("bsc.name",bizRecordPageParam.getServiceCustomerName());
|
|
|
+ }
|
|
|
if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderId())){
|
|
|
queryWrapper.eq("br.order_id",bizRecordPageParam.getOrderId());
|
|
|
}
|
|
|
@@ -695,30 +711,60 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
}
|
|
|
|
|
|
//司机确认后，修改订单重量
|
|
|
- BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
|
|
|
- if(ObjectUtil.isNotNull(bizOrder)){
|
|
|
- bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
- bizOrderService.updateById(bizOrder);
|
|
|
- log.info("司机确认修改订单出场重量成功-----");
|
|
|
-
|
|
|
- //修改供应商出场重量
|
|
|
- //查询车辆属于哪个供应商
|
|
|
- BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
- eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
- last("limit 1"));
|
|
|
- if(ObjectUtil.isNotNull(transport)){
|
|
|
- //根据物流订单和供应商查询
|
|
|
- BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
|
|
|
- eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
|
|
|
- eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
- last("limit 1"));
|
|
|
- orderSupplier.setNetWeight(orderSupplier.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
- bizOrderSupplierService.updateById(orderSupplier);
|
|
|
- log.info("司机确认修改供应商出场重量成功-----");
|
|
|
+ if(ObjectUtil.isNotNull(appointmentRecord)){
|
|
|
+ if(StringUtils.equals(appointmentRecord.getAppointmentType(),"1")){
|
|
|
+ BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
|
|
|
+ if(ObjectUtil.isNotNull(bizOrder)){
|
|
|
+ bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
+ bizOrderService.updateById(bizOrder);
|
|
|
+ log.info("司机确认修改订单出场重量成功-----");
|
|
|
+
|
|
|
+ //修改供应商出场重量
|
|
|
+ //查询车辆属于哪个供应商
|
|
|
+ BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
+ eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(transport)){
|
|
|
+ //根据物流订单和供应商查询
|
|
|
+ BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
|
|
|
+ eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
|
|
|
+ eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
+ last("limit 1"));
|
|
|
+ orderSupplier.setNetWeight(orderSupplier.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
+ bizOrderSupplierService.updateById(orderSupplier);
|
|
|
+ log.info("司机确认修改供应商出场重量成功-----");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(StringUtils.equals(appointmentRecord.getAppointmentType(),"3")){
|
|
|
+ BizLoadAppoint loadAppoint = bizLoadAppointService.getById(bizRecord.getOrderId());
|
|
|
+ if(ObjectUtil.isNotNull(loadAppoint)){
|
|
|
+ loadAppoint.setNetWeight(loadAppoint.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
+ bizLoadAppointService.updateById(loadAppoint);
|
|
|
+ log.info("司机确认修改订单出场重量成功-----");
|
|
|
+
|
|
|
+ //修改供应商出场重量
|
|
|
+ //查询车辆属于哪个供应商
|
|
|
+ BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
+ eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(transport)){
|
|
|
+ //根据物流订单和供应商查询
|
|
|
+ BizLoadAppointSupplier supplier = bizLoadAppointSupplierService.getOne(new QueryWrapper<BizLoadAppointSupplier>().lambda().
|
|
|
+ eq(BizLoadAppointSupplier::getAppointId, loadAppoint.getId()).
|
|
|
+ eq(BizLoadAppointSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
+ last("limit 1"));
|
|
|
+ supplier.setNetWeight(supplier.getNetWeight().add(bizRecord.getNetWeight()));
|
|
|
+ bizLoadAppointSupplierService.updateById(supplier);
|
|
|
+ log.info("司机确认修改供应商出场重量成功-----");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
if(ObjectUtil.isNotNull(appointmentRecord)){
|
|
|
log.info("mqtt回调结束：过磅记录id："+bizRecord.getRelationId()+",车牌号："+bizRecord.getLicensePlate()+",状态："+appointmentRecord.getStatus());
|
|
|
}
|
|
|
@@ -773,37 +819,79 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
bizAppointmentRecordService.updateById(appointmentRecord);
|
|
|
}
|
|
|
|
|
|
- //查询物流订单信息
|
|
|
- BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
|
|
|
- if(ObjectUtil.isNotNull(bizOrder)){
|
|
|
- if(StringUtils.equals(bizOrder.getOrderType(),"1")){
|
|
|
- //常规订单
|
|
|
- if(ObjectUtil.isEmpty(bizOrder.getShippingWeight())){
|
|
|
- bizOrder.setShippingWeight(new BigDecimal(0));
|
|
|
+ if(ObjectUtil.isNotNull(appointmentRecord)){
|
|
|
+ //沙石预约
|
|
|
+ if(StringUtils.equals(appointmentRecord.getAppointmentType(),"1")){
|
|
|
+ //查询物流订单信息
|
|
|
+ BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
|
|
|
+ if(ObjectUtil.isNotNull(bizOrder)){
|
|
|
+ if(StringUtils.equals(bizOrder.getOrderType(),"1")){
|
|
|
+ //常规订单
|
|
|
+ if(ObjectUtil.isEmpty(bizOrder.getShippingWeight())){
|
|
|
+ bizOrder.setShippingWeight(new BigDecimal(0));
|
|
|
+ }
|
|
|
+ bizOrder.setShippingWeight(bizOrder.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
+ bizOrderService.updateById(bizOrder);
|
|
|
+ log.info("司机确认修改销售订单卸货重量成功-----");
|
|
|
+
|
|
|
+ //修改供应商卸货重量
|
|
|
+ //查询车辆属于哪个供应商
|
|
|
+ BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
+ eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(transport)){
|
|
|
+ //根据物流订单和供应商查询
|
|
|
+ BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
|
|
|
+ eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
|
|
|
+ eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(orderSupplier)){
|
|
|
+ orderSupplier.setShippingWeight(orderSupplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
+ bizOrderSupplierService.updateById(orderSupplier);
|
|
|
+ log.info("司机确认修改销售订单供应商卸货重量成功-----");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- bizOrder.setShippingWeight(bizOrder.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
- bizOrderService.updateById(bizOrder);
|
|
|
- log.info("司机确认修改订单卸货重量成功-----");
|
|
|
-
|
|
|
- //修改供应商卸货重量
|
|
|
- //查询车辆属于哪个供应商
|
|
|
- BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
- eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
- last("limit 1"));
|
|
|
- if(ObjectUtil.isNotNull(transport)){
|
|
|
- //根据物流订单和供应商查询
|
|
|
- BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
|
|
|
- eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
|
|
|
- eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
- last("limit 1"));
|
|
|
- if(ObjectUtil.isNotNull(orderSupplier)){
|
|
|
- orderSupplier.setShippingWeight(orderSupplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
- bizOrderSupplierService.updateById(orderSupplier);
|
|
|
- log.info("司机确认修改供应商卸货重量成功-----");
|
|
|
+ }
|
|
|
+
|
|
|
+ //起卸预约
|
|
|
+ if(StringUtils.equals(appointmentRecord.getAppointmentType(),"3")){
|
|
|
+ //查询起卸订单信息
|
|
|
+ BizLoadAppoint loadAppoint = bizLoadAppointService.getById(bizRecord.getOrderId());
|
|
|
+ if(ObjectUtil.isNotNull(loadAppoint)){
|
|
|
+ if(StringUtils.equals(loadAppoint.getOrderType(),"1")){
|
|
|
+ //配送订单
|
|
|
+ if(ObjectUtil.isEmpty(loadAppoint.getLoadWeight())){
|
|
|
+ loadAppoint.setLoadWeight(new BigDecimal(0));
|
|
|
+ }
|
|
|
+ loadAppoint.setLoadWeight(loadAppoint.getLoadWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
+ bizLoadAppointService.updateById(loadAppoint);
|
|
|
+ log.info("司机确认修改起卸订单卸货重量成功-----");
|
|
|
+
|
|
|
+ //修改供应商卸货重量
|
|
|
+ //查询车辆属于哪个供应商
|
|
|
+ BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
|
|
|
+ eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(transport)){
|
|
|
+ //根据物流订单和供应商查询
|
|
|
+ BizLoadAppointSupplier supplier = bizLoadAppointSupplierService.getOne(new QueryWrapper<BizLoadAppointSupplier>().lambda().
|
|
|
+ eq(BizLoadAppointSupplier::getAppointId, loadAppoint.getId()).
|
|
|
+ eq(BizLoadAppointSupplier::getSupplierId, transport.getSupplierId()).
|
|
|
+ last("limit 1"));
|
|
|
+ if(ObjectUtil.isNotNull(supplier)){
|
|
|
+ supplier.setShippingWeight(supplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
|
|
|
+ bizLoadAppointSupplierService.updateById(supplier);
|
|
|
+ log.info("司机确认修改起卸订单供应商卸货重量成功-----");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
