1

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsSpuRest.java

@@ -76,4 +76,9 @@ public class BaseGoodsSpuRest {
     public ResultBean  importExcel(@RequestParam("file")MultipartFile file) throws IOException {
         return baseGoodsSpuService.importExcel(file);
     }
+    @ApiOperation("更改可用状态")
+    @GetMapping("/updateIsEnablebySku/{sid}/{isEnable}")
+    public ResultBean updateIsEnablebySku(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable){
+        return baseGoodsSpuService.updateIsEnablebySku(sid,isEnable);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java

@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.func.basegoodsspu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -384,5 +385,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         }
         return baseGoodsSpuDto;
     }
-
+    public ResultBean updateIsEnablebySku(String sid, String isEnable) {
+        return baseGoodsSpuFeign.updateIsEnablebySku(sid,isEnable);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java

@@ -84,5 +84,6 @@ public class SysStaffinfoDetailsVo implements Vo {
     private String userType;//用户类型:1员工、2客户、3供应商
     private String userName;
     private String remarks;
+    private String orgSid;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java

@@ -15,6 +15,7 @@ public class SysStaffOrgDetailsVo implements Vo {
 
     @ApiModelProperty("部门sid")
     private String orgSid;
+    private String orgSid1;
     @ApiModelProperty("部门名称")
     private String orgName;
     @ApiModelProperty("部门路径")

wms/src/main/java/com/yxt/wms/biz/func/sysstafforg/SysStaffOrgDto.java

@@ -28,6 +28,7 @@ public class SysStaffOrgDto implements Dto {
     private static final long serialVersionUID = 1403491378761015027L;
     @ApiModelProperty("部门sid")
     private String orgSid;
+    private String orgSid1;
     @ApiModelProperty("部门名称")
     @NotBlank(message = "部门名称不能为空")
     private String orgName;

wms/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java

@@ -51,4 +51,7 @@ public interface BaseGoodsSpuFeign {
     @ApiOperation("导入excel")
     @PostMapping(value ="/importExcel" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResultBean  importExcel(@RequestPart("file") MultipartFile file) throws IOException;
+    @ApiOperation("更改可用状态")
+    @GetMapping("/updateIsEnablebySku/{sid}/{isEnable}")
+    public ResultBean updateIsEnablebySku(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable);
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java

@@ -57,4 +57,9 @@ public class BaseGoodsSpuFeignFallback implements BaseGoodsSpuFeign {
     public ResultBean importExcel(MultipartFile file) throws IOException {
         return null;
     }
+
+    @Override
+    public ResultBean updateIsEnablebySku(String sid, String isEnable) {
+        return null;
+    }
 }