Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-06 215884a441b4e28fff1ddf5a41a354c38a47e284

Merge branch 'master-zhangxu' into master-test

 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java

File was renamed from phis-feign/src/main/java/com/hz/his/dto/material/Consumables.java
@@ -6,7 +6,7 @@
 * @Author 商品
 */
@Data
public class Consumables {
public class ConsumablesDto {

    /** 中文简称  */
    private String aliasCHS;

 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java

File was renamed from phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java
@@ -6,7 +6,7 @@
 * @Author  物料分类
 */
@Data
public class ConsumablesType {
public class ConsumablesTypeDto {

    /** 名称 必填 */
    private String remarks;

 phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java

@@ -1,9 +1,8 @@
package com.hz.his.feign.service.sync;

import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import com.hz.his.dto.material.Consumables;
import com.hz.his.dto.material.ConsumablesType;
import com.hz.his.dto.material.ConsumablesDto;
import com.hz.his.dto.material.ConsumablesTypeDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -20,33 +19,33 @@
     * @return 操作成功的话result.data返回领建id
     */
    @PostMapping(value = "/sync/goods/category/add")
    Result addCategory(@RequestBody ConsumablesType consumablesType);
    Result addCategory(@RequestBody ConsumablesTypeDto consumablesType);
    /**
     * 修改指定ID分类节点 - 各类型通用
     * @param consumablesType
     * @return
     */
    @PostMapping(value = "/sync/goods/category/update")
    Result updateCategory(@RequestBody ConsumablesType consumablesType);
    Result updateCategory(@RequestBody ConsumablesTypeDto consumablesType);
    /**
     * 删除指定ID分类节点 - 各类型通用
     * @param consumablesType
     * @return
     */
    @PostMapping(value = "/sync/goods/category/delete")
    Result deleteCategory(@RequestBody ConsumablesType consumablesType);
    Result deleteCategory(@RequestBody ConsumablesTypeDto consumablesType);
    /**
     * 删除指定ID分类节点 - 各类型通用
     * @param consumables
     * @return 操作成功的话result.data返回领建id
     */
    @PostMapping(value = "/sync/goods/product/add")
    Result addProduct(@RequestBody Consumables consumables);
    Result addProduct(@RequestBody ConsumablesDto consumables);
    /**
     * 删除指定ID分类节点 - 各类型通用
     * @param consumables
     * @return
     */
    @PostMapping(value = "/sync/goods/product/update")
    Result updateProduct(@RequestBody Consumables consumables);
    Result updateProduct(@RequestBody ConsumablesDto consumables);
}