Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -673,10 +673,6 @@ public class InventoryService extends BaseService<Inventory> {
 
                     inOutRecordVO.setInvId(inventoryResponse.getInvId());
 
-                    //修改库存数量
-                    this.updateInventoryMessageAdd(inventoryResponse, inOutRecordVO);
-
-
                     //region  修改/新建   库存数量，可用量，金额等信息
                     //销售退货出库  新建库存批次
                     if (Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
@@ -688,6 +684,9 @@ public class InventoryService extends BaseService<Inventory> {
                     }
                     //endregion
 
+                    //修改库存数量
+                    this.updateInventoryMessageAdd(inventoryResponse, inOutRecordVO);
+
                     //region 库存流水
                     this.insertInboundRecord(inOutRecordVO);
                     //endregion
@@ -828,7 +827,7 @@ public class InventoryService extends BaseService<Inventory> {
         inventory.setCostAmt(costAmt);
         //存货单价
         inventory.setCostPrice(costAmt.compareTo(BigDecimal.ZERO) > 0 && inventory.getInvQty().compareTo(BigDecimal.ZERO) > 0 ?
-                costAmt.divide(inventory.getInvQty(), BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                costAmt.divide(inventory.getInvQty(), 2,BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
         inventoryMapper.updateAmtAndQty(inventory);
         //endregion
     }

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

@@ -462,8 +462,8 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 //region 将库存需要的参数赋值
                 outboundItemResponse.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.OTHER_OUTBOUND.getValue());
-                outboundItemResponse.setOutQty(outboundItemResponse.getOutQty().negate());
-                outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
+                outboundItemResponse.setOutQty(outboundItemResponse.getOutQty());
+                outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt());
                 //endregion
 
                 //赋值   防止作废的单据查不到明细 故注掉下面代码