|
|
@@ -4308,18 +4308,17 @@ public class KwtWaybillOrderV1Service {
|
|
|
BigDecimal lossRate = calculateLossRate2(loadAmount, unloadAmount);
|
|
|
waybillOrderResp.setLossRate(lossRate);
|
|
|
waybillOrderResp.setIsPassReason(isLossRateExceeded(logOrder, lossRate));
|
|
|
- ;
|
|
|
|
|
|
log.info("当前登录企业id:{}", LoginUserHolder.getEntId());
|
|
|
// 原矿运输山上山下的自己放行自己门卫数据
|
|
|
if (Objects.equals(LoginUserHolder.getEntId(), mockEntIds.get(0))) {
|
|
|
// 如果状态为待放行,只能山上的运单展示放行按钮
|
|
|
- if (!Objects.equals(waybillOrderResp.getStatus(), CarWaybillV1Enum.WAIT_RELEASE.getCode())) {
|
|
|
+ if (!Objects.equals(waybillOrderResp.getStatus(), String.valueOf(CarWaybillV1Enum.WAIT_RELEASE.getCode()))) {
|
|
|
waybillOrderResp.setIsDisplayPassButton(Boolean.FALSE);
|
|
|
}
|
|
|
} else {
|
|
|
// 如果状态为卸货待放行,只能山下的运单展示放行按钮
|
|
|
- if (!Objects.equals(waybillOrderResp.getStatus(), CarWaybillV1Enum.UNLOADING_WAIT_RELEASE.getCode())) {
|
|
|
+ if (!Objects.equals(waybillOrderResp.getStatus(), String.valueOf(CarWaybillV1Enum.UNLOADING_WAIT_RELEASE.getCode()))) {
|
|
|
waybillOrderResp.setIsDisplayPassButton(Boolean.FALSE);
|
|
|
}
|
|
|
}
|