出库明细

src/main/java/com/dk/mdm/controller/ivt/inventory/InventoryController.java

@@ -1,7 +1,17 @@
 package com.dk.mdm.controller.ivt.inventory;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inventory;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.query.ivt.InventoryQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+import com.dk.mdm.model.response.ivt.InventoryResponse;
+import com.dk.mdm.model.vo.ivt.InventoryVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,4 +30,15 @@ public class InventoryController{
     @Autowired
     private InventoryService inventoryService;
 
+    /**
+     * @desc   : 条件查询
+     * @date   : 2024/3/7 14:09
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<InventoryResponse>> selectByCond(@RequestBody InventoryQuery query) {
+        return inventoryService.selectByCond(query);
+    }
+
 }

src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -56,6 +56,10 @@
                 <result column="brand_name" property="brandName"/>
                 <result column="short_name" property="shortName"/>
                 <result column="wh_name" property="whName"/>
+                <result column="price_purchase" property="pricePurchase"/>
+                <result column="price_standard" property="priceStandard"/>
+                <result column="price_wholesale" property="priceWholesale"/>
+                <result column="price_limited" property="priceLimited"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -113,6 +117,10 @@
         ,tmgs.sku_model
         ,tmgs.sku_name
         ,tmgs.sku_spec
+        ,tmgs.price_purchase
+        ,tmgs.price_standard
+        ,tmgs.price_wholesale
+        ,tmgs.price_limited
         ,tmgb.brand_name
         ,tmgb.short_name
         ,tmw.wh_name
@@ -136,6 +144,7 @@
     <sql id="Join_Table">
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpi.sku_id
         left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
+        LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
     </sql>
 
 

src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java

@@ -185,6 +185,36 @@ public class InventoryResponse {
     private String whName;
 
 
+    /**
+     * 采购价
+     */
+    @Excel(name = "采购价")
+    @ApiModelProperty(value = "采购价")
+    private BigDecimal pricePurchase;
+
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
+
+
+    /**
+     * 批发价
+     */
+    @Excel(name = "批发价")
+    @ApiModelProperty(value = "批发价")
+    private BigDecimal priceWholesale;
+
+
+    /**
+     * 销售限价
+     */
+    @Excel(name = "销售限价")
+    @ApiModelProperty(value = "销售限价")
+    private BigDecimal priceLimited;
+
 
 
     private static final long serialVersionUID = 1L;

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

@@ -1,11 +1,17 @@
 package com.dk.mdm.service.ivt.inventory;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inventory;
 import com.dk.mdm.mapper.ivt.InventoryMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InventoryQuery;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+import com.dk.mdm.model.response.ivt.InventoryResponse;
 import com.dk.mdm.model.vo.ivt.InventoryVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +33,18 @@ public class InventoryService extends BaseService<Inventory> {
 
 	@Autowired
 	private InventoryMapper inventoryMapper;
+
+
+	/**
+	 * @desc : 条件查询
+	 * @date : 2024/3/18 11:20
+	 * @author : 寇珊珊
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<InventoryResponse>> selectByCond(InventoryQuery query) {
+		return super.mergeListWithCount(query, inventoryMapper.selectByCond(query),
+				inventoryMapper.countByCond(query));
+	}
 	
 	
 	/**