供应商

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

@@ -57,6 +57,16 @@ public class GoodsSkuController{
     public ResponseResultVO selectById(@PathVariable String id) {
         return goodsSkuService.selectById(id);
     }
+    /**
+     * @desc : 停用
+     * @author : 王英杰
+     * @date : 2023/1/9 10:34
+     */
+    @ApiOperation(value = "停用", notes = "停用")
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
 
 
     /**

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

@@ -9,9 +9,9 @@
     </sql>
 <!--    ,taobj.sum_residue-->
     <sql id="msl_Base_Column_List">
-        msl.sup_id, msl.sup_code, msl.sup_name, msl.sup_type,
+        msl.sup_id, msl.sup_code, msl.sup_name,msl.sup_type,msl.service_categories,
         msl.contact_name, msl.contact_phone, msl.org_id, msl.staff_id,
-        msl.service_categories, msl.remarks, msl.flg_valid, msl.cp_id,
+        msl.remarks, msl.flg_valid, msl.cp_id,
         msl.op_create_time, msl.op_create_user_id, msl.op_update_time,
         msl.op_update_user_id, msl.op_app_code, msl.op_timestamp,
         msl.op_db_user
@@ -178,7 +178,16 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-        ,tms.staff_name,
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS  "supTypeName"
+          ,
+        (
+        SELECT
+        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n, 'zh_CN' ), ',' )
+        FROM
+        sys.t_data_kind AS tdk1
+        WHERE
+        tdk1.kind_code = ANY ( msl.service_categories )
+        ) AS "serviceCategoriesName",
         (SELECT COALESCE
         ( array_to_string( ARRAY_AGG ( tsm.brand_name ), ',' ), '' )
         FROM
@@ -191,6 +200,7 @@
         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
+        LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = msl.sup_type
         <include refid="msl_Condition"/>
         ORDER BY  msl.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

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

@@ -238,6 +238,14 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     @TableField(exist = false)
     @ApiModelProperty(value = "剩余应收付")
     private String brandNames;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "供应商类别")
+    private String supTypeName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "供应商类别")
+    private String serviceCategoriesName;
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -91,7 +91,7 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 	public ResponseResultVO<?> update(GoodsSkuVO goodsSkuVO) {
 		GoodsSku goodsSku = goodsSkuConvert.convertToPo(goodsSkuVO);
 		// 获取编码和主键UuId
-		super.update(goodsSku);
+		super.updateByUuid(goodsSku);
 		return ResponseResultUtil.success();
 	}
 

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

@@ -93,7 +93,7 @@ public class SupplierService extends BaseService<Supplier> {
             supplier.setSupCode(codeMap.get("outNote").toString());  //插入供应商表的实体
 
             super.insert(supplier);// 先插入自己的供应商表
-            if (supplier.getBrandIds() != null) {  //如果有 商品品牌 一起插入品牌
+            if ((supplier.getBrandIds() != null) && (supplier.getBrandIds().size()>0)) {  //如果有 商品品牌 一起插入品牌
                 List<Supplier>  Supplierlst   = new ArrayList<>();
                 List<String> BrandIdList =  new ArrayList<>();
                 BrandIdList = supplier.getBrandIds();