Merge remote-tracking branch 'origin/master'

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

@@ -559,6 +559,7 @@
         tmgu.unit_name         as "unitName",
         tmgu.decimal_places    as "decimalPlaces",
         tmgs.sub_unit_id       as "subUnitId",
+        tmgus.unit_name        as "subUnitName",
         tmgs.conversion_factor as "conversionFactor",
         tmgs.series_id         as "seriesId",
         tmgseries.series_name  as "seriesName",
@@ -575,6 +576,7 @@
         left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
         left join dkic_b.t_mst_goods_series as tmgseries on tmgs.series_id = tmgseries.series_id
         left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+        left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
         where tmgs.flg_valid
         AND tmgs.cp_id = #{cpId}
         <if test="skuCode != null">

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

@@ -496,7 +496,6 @@
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
         left join dkic_b.t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
         WHERE tpi.into_id = #{id}::uuid
-        and tpi.flg_valid
     </select>
 
     <!-- 根据主键锁定表t_psi_inbound的一行数据 -->

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -180,7 +180,7 @@
     <select id="getReceivableAccountSum" resultType="Map">
         SELECT SUM
         ( CASE WHEN tmai.acc_item_type = '账款类型-应收' THEN tmai.amt_should ELSE 0 END ) AS receivable,
-        SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_should ELSE 0 END ) AS receipt
+        SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_rec ELSE 0 END ) AS receipt
         FROM
         dkic_b.t_mac_account_item tmai
         WHERE

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

@@ -5,6 +5,7 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mst.Role;
 import com.dk.mdm.model.query.mst.GoodsBrandQuery;
 import com.dk.mdm.model.response.mst.GoodsBrandResponse;
+import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -30,5 +31,7 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
     Long countByCond(GoodsBrandQuery goodsBrandQuery);
 
     Integer saveSupplierBrand(String supId,String brandId);
+
+    Long checkNameDuplicated(GoodsBrand goodsBrand);
 }
 

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

@@ -154,6 +154,22 @@
         for update
     </select>
 
+    <!-- 校验名称不重复 -->
+    <select id="checkNameDuplicated" resultType="java.lang.Long">
+        SELECT COUNT(brand_id)
+        FROM dkic_b.t_mst_goods_brand
+        WHERE
+        cp_id = #{cpId}
+        AND flg_valid = TRUE
+        <!-- 通过判断id是否存在判断为新增操作还是修改操作 -->
+        <if test="brandId != null and brandId != ''">
+            AND brand_id != #{brandId}::uuid
+        </if>
+        <if test="brandName != null and brandName != ''">
+            AND brand_name = #{brandName}
+        </if>
+    </select>
+
     <insert id="insertBatch">
         insert into dkic_b.t_mst_goods_brand
         (

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -568,7 +568,7 @@
         t.return_amt,
         t.remarks,
         t.item_qty - coalesce(sumQty,0) as "transferableQuantity"
-        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where t.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id

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

@@ -545,7 +545,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @date : 2024/3/1 9:20
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
-        // 获取公司
+        // 有效的品牌 230529
+        param.put("flgValid",true);
         List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
         return ResponseResultUtil.success(list);
     }

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

@@ -1,8 +1,11 @@
 package com.dk.mdm.service.mst;
 
+import com.dk.common.exception.BaseBusinessException;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.GoodsBrandConvert;
@@ -89,6 +92,12 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
         goodsBrand.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.GOODSBRAND));
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
+
+        // 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+        if(goodsBrandMapper.checkNameDuplicated(goodsBrand) > 0){
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_BRAVDNAME.getMessage());
+        }
+
         goodsBrand.setBrandId(uniqueNoteCode.get("outId").toString());
         goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
         //新建
@@ -115,9 +124,12 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
     )
     public ResponseResultVO<?> updateGoodsBrand(GoodsBrandVO goodsBrandVO) {
         GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
+        // 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+        if(goodsBrandMapper.checkNameDuplicated(goodsBrand) > 0){
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_BRAVDNAME.getMessage());
+        }
         super.updateByUuid(goodsBrand);
         return ResponseResultUtil.success();
     }
 
-
 }