|
@@ -926,7 +926,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
relationBusinessCarService.removeByIds(removeIds);
|
|
relationBusinessCarService.removeByIds(removeIds);
|
|
|
}
|
|
}
|
|
|
TbGoods tbGoods = tbGoodsService.getById(otherBusinessBO.getGoodsId());
|
|
TbGoods tbGoods = tbGoodsService.getById(otherBusinessBO.getGoodsId());
|
|
|
- String carBuseinssNo = DateUtil.format(now, "yyyyMMddHHmm");
|
|
|
|
|
String goodsName = tbGoods.getName();
|
|
String goodsName = tbGoods.getName();
|
|
|
List<TbBusinessItem> itemList = new ArrayList<>();
|
|
List<TbBusinessItem> itemList = new ArrayList<>();
|
|
|
boolean freePartMoney = false;
|
|
boolean freePartMoney = false;
|
|
@@ -1105,6 +1104,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
relationBusinessCarService.save(relationBusinessCar);
|
|
relationBusinessCarService.save(relationBusinessCar);
|
|
|
} else {
|
|
} else {
|
|
|
dbBusinessCar
|
|
dbBusinessCar
|
|
|
|
|
+ .setCustomerId(customerId)
|
|
|
.setCarSize(tbBusinessCar.getCarSize()).setCarType(tbBusinessCar.getCarType())
|
|
.setCarSize(tbBusinessCar.getCarSize()).setCarType(tbBusinessCar.getCarType())
|
|
|
.setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode());
|
|
.setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode());
|
|
|
if (freePartMoney) {
|
|
if (freePartMoney) {
|
|
@@ -1119,7 +1119,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
throw new AjaxError("车辆【" + carNo + "】未入场");
|
|
throw new AjaxError("车辆【" + carNo + "】未入场");
|
|
|
}
|
|
}
|
|
|
checkCar.setCarNo(carNo).setCarType(tbBusinessCar.getCarType()).setCarSize(tbBusinessCar.getCarSize())
|
|
checkCar.setCarNo(carNo).setCarType(tbBusinessCar.getCarType()).setCarSize(tbBusinessCar.getCarSize())
|
|
|
- .setCustomerId(dbBusiness.getCustomerId())
|
|
|
|
|
|
|
+ .setCustomerId(customerId)
|
|
|
.setTimeUpdate(now).setIsLock(0).setCarType(tbBusinessCar.getCarType()).setBusinessType(1)
|
|
.setTimeUpdate(now).setIsLock(0).setCarType(tbBusinessCar.getCarType()).setBusinessType(1)
|
|
|
.setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode());
|
|
.setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode());
|
|
|
if (freePartMoney) {
|
|
if (freePartMoney) {
|
qzy