字段清理

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/Stock.java

@@ -35,15 +35,15 @@ public class Stock extends BasePo {
      */
     private BigDecimal quantity;
 
-    /**
-     * 维多利亚扩展
-     */
-    private String victoriatouristJson;
-
-    /**
-     * 结存单价
-     */
-    private BigDecimal unitPrice;
+//    /**
+//     * 维多利亚扩展
+//     */
+//    private String victoriatouristJson;
+//
+//    /**
+//     * 结存单价
+//     */
+//    private BigDecimal unitPrice;
 
     /**
      * 归属公司id

hx-wms/src/main/java/com/fjhx/wms/service/monthly/impl/MonthlyInventoryReportServiceImpl.java

@@ -124,10 +124,10 @@ public class MonthlyInventoryReportServiceImpl extends ServiceImpl<MonthlyInvent
                 monthlyInventoryReport.setBalanceQuantity(stock.getQuantity());//结存数量
             }
             monthlyInventoryReport.setBalanceUnitPrice(BigDecimal.ZERO);//结存单价
-            BigDecimal unitPriceOfBalance = stock.getUnitPrice();
-            if (ObjectUtil.isNotEmpty(unitPriceOfBalance)) {
-                monthlyInventoryReport.setBalanceUnitPrice(unitPriceOfBalance);//结存单价
-            }
+//            BigDecimal unitPriceOfBalance = stock.getUnitPrice();
+//            if (ObjectUtil.isNotEmpty(unitPriceOfBalance)) {
+//                monthlyInventoryReport.setBalanceUnitPrice(unitPriceOfBalance);//结存单价
+//            }
             BigDecimal multiply = monthlyInventoryReport.getBalanceQuantity().multiply(monthlyInventoryReport.getBalanceUnitPrice());
             monthlyInventoryReport.setBalanceAmount(multiply);//结存金额
 

hx-wms/src/main/resources/mapper/stock/StockMapper.xml

@@ -10,9 +10,7 @@
                s.create_user,
                s.create_time,
                s.update_user,
-               s.update_time,
-               s.victoriatourist_json,
-               s.unit_price
+               s.update_time
         FROM stock s
                  LEFT JOIN warehouse w on s.warehouse_id = w.id
                  LEFT JOIN product_info pi ON s.product_id = pi.id
@@ -27,9 +25,7 @@
             s.create_user,
             s.create_time,
             s.update_user,
-            s.update_time,
-            sum(json_unquote(s.victoriatourist_json - > '$.frozenQuantity'))    frozenQuantity,
-            sum(json_unquote(s.victoriatourist_json - > '$.defectiveQuantity')) defectiveQuantity
+            s.update_time
         FROM stock s
                  LEFT JOIN product_info pi ON s.product_id = pi.id
             ${ew.customSqlSegment}
@@ -39,8 +35,7 @@
                ps.id           productSpuId,
                ps.`code`       productSpuCode,
                ps.`name`       productSpuName,
-               sum(s.quantity) quantity,
-               pi.victoriatourist_json
+               sum(s.quantity) quantity
         FROM stock s
                  LEFT JOIN product_info pi ON s.product_id = pi.id
                  LEFT JOIN product_spu ps ON pi.product_spu_id = ps.id