|
@@ -627,7 +627,13 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
|
|
this.updateById(bizRecord);
|
|
this.updateById(bizRecord);
|
|
|
|
|
|
//净重和卸货重量进行对比
|
|
//净重和卸货重量进行对比
|
|
- BigDecimal weight = bizRecord.getNetWeight().subtract(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))).negate();
|
|
|
|
|
|
+ BigDecimal weight = new BigDecimal(0);
|
|
|
|
+ if(bizRecord.getNetWeight().compareTo(bizRecordEditParam.getUnloadWeight()) > 0){
|
|
|
|
+ weight = bizRecord.getNetWeight().subtract(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000)));
|
|
|
|
+ }else{
|
|
|
|
+ weight = bizRecord.getNetWeight().subtract(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))).negate();
|
|
|
|
+ }
|
|
|
|
+
|
|
//如果差值等于0说明没有误差,预约状态修改为11,已签收
|
|
//如果差值等于0说明没有误差,预约状态修改为11,已签收
|
|
//查询预约记录run
|
|
//查询预约记录run
|
|
BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
|
|
BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
|