|
@@ -1031,7 +1031,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
|
|
.eq("comp_id",weighingManagement1.getCompId())
|
|
.eq("comp_id",weighingManagement1.getCompId())
|
|
.eq("contract_no",weighingManagement1.getContractNo()));
|
|
.eq("contract_no",weighingManagement1.getContractNo()));
|
|
if (contractManagementInfo!=null){
|
|
if (contractManagementInfo!=null){
|
|
- weighingManagement1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
|
|
|
+ if (contractManagementInfo.getUnitContractPrice()!=null) {
|
|
|
|
+ weighingManagement1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
|
+ }
|
|
if ("销售出库".equals(weighingManagement1.getInOutType())){
|
|
if ("销售出库".equals(weighingManagement1.getInOutType())){
|
|
weighingManagement1.setCustomer(contractManagementInfo.getBuyer());
|
|
weighingManagement1.setCustomer(contractManagementInfo.getBuyer());
|
|
}
|
|
}
|