Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -787,6 +787,29 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<Map<String, Object>> getHomeOrderRecCost(@RequestBody Map<String, Object> param) {
         return commonService.getHomeOrderRecCost(param);
     }
+
+    /**
+     * @desc :  获取商品系列不分页
+     * @author : 刘尧
+     * @date : 2024/5/29 11:26
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"get_goods_series_no_page"})
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsSeriesListNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsSeriesListNoPage(param);
+    }
+
+    /**
+     * @desc :  获取计量单位不分页
+     * @author : 刘尧
+     * @date : 2024/5/29 11:26
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"get_unit_no_page"})
+    public ResponseResultVO<List<Map<String, Object>>> getUnitNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.getUnitNoPage(param);
+    }
+
 }
 
 

src/main/java/com/dk/mdm/controller/ivt/inbound/InboundOtherController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Api(tags = "其他入库单API接口")
 @RestController
 @RequestMapping("/ivt/inbound_other")
-public class InboundOtherController {
+public class    InboundOtherController {
 
     public BaseService<Inbound> getService() {
         return inboundOtherService;

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/ivt/OutboundItemMapper.xml

@@ -545,6 +545,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 ,t.outing_piece
                 ,t.out_box
                 ,t.out_piece
+                ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id

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

@@ -337,6 +337,9 @@
             <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
                 AND  t.flg_valid = true
             </if>
+            <if test="flgValid != null">
+                AND t.flg_valid = #{flgValid}
+            </if>
         </where>
     </sql>
 
@@ -733,7 +736,7 @@
         tpi.intoing_amt as outing_amt ,
         sys.f_remove_zero(tpi.into_qty)   as out_qty ,
         tpi.into_amt as out_amt,
-        sys.f_remove_zero(tpi.return_qty) as  tpi.return_qty,
+        sys.f_remove_zero(tpi.return_qty) as  return_qty,
         tpi.return_amt,
         tpi.into_date as out_date,
         tpi.remarks,

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

@@ -32,6 +32,5 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
 
     Integer saveSupplierBrand(String supId,String brandId);
 
-    Long checkNameDuplicated(GoodsBrand goodsBrand);
 }
 

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

@@ -240,4 +240,20 @@
     <update id="disableBachByParentId">
         update dkic_b.t_mst_goods_category set  flg_valid = false  where parent_id = #{id}::uuid
     </update>
+
+    <!-- 校验名称不重复 -->
+    <select id="checkNameDuplicated" resultType="java.lang.Long">
+        SELECT COUNT(cat_id)
+        FROM dkic_b.t_mst_goods_category
+        WHERE
+        cp_id = #{cpId}
+        AND flg_valid = TRUE
+        <!-- 通过判断id是否存在判断为新增操作还是修改操作 -->
+        <if test="catId != null and catId != ''">
+            AND cat_id != #{catId}::uuid
+        </if>
+        <if test="catName != null and catName != ''">
+            AND cat_name = #{catName}
+        </if>
+    </select>
 </mapper>

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

@@ -172,7 +172,21 @@
         </foreach>
     </insert>
 
-
+    <!-- 校验名称不重复 -->
+    <select id="checkNameDuplicated" resultType="java.lang.Long">
+        SELECT COUNT(series_id)
+        FROM dkic_b.t_mst_goods_series
+        WHERE
+        cp_id = #{cpId}
+        AND flg_valid = TRUE
+        <!-- 通过判断id是否存在判断为新增操作还是修改操作 -->
+        <if test="seriesId != null and seriesId != ''">
+            AND series_id != #{seriesId}::uuid
+        </if>
+        <if test="seriesName != null and seriesName != ''">
+            AND series_name = #{seriesName}
+        </if>
+    </select>
 
 
 

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

@@ -168,6 +168,21 @@
         </foreach>
     </insert>
 
+    <!-- 校验名称不重复 -->
+    <select id="checkNameDuplicated" resultType="java.lang.Long">
+        SELECT COUNT(unit_id)
+        FROM dkic_b.t_mst_unit
+        WHERE
+        cp_id = #{cpId}
+        AND flg_valid = TRUE
+        <!-- 通过判断id是否存在判断为新增操作还是修改操作 -->
+        <if test="unitId != null and unitId != ''">
+            AND unit_id != #{unitId}::uuid
+        </if>
+        <if test="unitName != null and unitName != ''">
+            AND unit_name = #{unitName}
+        </if>
+    </select>
 
 
 

src/main/java/com/dk/mdm/model/query/ivt/InboundQuery.java

@@ -192,6 +192,9 @@ public class InboundQuery extends PageInfo<InboundQuery>{
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> intoReasonList;
 
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
 
     @ApiModelProperty(value = "入库时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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);
     }
@@ -1042,4 +1043,22 @@ public class CommonService extends BaseService<Map<String, Object>> {
         JSONObject jObject = JSONObject.parseObject(m.get("f_get_home_order_rec_cost").toString());
         return ResponseResultUtil.success(jObject);
     }
+    /**
+     * @desc :  获取商品系列不分页
+     * @author : 刘尧
+     * @date : 2024/5/29 11:26
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsSeriesListNoPage(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.getGoodsSeries(param);
+        return ResponseResultUtil.success(list);
+    }
+    /**
+     * @desc :  获取计量单位不分页
+     * @author : 刘尧
+     * @date : 2024/5/29 16:04
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getUnitNoPage(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.getUnit(param);
+        return ResponseResultUtil.success(list);
+    }
 }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -466,19 +466,19 @@ public class InboundOtherService extends BaseService<Inbound> {
                 //region 将库存需要的参数赋值
                 inboundItemResponse.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.OTHER_INBOUND.getValue());
-                inboundItemResponse.setIntoQty(inboundItemResponse.getIntoQty().negate());
-                inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
+                inboundItemResponse.setIntoQty(inboundItemResponse.getIntoQty());
+                inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt());
                 //endregion
 
-                //赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -511,7 +511,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -520,15 +520,15 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
                 //endregion
 
-                //赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -567,7 +567,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -719,15 +719,15 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 inboundItemResponse.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
                 //endregion
 
-                //region  编辑明细  赋值
-                InboundItem inboundItem = new InboundItem();
-                inboundItem.setItemId(inboundItemResponse.getItemId());
-                inboundItem.setFlgValid(false);
-                //修改
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                //region  编辑明细  赋值 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                InboundItem inboundItem = new InboundItem();
+//                inboundItem.setItemId(inboundItemResponse.getItemId());
+//                inboundItem.setFlgValid(false);
+//                //修改
+//                inboundItemMapper.update(inboundItem,
+//                        new UpdateWrapper<InboundItem>().lambda()
+//                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+//                );
                 //endregion
 
                 //region  销售明细
@@ -807,7 +807,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 inboundItem.setItemId(inboundItemResponse.getItemId());
                 inboundItem.setIntoingQty(BigDecimal.ZERO);
                 inboundItem.setIntoingAmt(BigDecimal.ZERO);
-                inboundItem.setFlgValid(false);
+//                inboundItem.setFlgValid(false);
                 //修改
                 inboundItemMapper.update(inboundItem,
                         new UpdateWrapper<InboundItem>().lambda()

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

@@ -1122,7 +1122,7 @@ public class InventoryService extends BaseService<Inventory> {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_BATCH_DOES_NOT_EXIST.getMessage());
                 } else {
                     //数据库中库存批次数量和传入数量一致 可以更改
-                    if (inventoryResponse.getInvQty().compareTo(inOutRecordVO.getIntoQty().abs()) == 0) {
+                    if (inventoryBatchResponse.getInvQty().compareTo(inOutRecordVO.getIntoQty().abs()) == 0) {
                         InventoryBatch inventoryBatch = new InventoryBatch();
                         //来源单ID
                         inventoryBatch.setFromId(inOutRecordVO.getBiznisId());

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -473,15 +473,15 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //赋值
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                //赋值   防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
             }
             //endregion
 
@@ -513,7 +513,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -918,15 +918,15 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //赋值
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                //赋值  防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
 
                 //region  销售明细
                 if (outboundItemResponse.getFromItemId() != null) {
@@ -1015,7 +1015,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -760,15 +760,15 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
                 //endregion
 
-                //region 赋值明细
-                OutboundItem outboundItem = new OutboundItem();
-                outboundItem.setItemId(outboundItemResponse.getItemId());
-                outboundItem.setFlgValid(false);
-                //修改
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+//                //region 赋值明细  防止作废的单据查不到明细 故注掉下面代码
+//                OutboundItem outboundItem = new OutboundItem();
+//                outboundItem.setItemId(outboundItemResponse.getItemId());
+//                outboundItem.setFlgValid(false);
+//                //修改
+//                outboundItemMapper.update(outboundItem,
+//                        new UpdateWrapper<OutboundItem>().lambda()
+//                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+//                );
                 //endregion
             }
             //endregion
@@ -808,7 +808,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 outboundItem.setItemId(outboundItemResponse.getItemId());
                 outboundItem.setOutingQty(BigDecimal.ZERO);
                 outboundItem.setOutingAmt(BigDecimal.ZERO);
-                outboundItem.setFlgValid(false);
+//                outboundItem.setFlgValid(false);
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()

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

@@ -93,7 +93,10 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
         //设置编码
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
 
-        // 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+        /*
+        * 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+        * 刘尧 2024/5/28
+        * */
         if(goodsBrandMapper.checkNameDuplicated(goodsBrand) > 0){
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_BRAVDNAME.getMessage());
         }

