供应商

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -447,7 +447,16 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(@RequestBody Map<String, Object> param) {
         return commonService.getGoodsCategoryNoPage(param);
     }
-
+    /**
+     * @desc :  商品种类查询
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"get_goods_category_tree"})
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryTree(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsCategoryTree(param);
+    }
 
     /**
      * @desc :  计量单位查询

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -285,6 +285,12 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2024/3/1 9:21
      */
     List<Map<String, Object>> getGoodsBrand(Map param);
+    /**
+     * @desc : 获取商品品牌 树形查询
+     * @author : 王英杰
+     * @date : 2024/3/1 9:21
+     */
+    List<Map<String, Object>> getGoodsCategoryTree(Map param);
 
     /**
      * @desc : 获取商品品牌数量

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -703,6 +703,67 @@
         </if>
     </select>
 
+    <!--    查询商品种类-->
+    <select id="getGoodsCategoryTree" resultType="java.util.Map">
+        SELECT
+        T.cat_id AS "catId",
+        T.cat_code AS "catCode",
+        T.cat_name AS "catName",
+        T.parent_id AS "parentId",
+        T.flg_valid AS "flgValid"
+        FROM
+        (--当前数据
+        SELECT
+        tmgc.cat_id,
+        tmgc.cat_code,
+        tmgc.cat_name,
+        tmgc.parent_id,
+        tmgc.flg_valid
+        FROM
+        dkic_b.t_mst_goods_category tmgc
+        <where>
+            <if test="searchText !=null">
+                AND ( tmgc.cat_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or tmgc.remarks LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
+            </if>
+            <if test="cpId != null">
+                AND tmgc.cp_id = #{cpId}
+            </if>
+        </where>
+        UNION ALL--父级
+        SELECT
+        tmgcp.cat_id,
+        tmgcp.cat_code,
+        tmgcp.cat_name,
+        tmgcp.parent_id,
+        tmgcp.flg_valid
+        FROM
+        dkic_b.t_mst_goods_category tmgc
+        LEFT JOIN dkic_b.t_mst_goods_category tmgcp ON tmgc.cat_id = ANY ( tmgcp.level_lower )
+        <where>
+            <if test="searchText !=null">
+                AND ( tmgc.cat_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or tmgc.remarks LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
+            </if>
+            <if test="cpId != null">
+                AND tmgc.cp_id = #{cpId}
+            </if>
+        </where>
+        ) T
+        WHERE T.cat_id IS NOT NULL
+        GROUP BY
+        T.cat_id,
+        T.cat_code,
+        T.cat_name,
+        T.parent_id,
+        T.flg_valid
+
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+
+    </select>
+
     <!-- 查询表t_mst_goods_brand，（条件查询）个数 -->
     <select id="countGoodsBrand" resultType="Long">
         SELECT

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

@@ -66,7 +66,7 @@
     <sql id="Condition">
         <where>
             <if test="whId != null and whId != ''">
-                AND tpi.wh_id = #{whId}
+                AND tpi.wh_id = #{whId}::UUID
             </if>
             <if test="skuId != null and skuId != ''">
                 AND tpi.sku_id = #{skuId}

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

@@ -139,7 +139,7 @@
                 )
             </if>
             <if test="searchText !=null">
-                AND ( tmgs.sku_name LIKE concat('%', #{searchText}, '%')
+                AND tmgs.sku_name LIKE concat('%', #{searchText}, '%')
             </if>
         </where>
     </sql>
@@ -163,14 +163,7 @@
         LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
         LEFT JOIN dkic_b.t_psi_inventory tpi ON tpi.sku_id = tmgs.sku_id
         <include refid="Condition"/>
-        ORDER BY CASE
-        WHEN #{sort}  = 2 THEN tpi.usable_qty
-        ELSE NULL
-        END ASC,
-        CASE
-        WHEN #{sort} != 2 THEN tpi.usable_qty
-        ELSE NULL
-        END DESC
+        order by  tmgs.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/model/pojo/mst/Supplier.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -56,7 +57,12 @@ public class Supplier extends PageInfo<Supplier> implements Serializable {
     @ApiModelProperty(value = "供应商编号")
     private String supCode;
 
-
+    /**
+     * 初始金额
+     */
+    @Excel(name = "初始金额")
+    @ApiModelProperty(value = "初始金额")
+    private int startAmount;
     /**
      * 供应商名称
      */

src/main/java/com/dk/mdm/model/vo/mst/SupplierVo.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -145,6 +146,13 @@ public class SupplierVo extends PageInfo<SupplierVo> implements Serializable {
     @ApiModelProperty(value = "商品品牌")
     private String brandId;
 
+    /**
+     * 初始金额
+     */
+    @Excel(name = "初始金额")
+    @ApiModelProperty(value = "初始金额")
+    private int startAmount;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "剩余应收付")
     private String sumResidue;

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -673,7 +673,16 @@ public class CommonService extends BaseService<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.getGoodsCategory(param);
         return ResponseResultUtil.success(list);
+    }    /**
+     * @desc :  商品种类查询  树形
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryTree(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.getGoodsCategoryTree(param);
+        return ResponseResultUtil.success(list);
     }
+
     /**
      * @desc : 获取页面数据源集合 (小程序用)
      * @author : 于继渤
@@ -713,6 +722,10 @@ public class CommonService extends BaseService<Map<String, Object>> {
         if (dataSourceCode.equals("org")) {
             list = commonMapper.getOrg(map);
         }
+        //品牌
+        if (dataSourceCode.equals("brand")) {
+            list = commonMapper.getGoodsBrand(map);
+        }
         //员工
         if (dataSourceCode.equals("staff")) {
             list = commonMapper.getStaff(map);

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

@@ -94,6 +94,10 @@ public class SupplierService extends BaseService<Supplier> {
                  }
                 supplierMapper.insertSupplierBrandtBatch(Supplierlst); // 向供应商品牌表插入数据
             }
+
+             if(supplier.getStartAmount()>0) {
+
+             }
             return ResponseResultUtil.success();
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // 手动回滚事务