产品类型修改为String

hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoSelectDto.java

@@ -17,7 +17,7 @@ public class ProductInfoSelectDto extends BaseSelectDto {
     /**
      * 产品类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 定义 1产品 2物料

hx-item/src/main/java/com/fjhx/item/entity/product/po/ProductInfo.java

@@ -41,7 +41,7 @@ public class ProductInfo extends BasePo {
     /**
      * 产品类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 产品名称

hx-mes/src/main/java/com/fjhx/mes/entity/bom/vo/BomInfoVo.java

@@ -24,7 +24,7 @@ public class BomInfoVo extends BomInfo {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 产品编码

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/vo/ArrivalDetailVo.java

@@ -34,7 +34,7 @@ public class ArrivalDetailVo extends ArrivalDetail {
     /**
      * 货品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 所属分类id

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchaseDetail.java

@@ -81,7 +81,7 @@ public class PurchaseDetail extends BasePo {
      * 货品类型
      */
     @TableField(exist = false)
-    private Integer productType;
+    private String productType;
 
     /**
      * 所属分类

hx-purchase/src/main/java/com/fjhx/purchase/entity/sales/vo/SalesReturnDetailVo.java

@@ -32,7 +32,7 @@ public class SalesReturnDetailVo extends SalesReturnDetail {
     /**
      * 货品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 所属分类

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/SubscribeDetail.java

@@ -61,7 +61,7 @@ public class SubscribeDetail extends BasePo {
      * 货品类型
      */
     @TableField(exist = false)
-    private Integer productType;
+    private String productType;
 
     /**
      * 所属分类

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -69,7 +69,7 @@ public class ContractProductVo extends ContractProduct {
     /**
      * 货品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 所属分类id

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/vo/SupplierPriceVo.java

@@ -33,7 +33,7 @@ public class SupplierPriceVo extends SupplierPrice {
     /**
      * 所属类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 货品编码

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/vo/DeliverGoodsDetailsVo.java

@@ -19,7 +19,7 @@ public class DeliverGoodsDetailsVo extends DeliverGoodsDetails {
     /**
      * 产品类型
      */
-    private Integer type;
+    private String type;
     /**
      * 产品编号
      */

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdBackQualityWaitVo.java

@@ -22,7 +22,7 @@ public class JdBackQualityWaitVo extends JdBackQualityWait {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 产品名称

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockController.java

@@ -54,6 +54,14 @@ public class StockController {
     }
 
     /**
+     * 维多利亚 按产品spu查询
+     */
+    @PostMapping("/pageByProductSpu")
+    public Page<StockVo> pageByProductSpu(@RequestBody StockSelectDto dto) {
+        return stockService.pageByProductSpu(dto);
+    }
+
+    /**
      * 库存明细
      */
     @PostMapping("/detail")

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -42,7 +42,7 @@ public class StockJournalDetailsVo extends StockJournalDetails {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
     /**
      * 产品规格
      */

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -22,7 +22,7 @@ public class StockVo extends Stock {
     /**
      * 产品类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 产品编码
@@ -32,7 +32,7 @@ public class StockVo extends Stock {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 规格型号
@@ -59,7 +59,14 @@ public class StockVo extends Stock {
      */
     private String warehouseName;
 
-    /**产品定义*/
+    /**
+     * 产品定义
+     */
     private Integer productDefinition;
 
+    /**
+     * 产品spu名称
+     */
+    private String productSpuName;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -27,7 +27,7 @@ public class StockWaitDetailsVo extends StockWaitDetails {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 规格型号

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -45,7 +45,7 @@ public class StockWaitVo extends StockWait {
     /**
      * 产品类型
      */
-    private Integer productType;
+    private String productType;
 
     /**
      * 规格型号

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockMapper.java

@@ -25,4 +25,6 @@ public interface StockMapper extends BaseMapper<Stock> {
 
     Page<StockVo> pageByProduct(@Param("page") Page<Object> page, @Param("ew") IWrapper<Stock> wrapper);
 
+    Page<StockVo> pageByProductSpu(@Param("page") Page<Object> page, @Param("ew") IWrapper<Stock> wrapper);
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockService.java

@@ -39,6 +39,11 @@ public interface StockService extends BaseService<Stock> {
     Page<StockVo> pageByProduct(StockSelectDto dto);
 
     /**
+     * 维多利亚 按产品spu分类分页
+     */
+    Page<StockVo> pageByProductSpu(StockSelectDto dto);
+
+    /**
      * 库存明细
      */
     Stock detail(StockDto dto);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -111,6 +111,13 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 json.put("code", productInfo.getCode());
                 json.put("spec", productInfo.getSpec());
                 json.put("unit", productInfo.getUnit());
+
+                BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
+                frozenQuantity = ObjectUtil.isEmpty(frozenQuantity)?BigDecimal.ZERO:frozenQuantity;
+                json.put("frozenQuantity",frozenQuantity);
+                BigDecimal defectiveQuantity = json.getBigDecimal("defectiveQuantity");
+                defectiveQuantity = ObjectUtil.isEmpty(defectiveQuantity)?BigDecimal.ZERO:defectiveQuantity;
+                json.put("defectiveQuantity",defectiveQuantity);
                 item.setVictoriatouristJson(json.toJSONString());
             });
         }
@@ -148,7 +155,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         wrapper.eq(Stock::getWarehouseId, dto.getId());
         wrapper.like(Stock::getQuantity, dto.getKeyword());
         wrapper.eq("pi.definition", dto.getDefinition());
-
+        wrapper.groupBy("s.product_id");
         Page<StockVo> page = this.baseMapper.pageByProduct(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
 
@@ -169,6 +176,63 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             json.put("code", productInfo.getCode());
             json.put("spec", productInfo.getSpec());
             json.put("unit", productInfo.getUnit());
+
+            BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
+            frozenQuantity = ObjectUtil.isEmpty(frozenQuantity)?BigDecimal.ZERO:frozenQuantity;
+            json.put("frozenQuantity",frozenQuantity);
+            BigDecimal defectiveQuantity = json.getBigDecimal("defectiveQuantity");
+            defectiveQuantity = ObjectUtil.isEmpty(defectiveQuantity)?BigDecimal.ZERO:defectiveQuantity;
+            json.put("defectiveQuantity",defectiveQuantity);
+            item.setVictoriatouristJson(json.toJSONString());
+        });
+
+        //赋值仓库名称
+        warehouseService.attributeAssign(stockVos, StockVo::getWarehouseId, (item, warehouse) -> {
+            item.setWarehouseName(warehouse.getName());
+        });
+
+        return page;
+    }
+
+    @Override
+    public Page<StockVo> pageByProductSpu(StockSelectDto dto) {
+        IWrapper<Stock> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Stock::getId);
+        wrapper.eq(Stock::getWarehouseId, dto.getId());
+        wrapper.like(Stock::getQuantity, dto.getKeyword());
+        wrapper.eq("pi.definition", dto.getDefinition());
+        wrapper.isNotNull("pi.product_spu_id");
+        wrapper.groupBy("pi.product_spu_id");
+
+        Page<StockVo> page = this.baseMapper.pageByProductSpu(dto.getPage(), wrapper);
+        List<StockVo> stockVos = page.getRecords();
+
+        //赋值产品名称
+        productInfoService.attributeAssign(stockVos, StockVo::getProductId, (item, productInfo) -> {
+            item.setType(productInfo.getType());
+            item.setProductName(productInfo.getName());
+            item.setProductCode(productInfo.getCode());
+            item.setProductUnit(productInfo.getUnit());
+            item.setProductType(productInfo.getType());
+            item.setProductSpec(productInfo.getSpec());
+            item.setProductClassifyId(productInfo.getProductClassifyId());
+            item.setProductDefinition(productInfo.getDefinition());
+
+            //赋值维多利亚扩展产品信息
+            String victoriatouristJson = item.getVictoriatouristJson();
+            JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+            json.put("code", productInfo.getCode());
+            json.put("spec", productInfo.getSpec());
+            json.put("unit", productInfo.getUnit());
+            json.put("productSpuName", item.getProductSpuName());
+
+
+            BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
+            frozenQuantity = ObjectUtil.isEmpty(frozenQuantity)?BigDecimal.ZERO:frozenQuantity;
+            json.put("frozenQuantity",frozenQuantity);
+            BigDecimal defectiveQuantity = json.getBigDecimal("defectiveQuantity");
+            defectiveQuantity = ObjectUtil.isEmpty(defectiveQuantity)?BigDecimal.ZERO:defectiveQuantity;
+            json.put("defectiveQuantity",defectiveQuantity);
             item.setVictoriatouristJson(json.toJSONString());
         });
 

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

@@ -32,9 +32,25 @@
         FROM
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
-        GROUP BY
-            s.product_id
             ${ew.customSqlSegment}
     </select>
+    <select id="pageByProductSpu" resultType="com.fjhx.wms.entity.stock.vo.StockVo">
+        SELECT
+            s.id,
+            ps.`name` productSpuName,
+            pi.product_spu_id,
+            s.warehouse_id,
+            s.product_id,
+            sum( s.quantity ) quantity,
+            s.create_user,
+            s.create_time,
+            s.update_user,
+            s.update_time,
+            JSON_REPLACE(s.victoriatourist_json,'$.frozenQuantity',sum(json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )),'$.defectiveQuantity',sum(json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' ))) victoriatourist_json
+        FROM
+            stock s
+                LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id
+                LEFT JOIN bytesailing_item.product_spu ps ON pi.product_spu_id = ps.id
+    </select>
 
 </mapper>