src/main/java/com/dk/mdm/service/mst/GoodsCategoryService.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.GoodsCategoryConvert;
@@ -80,6 +83,15 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
     public ResponseResultVO<?> insert(GoodsCategoryVO goodsCategoryVO) {
         //实体转换
         GoodsCategory goodsCategory = goodsCategoryConvert.convertToPo(goodsCategoryVO);
+
+        /*
+         * 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+         * 刘尧 2024/5/29
+         * */
+        if(goodsCategoryMapper.checkNameDuplicated(goodsCategory) > 0){
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_GOODSCATEGORY.getMessage());
+        }
+
         //设置序号
         goodsCategory.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.GOODSSERIES));
         if (goodsCategory.getParentId() != null) {
@@ -109,6 +121,15 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
     )
     public ResponseResultVO<?> update(GoodsCategoryVO goodsCategoryVO) {
         GoodsCategory goodsCategory = goodsCategoryConvert.convertToPo(goodsCategoryVO);
+
+        /*
+         * 判断是否存在相同名称 如果存在直接返回重复信息 不进行下一部操作
+         * 刘尧 2024/5/29
+         * */
+        if(goodsCategoryMapper.checkNameDuplicated(goodsCategory) > 0){
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_GOODSCATEGORY.getMessage());
+        }
+
         super.updateByUuid(goodsCategory);
         return ResponseResultUtil.success();
     }

