|
@@ -1718,11 +1718,11 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
|
|
warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
|
|
warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
|
|
warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
|
|
warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
|
|
warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
|
|
- if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
|
|
|
|
|
|
+ if (dataList1.get(j).getGoodsName().contains("潮粮")) {
|
|
//单价=(潮粮单价-扣单价)*1000
|
|
//单价=(潮粮单价-扣单价)*1000
|
|
warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
|
|
warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
|
|
} else {
|
|
} else {
|
|
- warehousingOrder1.setPrice((dataList1.get(j).getSolidGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
|
|
|
|
|
|
+ warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|