|
@@ -260,7 +260,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
Float overNeight=0.0f;
|
|
Float overNeight=0.0f;
|
|
ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
.eq("comp_id",inOutWarehouseTask.getCompId())
|
|
.eq("comp_id",inOutWarehouseTask.getCompId())
|
|
- .eq("contract",inOutWarehouseTask.getContractNo()));
|
|
|
|
|
|
+ .eq("contract_no",inOutWarehouseTask.getContractNo()));
|
|
if (contractManagementInfo!=null){
|
|
if (contractManagementInfo!=null){
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
}
|
|
}
|
|
@@ -288,7 +288,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
Float overNeight=0.0f;
|
|
Float overNeight=0.0f;
|
|
ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
.eq("comp_id",inOutWarehouseTask.getCompId())
|
|
.eq("comp_id",inOutWarehouseTask.getCompId())
|
|
- .eq("contract",inOutWarehouseTask.getContractNo()));
|
|
|
|
|
|
+ .eq("contract_no",inOutWarehouseTask.getContractNo()));
|
|
if (contractManagementInfo!=null){
|
|
if (contractManagementInfo!=null){
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
|
|
}
|
|
}
|