src/main/java/com/dk/mdm/service/mst/GoodsSeriesService.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;
@@ -97,6 +100,15 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.SERIES.getName(), true);
 		goodsSeries.setSeriesId(uniqueNoteCode.get("outId").toString());
 		goodsSeries.setSeriesCode(uniqueNoteCode.get("outNote").toString());
+
+		/*
+		 * 判断是否存在相同名称 如果存在直接抛出异常 不进行下一部操作
+		 * 刘尧 2024/5/29
+		 * */
+		if(goodsSeriesMapper.checkNameDuplicated(goodsSeries) > 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_CATNAME.getMessage());
+		}
+
 		//新建
 		goodsSeriesMapper.insert(goodsSeries);
 		return ResponseResultUtil.success(goodsSeries);
@@ -114,6 +126,15 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 	)
 	public ResponseResultVO<?> update(GoodsSeriesVO goodsSeriesVO) {
 		GoodsSeries goodsSeries = goodsSeriesConvert.convertToPo(goodsSeriesVO);
+
+		/*
+		 * 判断是否存在相同名称 如果存在直接抛出异常 不进行下一部操作
+		 * 刘尧 2024/5/29
+		 * */
+		if(goodsSeriesMapper.checkNameDuplicated(goodsSeries) > 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_CATNAME.getMessage());
+		}
+
 		super.updateByUuid(goodsSeries);
 		return ResponseResultUtil.success();
 	}

src/main/java/com/dk/mdm/service/mst/UnitService.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.UnitConvert;
@@ -70,6 +73,15 @@ public class UnitService extends BaseService<Unit> {
 		Unit unit = unitConvert.convertToPo(unitVO);
 		//设置序号
 		unit.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.UNIT));
+
+		/*
+		 * 判断是否存在相同名称 如果存在直接抛出异常 不进行下一部操作
+		 * 刘尧 2024/5/29
+		 * */
+		if(unitMapper.checkNameDuplicated(unit) > 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_UNITNAME.getMessage());
+		}
+
 		//设置编码
 		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.UNIT.getName(), true);
 		unit.setUnitId(uniqueNoteCode.get("outId").toString());
@@ -91,6 +103,15 @@ public class UnitService extends BaseService<Unit> {
 	)
 	public ResponseResultVO<?> update(UnitVO unitVO) {
 		Unit unit = unitConvert.convertToPo(unitVO);
+
+		/*
+		 * 判断是否存在相同名称 如果存在直接抛出异常 不进行下一部操作
+		 * 刘尧 2024/5/29
+		 * */
+		if(unitMapper.checkNameDuplicated(unit) > 0){
+			throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_UNITNAME.getMessage());
+		}
+
 		super.updateByUuid(unit);
 		return ResponseResultUtil.success();
 	}