|
|
@@ -456,7 +456,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
partMoney = new BigDecimal("0");
|
|
|
}
|
|
|
if (CarEnum.PayTypeEnum.HAS_PAY_TYPE.getType().equals(tbBusinessCar.getPayType())) {
|
|
|
- inTime=tbBusinessCar.getPayTime();
|
|
|
+ inTime = tbBusinessCar.getPayTime();
|
|
|
}
|
|
|
if (partMoney.doubleValue() == 1) {
|
|
|
IOrderPriceRes partPriceRes = getPartMoney(inTime, outTime, tbBusinessCar.getCarNo(), tbBusinessCar.getColor());
|
|
|
@@ -508,11 +508,16 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
continue;
|
|
|
}
|
|
|
tbBusinessItemService.buildDaysFceItem(businessItem, iOrderItem, startTime, endTime);
|
|
|
- }else if (StrUtil.equals(itemAlias,SystemObject.config.getBigHeadCar())){
|
|
|
- tbBusinessItemService .buildDaysFceItem(businessItem, iOrderItem, startTime, endTime);
|
|
|
+ } else if (StrUtil.equals(itemAlias, SystemObject.config.getBigHeadCar())
|
|
|
+ || StrUtil.equals(itemAlias, SystemObject.config.getCabinetCar())) {
|
|
|
+ //大车头、柜车、栏车
|
|
|
+ tbBusinessItemService.buildDaysFceItem(businessItem, iOrderItem, startTime, endTime);
|
|
|
+ //不收停车费
|
|
|
+ carMap.put("price", 0);
|
|
|
}
|
|
|
expenses.add(iOrderItem);
|
|
|
}
|
|
|
+ result.put("carList", Collections.singleton(carMap));
|
|
|
if (!expenses.isEmpty()) {
|
|
|
IOrderPriceRes orderPriceRes = syncService.orderPriceCal(expenses);
|
|
|
BigDecimal totalPrice = orderPriceRes.getTotalOrderPrice();
|
|
|
@@ -527,7 +532,16 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
itemMap.put("pay", item.getPayStatus());
|
|
|
orderPriceRes.getFireResult().stream().filter(priceItem -> StrUtil.equals(item.getItemCode(), priceItem.getUniqExpenseId()))
|
|
|
.findAny().ifPresent(priceItem -> {
|
|
|
- itemMap.put("price", priceItem.getFirePrice().multiply(new BigDecimal(item.getNum())));
|
|
|
+ BigDecimal price = priceItem.getFirePrice().multiply(new BigDecimal(item.getNum()));
|
|
|
+ //柜车、栏车只有离场才知道多少钱
|
|
|
+ if (StrUtil.equals(item.getItemAlias(),SystemObject.config.getCabinetCar())){
|
|
|
+ TbBusiness tbBusiness = this.getById(item.getBusinessId());
|
|
|
+ tbBusiness.setItemPrice(price);
|
|
|
+ item.setTotal(price);
|
|
|
+ tbBusinessItemService.updateById(item);
|
|
|
+ this.updateById(tbBusiness);
|
|
|
+ }
|
|
|
+ itemMap.put("price", price);
|
|
|
});
|
|
|
itemList.add(itemMap);
|
|
|
TbBusinessSort tbBusinessSort = tbBusinessSortService.findByItemTypeId(item.getItemTypeId());
|
|
|
@@ -667,10 +681,16 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
}
|
|
|
int index = 1;
|
|
|
int size = cars.size();
|
|
|
+ String goodsName = tbGoods.getName();
|
|
|
for (TbItem tbItem : tbItems) {
|
|
|
TbItem db = tbItemService.getById(tbItem.getId());
|
|
|
String itemName = db.getItemName();
|
|
|
+ goodsName = goodsName + "—" + itemName;
|
|
|
String alaisName = db.getItemAlias();
|
|
|
+ String startImage = tbItem.getStartImage();
|
|
|
+ if (StrUtil.equals(SystemObject.config.getColdItemAlias(), alaisName) && StrUtil.isEmpty(startImage)) {
|
|
|
+ throw new AjaxError("请上传开始时间图片");
|
|
|
+ }
|
|
|
TbBusinessItem item = new TbBusinessItem();
|
|
|
int cabinetType = tbItem.getCabinetType();
|
|
|
if (!SystemObject.config.getEmptyStoreItemAlias().equals(alaisName)
|
|
|
@@ -680,7 +700,9 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
int num = tbItem.getNum();
|
|
|
String typeId = tbItem.getTypeId();
|
|
|
TbItemType tbItemType = tbItemTypeService.getById(typeId);
|
|
|
- BigDecimal itemTotalPrice = db.getPrice().multiply(new BigDecimal(num));
|
|
|
+ BigDecimal unitPrice = db.getPrice();
|
|
|
+ unitPrice = StrUtil.equals(db.getPattern(), "RULES") ? BigDecimal.ZERO : unitPrice;
|
|
|
+ BigDecimal itemTotalPrice = unitPrice.multiply(new BigDecimal(num));
|
|
|
item.setNo(no + "0" + index).setPayTypeName(db.getPayTypeName())
|
|
|
.setPayType(db.getPayType())
|
|
|
.setBusinessType(db.getBusinessType()).setTaxRate(NumberUtil.div(db.getTaxRate().doubleValue(), 100D, 2));
|
|
|
@@ -690,7 +712,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
.setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
|
|
|
.setItemTypeId(typeId).setItemTypeName(tbItemType.getName()).setItemAlias(tbItem.getItemAlias())
|
|
|
.setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now)
|
|
|
- .setColdStartTime(tbItem.getColdStartTime());
|
|
|
+ .setColdStartTime(tbItem.getColdStartTime()).setStartImage(startImage);
|
|
|
if (partner != null) {
|
|
|
item.setPick(1).setPickCustomerId(pickCustomerId).setPickCustomerName(partner.getName())
|
|
|
.setPickBy(StpUserUtil.getCreateBy()).setPickTime(now);
|
|
|
@@ -705,6 +727,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
TbBusinessItem tbBusinessItem = tbBusinessItemService.findTheLastRecordByCabinetNo(tbItem.getCabinetNo());
|
|
|
//堆存---》取柜
|
|
|
if (cabinetType == 1) {
|
|
|
+ goodsName = goodsName + "（取柜）";
|
|
|
if (tbBusinessItem == null) {
|
|
|
throw new AjaxError("根据柜号" + tbItem.getCabinetNo() + "找不到堆存记录");
|
|
|
}
|
|
|
@@ -722,8 +745,21 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
.setCabinetStatus(1);
|
|
|
tbBusinessItem.setColdEndTime(endTime)
|
|
|
.setCabinetStatus(1);
|
|
|
+ //计算金额
|
|
|
+ Date startTime = tbBusinessItem.getColdStartTime();
|
|
|
+ if (startTime != null) {
|
|
|
+ List<IOrderItem> expenses = new ArrayList<>();
|
|
|
+ tbBusinessItemService.buildExpenses(Collections.singletonList(item), expenses);
|
|
|
+ if (!expenses.isEmpty()) {
|
|
|
+ IOrderPriceRes res = syncService.orderPriceCal(expenses);
|
|
|
+ BigDecimal itemPrice = res.getTotalOrderPrice();
|
|
|
+ item.setTotal(itemPrice);
|
|
|
+ itemTotalPrice = itemPrice;
|
|
|
+ }
|
|
|
+ }
|
|
|
tbBusinessItemService.updateById(tbBusinessItem);
|
|
|
} else {
|
|
|
+ goodsName = goodsName + "（存柜）";
|
|
|
//存柜
|
|
|
if (tbBusinessItem != null && tbBusinessItem.getCabinetStatus() == 0) {
|
|
|
throw new AjaxError("柜号" + tbItem.getCabinetNo() + "已存柜未取柜");
|
|
|
@@ -735,7 +771,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
//业务费xxx都为0；
|
|
|
BigDecimal zero = BigDecimal.ZERO;
|
|
|
item.setColdStartTime(endTime).setItemPrice(zero)
|
|
|
- .setTotal(zero).setPayStatus(1).setPayTime(now);
|
|
|
+ .setTotal(zero).setPayStatus(1);
|
|
|
//无需支付
|
|
|
item.setPayStatus(3);
|
|
|
itemTotalPrice = zero;
|
|
|
@@ -756,7 +792,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
String declareNo = otherBusinessBO.getDeclareNo();
|
|
|
tbBusiness.setCardSize(otherBusinessBO.getCarSize()).setNetWeight(otherBusinessBO.getNetWeight())
|
|
|
.setOperator(otherBusinessBO.getOperator()).setOperateTime(otherBusinessBO.getOperateTime())
|
|
|
- .setNo(no).setGoodsName(tbGoods.getName()).setGoodsId(otherBusinessBO.getGoodsId())
|
|
|
+ .setNo(no).setGoodsName(goodsName).setGoodsId(otherBusinessBO.getGoodsId()).setGoodsCode(tbGoods.getCode())
|
|
|
.setBusinessGoodsName(otherBusinessBO.getBusinessGoodsName()).setBusinessGoodsNum(otherBusinessBO.getBusinessGoodsNum())
|
|
|
.setPayStep(tbGoods.getPayStep()).setDeclareNo(declareNo).setCardNo(otherBusinessBO.getCardNo());
|
|
|
tbBusiness.setCreateTime(now).setCreateByCustomerId(StpUserUtil.getCustomerId())
|
|
|
@@ -859,6 +895,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
}
|
|
|
TbGoods tbGoods = tbGoodsService.getById(otherBusinessBO.getGoodsId());
|
|
|
String carBuseinssNo = DateUtil.format(now, "yyyyMMddHHmm");
|
|
|
+ String goodsName = tbGoods.getName();
|
|
|
List<TbBusinessItem> itemList = new ArrayList<>();
|
|
|
if (PayEnum.PayStatusEnum.HAS_PAY_CONFIRM.getCode() != dbBusiness.getPayStatus()) {
|
|
|
List<TbBusinessItem> businessItemList = tbBusinessItemService.findByBusinessId(id);
|
|
|
@@ -879,19 +916,28 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
dbBusiness.setPickCustomerId(pickCustomerId).setPickCustomerName(partner.getName());
|
|
|
}
|
|
|
int size = cars.size();
|
|
|
+
|
|
|
for (TbItem tbItem : tbItems) {
|
|
|
TbItem db = tbItemService.getById(tbItem.getId());
|
|
|
String alaisName = db.getItemAlias();
|
|
|
+ String itemName = db.getItemName();
|
|
|
+ goodsName = goodsName + "—" + itemName;
|
|
|
+ String endImage = tbItem.getEndImage();
|
|
|
+ if (StrUtil.equals(SystemObject.config.getColdItemAlias(), alaisName) && StrUtil.isEmpty(endImage)) {
|
|
|
+ throw new AjaxError("请上传结束时间图片");
|
|
|
+ }
|
|
|
int cabinetType = tbItem.getCabinetType();
|
|
|
+ //如果不是正面吊--->则取/存操作设置为-1
|
|
|
if (!SystemObject.config.getEmptyStoreItemAlias().equals(alaisName)
|
|
|
&& !SystemObject.config.getHeavyStoreItemAlias().equals(alaisName)) {
|
|
|
cabinetType = -1;
|
|
|
}
|
|
|
- String itemName = db.getItemName();
|
|
|
TbBusinessItem item = new TbBusinessItem();
|
|
|
int num = tbItem.getNum();
|
|
|
TbItemType tbItemType = tbItemTypeService.getById(tbItem.getTypeId());
|
|
|
- BigDecimal itemTotalPrice = db.getPrice().multiply(new BigDecimal(num));
|
|
|
+ BigDecimal unitPrice = db.getPrice();
|
|
|
+ unitPrice = StrUtil.equals(db.getPattern(), "RULES") ? BigDecimal.ZERO : unitPrice;
|
|
|
+ BigDecimal itemTotalPrice = unitPrice.multiply(new BigDecimal(num));
|
|
|
item.setNo(no + "0" + index).setPayTypeName(db.getPayTypeName()).setPayType(db.getPayType())
|
|
|
.setBusinessType(db.getBusinessType()).setTaxRate(NumberUtil.div(db.getTaxRate().doubleValue(), 100D, 2));
|
|
|
item.setItemCode(db.getItemCode()).setNum(num + "").setItemId(db.getId()).setBusinessId(dbBusiness.getId())
|
|
|
@@ -899,14 +945,16 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
.setItemTypeId(tbItem.getTypeId()).setItemTypeName(tbItemType.getName())
|
|
|
.setCabinetNo(tbItem.getCabinetNo()).setItemAlias(tbItem.getItemAlias())
|
|
|
.setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now)
|
|
|
- .setCabinetType(cabinetType)
|
|
|
+ .setCabinetType(cabinetType).setEndImage(endImage).setStartImage(tbItem.getStartImage())
|
|
|
.setColdStartTime(tbItem.getColdStartTime()).setColdEndTime(tbItem.getColdEndTime());
|
|
|
if (partner != null) {
|
|
|
item.setPick(1).setPickCustomerId(pickCustomerId).setPickCustomerName(partner.getName())
|
|
|
.setPickBy(StpUserUtil.getCreateBy()).setPickTime(now);
|
|
|
}
|
|
|
+ //装卸-->x车辆数量
|
|
|
if (SystemObject.config.getEveryCarPay().contains(itemName)) {
|
|
|
itemTotalPrice = itemTotalPrice.multiply(BigDecimal.valueOf(size));
|
|
|
+ item.setTotal(itemTotalPrice);
|
|
|
}
|
|
|
|
|
|
Date startTime = item.getColdStartTime();
|
|
|
@@ -914,25 +962,28 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
if (startTime != null && endTime != null) {
|
|
|
List<IOrderItem> expenses = new ArrayList<>();
|
|
|
tbBusinessItemService.buildExpenses(Collections.singletonList(item), expenses);
|
|
|
- if (!expenses.isEmpty()){
|
|
|
+ if (!expenses.isEmpty()) {
|
|
|
IOrderPriceRes res = syncService.orderPriceCal(expenses);
|
|
|
- item.setTotal(res.getTotalOrderPrice());
|
|
|
- itemTotalPrice = res.getTotalOrderPrice();
|
|
|
+ BigDecimal itemPrice = res.getTotalOrderPrice();
|
|
|
+ item.setTotal(itemPrice);
|
|
|
+ itemTotalPrice = itemPrice;
|
|
|
}
|
|
|
}
|
|
|
- //堆存业务
|
|
|
+ //正面吊堆存业务
|
|
|
if (SystemObject.config.getEmptyStoreItemAlias().equals(alaisName)
|
|
|
|| SystemObject.config.getHeavyStoreItemAlias().equals(alaisName)) {
|
|
|
//取柜--->根据柜号查询上一个存柜时间
|
|
|
TbBusinessItem tbBusinessItem = tbBusinessItemService.findTheLastRecordByCabinetNo(tbItem.getCabinetNo());
|
|
|
//堆存
|
|
|
- if (cabinetType == 1) {
|
|
|
+ if (cabinetType == 1) {//取柜
|
|
|
if (tbBusinessItem == null) {
|
|
|
throw new AjaxError("根据柜号" + tbItem.getCabinetNo() + "找不到堆存记录");
|
|
|
}
|
|
|
+
|
|
|
if (endTime == null) {
|
|
|
throw new AjaxError("请输入取柜时间");
|
|
|
}
|
|
|
+ goodsName = goodsName + "（取柜）";
|
|
|
item.setColdStartTime(tbBusinessItem.getColdStartTime())
|
|
|
.setParentCabinetId(tbBusinessItem.getId())
|
|
|
.setColdEndTime(endTime);
|
|
|
@@ -943,6 +994,14 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
if (startTime == null) {
|
|
|
throw new AjaxError("请输入存柜时间");
|
|
|
}
|
|
|
+ String businessItemId = tbItem.getBusinessItemId();
|
|
|
+ if (StrUtil.isNotEmpty(businessItemId)
|
|
|
+ && tbBusinessItem != null
|
|
|
+ && !StrUtil.equals(businessItemId, tbBusinessItem.getId() + "")
|
|
|
+ && tbBusinessItem.getColdEndTime() == null) {
|
|
|
+ throw new AjaxError("箱规未取走，不能存入");
|
|
|
+ }
|
|
|
+ goodsName = goodsName + "（存柜）";
|
|
|
//业务费xxx都为0；
|
|
|
BigDecimal zero = BigDecimal.ZERO;
|
|
|
item.setColdStartTime(endTime).setItemPrice(zero)
|
|
|
@@ -964,9 +1023,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
for (TbBusinessCar tbBusinessCar : cars) {
|
|
|
String businessCarId = tbBusinessCar.getId();
|
|
|
String carNo = tbBusinessCar.getCarNo();
|
|
|
- for (TbBusinessItem item : itemList) {
|
|
|
- checkOtherBusiness(item.getItemTypeId(), otherBusinessBO.getOperateTime(), dbBusiness.getId(), carNo);
|
|
|
- }
|
|
|
if (StrUtil.isNotEmpty(businessCarId)) {
|
|
|
//原来已存在的
|
|
|
TbBusinessCar dbBusinessCar = tbBusinessCarService.getById(businessCarId);
|
|
|
@@ -976,15 +1032,8 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
//把关联删除掉，然后添加新的关联
|
|
|
relationBusinessCarService.removeByBusinessIdAndCarId(dbBusiness.getId(), businessCarId);
|
|
|
TbBusinessCar otherCar = tbBusinessCarService.findTheLastRecord(carNo);
|
|
|
- if (otherCar == null ||//不存在或者已离场===>新建
|
|
|
- (otherCar.getRealInTime() != null && otherCar.getRealOutTime() != null)) {
|
|
|
- otherCar = new TbBusinessCar();
|
|
|
- otherCar.setCreateTime(now).setPay(0).setNo(carBuseinssNo + RandomUtil.randomNumbers(4))
|
|
|
- .setCarNo(carNo).setCarType(tbBusinessCar.getCarType()).setCarSize(tbBusinessCar.getCarSize())
|
|
|
- .setNetWeight(tbBusinessCar.getNetWeight()).setCustomerId(dbBusiness.getCustomerId())
|
|
|
- .setTimeUpdate(now).setIsLock(0).setCarType(tbBusinessCar.getCarType())
|
|
|
- .setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode());
|
|
|
- tbBusinessCarService.save(otherCar);
|
|
|
+ if (otherCar == null) {
|
|
|
+ throw new AjaxError("车辆【" + carNo + "】未入场");
|
|
|
} else {
|
|
|
List<TbBusiness> tbBusinessList = this.findOtherBusinessByCarId(businessCarId);
|
|
|
if (tbBusinessList.size() == 1 && dbBusinessCar.getRealInTime() == null) {
|
|
|
@@ -1003,12 +1052,8 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
} else {
|
|
|
TbBusinessCar checkCar = tbBusinessCarService.findTheLastRecord(carNo);
|
|
|
//不存在或者已经离场的
|
|
|
- if (checkCar == null ||
|
|
|
- (checkCar.getRealInTime() != null && checkCar.getRealOutTime() != null)) {
|
|
|
- checkCar = new TbBusinessCar();
|
|
|
- checkCar.setCreateTime(now).setPay(0).setBusinessType(1)
|
|
|
- .setConfirmJudge(CarEnum.ConfirmJudgeEnum.NO_JUDGE.getCode())
|
|
|
- .setNo(carBuseinssNo + RandomUtil.randomNumbers(4));
|
|
|
+ if (checkCar == null) {
|
|
|
+ throw new AjaxError("车辆【" + carNo + "】未入场");
|
|
|
}
|
|
|
checkCar.setCarNo(carNo).setCarType(tbBusinessCar.getCarType()).setCarSize(tbBusinessCar.getCarSize())
|
|
|
.setNetWeight(tbBusinessCar.getNetWeight()).setCustomerId(dbBusiness.getCustomerId())
|
|
|
@@ -1022,7 +1067,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
}
|
|
|
if (!StrUtil.equals(dbBusiness.getGoodsId(), otherBusinessBO.getGoodsId())) {
|
|
|
dbBusiness.setGoodsId(otherBusinessBO.getGoodsId())
|
|
|
- .setGoodsName(tbGoods.getName()).setPayStep(tbGoods.getPayStep());
|
|
|
+ .setGoodsName(goodsName).setPayStep(tbGoods.getPayStep());
|
|
|
}
|
|
|
String customerId = otherBusinessBO.getCustomerId();
|
|
|
if (StrUtil.isNotEmpty(customerId)) {
|
|
|
@@ -1037,7 +1082,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
|
|
|
dbBusiness.setCardSize(otherBusinessBO.getCarSize()).setNetWeight(otherBusinessBO.getNetWeight())
|
|
|
.setOperator(otherBusinessBO.getOperator()).setOperateTime(otherBusinessBO.getOperateTime())
|
|
|
- .setGoodsId(otherBusinessBO.getGoodsId())
|
|
|
+ .setGoodsId(otherBusinessBO.getGoodsId()).setGoodsCode(tbGoods.getCode()).setGoodsName(goodsName)
|
|
|
.setOwner(otherBusinessBO.getOwner()).setBusinessGoodsName(otherBusinessBO.getBusinessGoodsName())
|
|
|
.setBusinessGoodsNum(otherBusinessBO.getBusinessGoodsNum())
|
|
|
.setCardNo(otherBusinessBO.getCardNo());
|
|
|
@@ -1689,9 +1734,15 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
//其他费项 装卸业务管理费” 进行预存款扣除
|
|
|
for (TbBusinessItem item : tbBusinessItems) {
|
|
|
String aliasName = item.getItemAlias();
|
|
|
- if (StrUtil.equals(aliasName, SystemObject.config.getColdItemAlias())) {
|
|
|
+ //充电打冷，正面吊(取柜)必须得有开始时间+结束时间
|
|
|
+ if (StrUtil.equals(aliasName, SystemObject.config.getColdItemAlias())
|
|
|
+ || (StrUtil.equals(aliasName, SystemObject.config.getEmptyStoreItemAlias())
|
|
|
+ && item.getCabinetType() == 1)
|
|
|
+ || (StrUtil.equals(aliasName, SystemObject.config.getHeavyStoreItemAlias())
|
|
|
+ && item.getCabinetType() == 1)
|
|
|
+ ) {
|
|
|
if (item.getColdStartTime() == null || item.getColdEndTime() == null) {
|
|
|
- throw new AjaxError("请先录入打冷开始/结束时间");
|
|
|
+ throw new AjaxError("请先点击【修改】，然后录入业务开始/结束时间");
|
|
|
}
|
|
|
}
|
|
|
//业务类型是装卸业务管理费且未支付的进行扣款
|
qzyReal