供应商

src/main/java/com/dk/mdm/controller/mst/GoodsSeriesController.java

@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.mst.GoodsSeriesService;
 
+import java.util.List;
+
 @Api(tags = "商品系列API接口")
 @RestController
 @RequestMapping("/mst/goodsSeries")
@@ -37,7 +39,16 @@ public class GoodsSeriesController{
     public ResponseResultVO<PageList<GoodsSeriesResponse>> selectByCond(@RequestBody GoodsSeriesQuery goodsSeriesQuery) {
         return goodsSeriesService.selectByCond(goodsSeriesQuery);
     }
-
+    /**
+     * @desc : 条件查询（不要分页）
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by_nopage"})
+    public ResponseResultVO<List<GoodsSeriesResponse>> listByNopage(@RequestBody GoodsSeriesQuery goodsSeriesQuery) {
+        return goodsSeriesService.listByNopage(goodsSeriesQuery);
+    }
 
     /**
      * @desc : 新建

src/main/java/com/dk/mdm/controller/mst/GoodsSkuController.java

@@ -7,12 +7,10 @@ import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.mst.GoodsSkuQuery;
 import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.vo.mst.GoodsSkuVO;
+import com.dk.mdm.model.vo.mst.SupplierVo;
 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.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.mst.GoodsSkuService;
 
@@ -39,6 +37,26 @@ public class GoodsSkuController{
     public ResponseResultVO<PageList<GoodsSkuResponse>> selectByCond(@RequestBody GoodsSkuQuery goodsSkuQuery) {
         return goodsSkuService.selectByCond(goodsSkuQuery);
     }
+    /**
+     * @desc : 编辑供应商
+     * @author : 王英杰
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "编辑员工", notes = "编辑员工")
+    @PostMapping({"update"})
+    public ResponseResultVO<?> update(@RequestBody GoodsSkuVO goodsSkuVO) {
+        return goodsSkuService.update(goodsSkuVO);
+    }
+
+    /**
+     * @desc : 通过ID查询
+     * @author : 王英杰
+     * @date : 2023/1/9 10:41
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return goodsSkuService.selectById(id);
+    }
 
 
     /**

src/main/java/com/dk/mdm/mapper/mst/GoodsSeriesMapper.java

@@ -22,6 +22,12 @@ public interface GoodsSeriesMapper extends BaseMapper<GoodsSeries>{
      * @date : 2024/2/26 10:36
      */
     List<GoodsSeriesResponse> selectByCond(GoodsSeriesQuery goodsSeriesQuery);
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    List<GoodsSeriesResponse> listByNopage(GoodsSeriesQuery goodsSeriesQuery);
 
     /**
      * @desc   : 根据条件进行查询（数量）

src/main/java/com/dk/mdm/mapper/mst/GoodsSeriesMapper.xml

@@ -91,7 +91,15 @@
             limit #{end} offset #{start}
         </if>
     </select>
+    <!-- 查询表t_mst_goods_series，（条件查询+分页）列表 -->
+    <select id="listByNopage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_mst_goods_series
+        <include refid="Condition"/>
+        order by display_no asc
 
+    </select>
     <!-- 查询表t_mst_goods_series，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -93,7 +93,7 @@
                 AND tmgs.conversion_factor = #{conversionFactor}
             </if>
             <if test="seriesId != null and seriesId != ''">
-                AND tmgs.series_id = #{seriesId}
+                AND tmgs.series_id = #{seriesId}::uuid
             </if>
             <if test="skuSpec != null and skuSpec != ''">
                 AND tmgs.sku_spec = #{skuSpec}
@@ -138,7 +138,10 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_JOIN"/>
+        ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName"
         FROM dkic_b.t_mst_goods_sku  tmgs
+        LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+        LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -154,10 +157,20 @@
     </select>
 
     <!-- 根据主键查询表t_mst_goods_sku的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_JOIN"/>
-        FROM dkic_b.t_mst_goods_sku tmgs
+        ,tmgb.brand_name AS "brandName"
+           ,tmgc.cat_name AS "catName"
+        ,tmu.unit_name AS "unitName"
+        ,subtmu.unit_name AS "subUnitName"
+        ,tmgsr.series_name AS "seriesName"
+        FROM dkic_b.t_mst_goods_sku  tmgs
+        LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+        LEFT JOIN dkic_b.t_mst_goods_category tmgc ON tmgc.cat_id = tmgs.category_id
+        LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
+        LEFT JOIN dkic_b.t_mst_unit subtmu ON subtmu.unit_id = tmgs.sub_unit_id
+        LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
         WHERE tmgs.sku_id = #{skuId}::uuid
     </select>
 

src/main/java/com/dk/mdm/mapper/mst/SupplierMapper.xml

@@ -189,7 +189,6 @@
         ) AS "brandName"
         ,tmo.org_name
         FROM dkic_b.t_mst_supplier msl
-        LEFT JOIN dkic_b.t_mst_supplier_brand mslb ON msl.sup_id = mslb.sup_id
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
         <include refid="msl_Condition"/>
@@ -230,7 +229,6 @@
         ,tms.staff_name
         ,tmo.org_name
         FROM dkic_b.t_mst_supplier msl
-
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
         WHERE msl.sup_id = #{supId}::uuid

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -260,7 +260,25 @@ public class GoodsSkuResponse implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品品牌")
+    private String brandName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品系列")
+    private String seriesName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品种类")
+    private String catName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "计量单位")
+    private String unitName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "辅助单位")
+    private String subUnitName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/service/mst/GoodsSeriesService.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -67,7 +68,16 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 				goodsSeriesMapper.countByCond(goodsSeriesQuery));
 	}
 
+	/**
+	 * @desc : 查询
+	 * @author : 王英杰
+	 * @date : 2023/1/5 9:39
+	 */
+	@Pagination
+	public ResponseResultVO<List<GoodsSeriesResponse>> listByNopage(GoodsSeriesQuery goodsSeriesQuery) {
 
+		return  ResponseResultUtil.success(goodsSeriesMapper.listByNopage(goodsSeriesQuery)) ;
+	}
 
 	/**
 	 * @desc : 新建

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -80,6 +80,19 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 		super.insert(goodsSku);
 		return ResponseResultUtil.success();
 	}
-
+	/**
+	 * @desc : 新建
+	 * @author : 王英杰
+	 * @date : 2023/1/5 9:39
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> update(GoodsSkuVO goodsSkuVO) {
+		GoodsSku goodsSku = goodsSkuConvert.convertToPo(goodsSkuVO);
+		// 获取编码和主键UuId
+		super.update(goodsSku);
+		return ResponseResultUtil.success();
+	}
 
 }