入库类型单据 获取入库价格时候 priceOut和outingAmt 前台传

src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java

@@ -126,8 +126,9 @@ public class InboundCheckService extends BaseService<Inbound> {
                 priceIntoFlag = true;
                 //查询库存批次最近一条入库价
                 InboundItemResponse inboundItemResponse = this.selectPriceInto(inboundItemVO);
-                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
-                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                //todo 2024年7月5日15:57:01   priceOut和outingAmt 前台传 z确认修改
+//                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
+//                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
                 inboundItemVO.setCostPrice(inboundItemResponse != null ? inboundItemResponse.getCostPrice() : BigDecimal.ZERO);
                 inboundItemVO.setCostAmt(inboundItemResponse != null ? inboundItemResponse.getCostPrice().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
             }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -148,8 +148,9 @@ public class InboundOtherService extends BaseService<Inbound> {
                 priceIntoFlag = true;
                 //查询库存批次最近一条入库价
                 InboundItemResponse inboundItemResponse = this.selectPriceInto(inboundItemVO);
-                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
-                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                //todo 2024年7月5日15:57:01   priceOut和outingAmt 前台传 z确认修改
+//                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
+//                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
                 inboundItemVO.setCostPrice(inboundItemResponse != null ? inboundItemResponse.getCostPrice() : BigDecimal.ZERO);
                 inboundItemVO.setCostAmt(inboundItemResponse != null ? inboundItemResponse.getCostPrice().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
             }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -157,8 +157,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 priceIntoFlag = true;
                 //查询库存批次最近一条入库价
                 InboundItemResponse inboundItemResponse = this.selectPriceInto(inboundItemVO);
-                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
-                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                //todo 2024年7月5日15:57:01   priceOut和outingAmt 前台传 z确认修改
+//                inboundItemVO.setPriceInto(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
+//                inboundItemVO.setIntoingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
                 inboundItemVO.setCostPrice(inboundItemResponse != null ? inboundItemResponse.getCostPrice() : BigDecimal.ZERO);
                 inboundItemVO.setCostAmt(inboundItemResponse != null ? inboundItemResponse.getCostPrice().multiply(inboundItemVO.getIntoingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
             }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -391,8 +391,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 priceIntoFlag = true;
                 //查询库存批次最近一条入库价
                 InboundItemResponse inboundItemResponse = this.selectPriceInto(outboundItemVO);
-                outboundItemVO.setPriceOut(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
-                outboundItemVO.setOutingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(outboundItemVO.getOutingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                //todo 2024年7月5日15:57:01   priceOut和outingAmt 前台传 z确认修改
+//                outboundItemVO.setPriceOut(inboundItemResponse != null ? inboundItemResponse.getPriceInto() : BigDecimal.ZERO);
+//                outboundItemVO.setOutingAmt(inboundItemResponse != null ? inboundItemResponse.getPriceInto().multiply(outboundItemVO.getOutingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
                 outboundItemVO.setCostPrice(inboundItemResponse != null ? inboundItemResponse.getCostPrice() : BigDecimal.ZERO);
                 outboundItemVO.setCostAmt(inboundItemResponse != null ? inboundItemResponse.getCostPrice().multiply(outboundItemVO.getOutingQty()).setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
             }