|
@@ -625,14 +625,9 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
this.updateById(bizRecord);
|
|
|
|
|
|
//净重和卸货重量进行对比
|
|
|
- BigDecimal weight = new BigDecimal(0);
|
|
|
- if(bizRecord.getNetWeight().compareTo(bizRecordEditParam.getUnloadWeight()) > 0){
|
|
|
- weight = bizRecord.getNetWeight().subtract(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000)));
|
|
|
- }else{
|
|
|
- weight = bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000)).subtract(bizRecord.getNetWeight());
|
|
|
- }
|
|
|
+ BigDecimal weight = bizRecord.getNetWeight().subtract(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))).negate();
|
|
|
//如果差值等于0说明没有误差,预约状态修改为11,已签收
|
|
|
- //查询预约记录
|
|
|
+ //查询预约记录run
|
|
|
BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
|
|
|
if(ObjectUtil.isNotNull(appointmentRecord)){
|
|
|
if(weight.compareTo(BigDecimal.ZERO) == 0){
|
|
@@ -660,8 +655,9 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
|
System.out.printf("小于等于2");
|
|
|
}
|
|
|
|
|
|
- BigDecimal subtract1 = new BigDecimal(15000).subtract(new BigDecimal(15.3).multiply(new BigDecimal(1000)));
|
|
|
+ BigDecimal subtract1 = new BigDecimal(15000).subtract(new BigDecimal(15.3).multiply(new BigDecimal(1000))).negate();
|
|
|
System.out.printf("sbu:"+subtract1);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|