瀏覽代碼

申购单明细新增bom价格字段

fgd 1 年之前
父節點
當前提交
8d65371dbe

+ 5 - 0
sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuyBom.java

@@ -50,6 +50,11 @@ public class ApplyBuyBom extends BasePo {
      */
     private BigDecimal frozenQuantity;
 
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
     private String oldId;
 
 }

+ 22 - 8
sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyBomAccessoryVo.java

@@ -101,30 +101,44 @@ public class ApplyBuyBomAccessoryVo {
     private BigDecimal shortageQuantity;
 
     /**
+     * 周转率
+     */
+    @ColumnWidth(12)
+    @ExcelProperty(value = "90天周转次数", index = 12)
+    private BigDecimal turnoverRate;
+
+    /**
      * 申购数量
      */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "申购数量", index = 12)
+    @ColumnWidth(12)
+    @ExcelProperty(value = "申购数量", index = 13)
     private BigDecimal applyBuyQuantity;
 
     /**
-     * 周转率
+     * 单价
      */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "90天周转次数", index = 13)
-    private BigDecimal turnoverRate;
+    @ColumnWidth(10)
+    @ExcelProperty(value = "单价", index = 14)
+    private BigDecimal unitPrice;
+
+    /**
+     * 总价
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = "总价", index = 15)
+    private BigDecimal totalPrice;
 
     /**
      * 备注
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "备注", index = 14)
+    @ExcelProperty(value = "备注", index = 16)
     private String remark;
 
     /**
      * 附注
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "附注", index = 15)
+    @ExcelProperty(value = "附注", index = 17)
     private String annotation;
 }

+ 2 - 0
sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyServiceImpl.java

@@ -302,6 +302,8 @@ public class ApplyBuyServiceImpl extends ServiceImpl<ApplyBuyMapper, ApplyBuy> i
             vo.setShortageQuantity(shortageQuantity);
             vo.setApplyBuyQuantity(applyBuyBom.getQuantity());
             vo.setTurnoverRate(turnoverRateMap.getOrDefault(applyBuyBom.getBomSpecId(), BigDecimal.ZERO));
+            vo.setUnitPrice(applyBuyBom.getUnitPrice());
+            vo.setTotalPrice(applyBuyBom.getUnitPrice().multiply(applyBuyBom.getQuantity()));
             accessoryList.add(vo);
         }