|
@@ -530,7 +530,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
|
|
|
}
|
|
|
// 获取本次采购入库详情
|
|
|
List<FabricPoOrderIn> fabricPoOrderInList = fabricLossMapper.getPurchaseInList(code);
|
|
|
- // 设置未开票数量和未结算数量,采购单价,采购单价设置成:开票数量/结算数量*单价
|
|
|
+ // 设置未开票数量和未结算数量,采购单价,采购单价设置成:开票数量/结算数量*单价(本计划采购入库取消这个逻辑)
|
|
|
for (FabricPoOrderIn fabricPoOrderIn: fabricPoOrderInList){
|
|
|
fabricPoOrderIn.setIQuantityNInvoice(DoubleOperation.sub(fabricPoOrderIn.getIQuantity(),fabricPoOrderIn.getIQuantityInvoice()));
|
|
|
fabricPoOrderIn.setIQuantityNSettle(DoubleOperation.sub(fabricPoOrderIn.getIQuantity(),fabricPoOrderIn.getIQuantitySettle()));
|
|
@@ -540,11 +540,12 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
|
|
|
FabricMoOrderCK findItem = findOpt.get();
|
|
|
fabricPoOrderIn.setIPrice(DoubleOperation.getScale(findItem.getIPrice(),4));
|
|
|
}else {
|
|
|
- if (fabricPoOrderIn.getIQuantitySettle() != 0 && fabricPoOrderIn.getIQuantityInvoice() != 0){
|
|
|
- fabricPoOrderIn.setIPrice(DoubleOperation.getScale(fabricPoOrderIn.getIPrice()*fabricPoOrderIn.getIQuantityInvoice()/fabricPoOrderIn.getIQuantitySettle(),4));
|
|
|
- }else {
|
|
|
- fabricPoOrderIn.setIPrice(DoubleOperation.getScale(fabricPoOrderIn.getIPrice(), 4));
|
|
|
- }
|
|
|
+ fabricPoOrderIn.setIPrice(DoubleOperation.getScale(fabricPoOrderIn.getIPrice(), 4));
|
|
|
+// if (fabricPoOrderIn.getIQuantitySettle() != 0 && fabricPoOrderIn.getIQuantityInvoice() != 0){
|
|
|
+// fabricPoOrderIn.setIPrice(DoubleOperation.getScale(fabricPoOrderIn.getIPrice()*fabricPoOrderIn.getIQuantityInvoice()/fabricPoOrderIn.getIQuantitySettle(),4));
|
|
|
+// }else {
|
|
|
+// fabricPoOrderIn.setIPrice(DoubleOperation.getScale(fabricPoOrderIn.getIPrice(), 4));
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
|