问题修改

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

@@ -37,6 +37,7 @@ public class BaseGoodsSpuRest {
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
     public ResultBean<String> saveOrUpdate(@RequestBody BaseGoodsSpuDto dto) {
+
         return baseGoodsSpuService.saveOrUpdate(dto);
     }
     //    @ApiOperation("保存商品信息及sku")

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

@@ -0,0 +1,46 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailQuery;
+import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailService;
+import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:53
+ */
+@Api(tags = "库存调整明细")
+@RestController
+@RequestMapping("/apiadmin/inventoryadjustmentdetail")
+public class InventoryAdjustmentDetailRest {
+
+    @Autowired
+    InventoryAdjustmentDetailService inventoryAdjustmentDetailService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<InventoryAdjustmentDetailVo>> listPage(@RequestBody PagerQuery<InventoryAdjustmentDetailQuery> pq) {
+        return inventoryAdjustmentDetailService.listPage(pq);
+    }
+
+
+//    @ApiOperation("保存修改")
+//    @PostMapping("/saveOrUpdate")
+//    public ResultBean<String> saveOrUpdate(@RequestBody InventoryAdjustmentDetailDto dto) {
+//        return inventoryAdjustmentDetailService.saveOrUpdate(dto);
+//    }
+
+
+
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -70,7 +70,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         BaseBrandInfoVo baseBrandInfoVo=w.getData();
         baseBrandInfoVo.setImage(fileUploadComponent.getUrlPrefix() + baseBrandInfoVo.getImage());
-         return baseBrandInfoFeign.initialization(sid);
+         return new ResultBean<BaseBrandInfoVo>().success().setData(baseBrandInfoVo);
     }
 
 

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

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -8,8 +9,11 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
 import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
+import com.yxt.wms.biz.func.basegoodsskuextend.UrlsVo;
 import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
 import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
@@ -60,6 +64,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     BaseGoodsSpuFeign baseGoodsSpuFeign;
     @Autowired
     CommonMethod commonMethod;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
 
     public ResultBean<PagerVo<BaseGoodsSpuVo>> listPage(PagerQuery<BaseGoodsSpuQuery> pq) {
@@ -73,12 +79,35 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     @Transactional
     public ResultBean<String> saveOrUpdate(BaseGoodsSpuDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        for (BaseGoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
+            baseGoodsSkus.getBaseGoodsSkuExtend().setPicUrl("");
+            for (UrlsVo url : baseGoodsSkus.getBaseGoodsSkuExtend().getUrls()) {
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                String path = url.getUrl().substring(urlPrefix.length());
+                if(StringUtils.isBlank(baseGoodsSkus.getBaseGoodsSkuExtend().getPicUrl())){
+                    baseGoodsSkus.getBaseGoodsSkuExtend().setPicUrl(path);
+                }else{
+                    baseGoodsSkus.getBaseGoodsSkuExtend().setPicUrl(baseGoodsSkus.getBaseGoodsSkuExtend().getPicUrl()+","+path);
+                }
+            }
+        }
         return baseGoodsSpuFeign.saveOrUpdate(dto);
     }
 
     public ResultBean<BaseGoodsSpuVo> initialization(String sid) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<BaseGoodsSpuVo> rb = ResultBean.fireFail();
-        return baseGoodsSpuFeign.initialization(sid);
+        ResultBean<BaseGoodsSpuVo> w=baseGoodsSpuFeign.initialization(sid);
+        if(!w.getCode().equals("200")){
+            return w;
+        }
+        BaseGoodsSpuVo baseGoodsSpuVo=w.getData();
+        for (BaseGoodsSkuVo baseGoodsSkus : baseGoodsSpuVo.getBaseGoodsSkus()) {
+            for (UrlsVo url : baseGoodsSkus.getBaseGoodsSkuExtend().getUrls()) {
+                url.setUrl(fileUploadComponent.getUrlPrefix() + url.getUrl());
+            }
+        }
+
+        return rb.success().setData(baseGoodsSpuVo);
     }
 
 

wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class BaseGoodsTypeQuery implements Query {
     private String name;//名字
     private String code;//编码
-    private String IsGoodID;//是否一品一码（goodID），0否，1是
+    private String goodID;//是否一品一码（goodID），0否，1是
     private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2）
     private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustment/InventoryAdjustmentService.java

@@ -10,8 +10,11 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSku;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailVo;
 import com.yxt.wms.biz.func.warehouseinfo.WarehouseInfoVo;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackVo;
@@ -52,11 +55,16 @@ public class InventoryAdjustmentService extends MybatisBaseService<InventoryAdju
     BaseGoodsSpuFeign baseGoodsSpuFeign;
     @Autowired
     WarehouseRackFeign warehouseRackFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<InventoryAdjustmentVo>> listPage(PagerQuery<InventoryAdjustmentQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        InventoryAdjustmentQuery query = pq.getParams();
+        InventoryAdjustmentQuery query=pq.getParams();
-        QueryWrapper<InventoryAdjustment> qw = new QueryWrapper<>();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return inventoryAdjustmentFeign.listPage(pq);
     }
     public ResultBean<InventoryAdjustmentVo> getAllType(OrgPathQuery query) {

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetail.java

@@ -17,10 +17,13 @@ public class InventoryAdjustmentDetail extends BaseEntity {
     private String rackSid;
     private String rackName;
     private String rackCode;
-    private String goodsSpuSid;//仓库sid
+    private String goodsSpuSid;//商品
-    private String goodsSpuName;//库位容量
+    private String goodsSpuName;//
-    private String goodsSkuSid;//计量单位
+    private String goodsSkuSid;//
-    private String goodsSkuTitle;//货区类型
+    private String goodsSkuTitle;//商品名
+    private String barCode;//条码
+    private String goodsSkuCode;//商品编码
+    private String goodsSkuOwnSpec;//商品规格
     private String count;
     private String unit;
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailDto.java

@@ -25,12 +25,15 @@ public class InventoryAdjustmentDetailDto implements Dto {
     private String rackSid;
     private String rackName;
     private String rackCode;
-    private String goodsSpuSid;//仓库sid
+    private String goodsSpuSid;//商品
-    private String goodsSpuName;//库位容量
+    private String goodsSpuName;//
-    private String goodsSkuSid;//计量单位
+    private String goodsSkuSid;//
-    private String goodsSkuTitle;//货区类型
+    private String goodsSkuTitle;//商品名
+    private String barCode;//条码
+    private String goodsSkuCode;//商品编码
+    private String goodsSkuOwnSpec;//商品规格
     private String count;
-    private String userSid;
     private String unit;
+    private String userSid;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailQuery.java

@@ -10,9 +10,9 @@ import lombok.Data;
  */
 @Data
 public class InventoryAdjustmentDetailQuery implements Query {
-    private String endTime;//结束
+    private String end;//结束
-    private String startTime;//开始
+    private String start;//开始
-    private String billNo;//单据
+    private String brandSid;//单据
     private String goodsSkuSid;//商品
     private String type;//类型
     private String operator;//操作员

wms/src/main/java/com/yxt/wms/biz/func/inventoryadjustmentdetail/InventoryAdjustmentDetailService.java

@@ -10,7 +10,12 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
+import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentQuery;
+import com.yxt.wms.feign.warehouse.inventoryadjustmentdetail.InventoryAdjustmentDetailFeign;
 import com.yxt.wms.utils.OrgPathQuery;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -23,57 +28,20 @@ import java.util.stream.Collectors;
  */
 @Service
 public class InventoryAdjustmentDetailService extends MybatisBaseService<InventoryAdjustmentDetailMapper, InventoryAdjustmentDetail> {
+    @Autowired
+    InventoryAdjustmentDetailFeign inventoryAdjustmentDetailFeign;
 
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<InventoryAdjustmentDetailVo>> listPage(PagerQuery<InventoryAdjustmentDetailQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        InventoryAdjustmentDetailQuery query = pq.getParams();
+        InventoryAdjustmentDetailQuery query=pq.getParams();
-        QueryWrapper<InventoryAdjustmentDetail> qw = new QueryWrapper<>();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-            //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
+        pq.getParams().setIndex(dataRule.getIndex());
-            String orgLevelKey=query.getOrgLevelKey();
+        return inventoryAdjustmentDetailFeign.listPage(pq);
-            String orgSidPath=query.getOrgPath();
-            int index=query.getIndex();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
-            } else if ("4".equals(orgLevelKey)) {
-                qw.eq("a.createBySid", query.getUserSid());
-            } else {
-                PagerVo<InventoryAdjustmentDetailVo> p = new PagerVo<>();
-                return rb.success().setData(p);
-            }
-        } else {
-            PagerVo<InventoryAdjustmentDetailVo> p = new PagerVo<>();
-            return rb.success().setData(p);
-        }
-        qw.apply(StringUtils.isNotBlank(query.getStartTime()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getStartTime() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getEndTime()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
-                );
-        if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("a.areaName", query.getBillNo());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuSid())) {
-            qw.like("a.areaCode", query.getGoodsSkuSid());
-        }
-        if (StringUtils.isNotBlank(query.getType())) {
-            qw.eq("b.sid", query.getType());
-        }
-        if (StringUtils.isNotBlank(query.getOperator())) {
-            qw.eq("c.sid", query.getOperator());
-        }
-        qw.ne("a.isDelete", "1");
-        IPage<InventoryAdjustmentDetail> page = PagerUtil.queryToPage(pq);
-        IPage<InventoryAdjustmentDetailVo> pagging = baseMapper.listPage(page, qw);
-        PagerVo<InventoryAdjustmentDetailVo> p = PagerUtil.pageToVo(pagging, null);
-        return rb.success().setData(p);
     }
     public ResultBean<InventoryAdjustmentDetailVo> getAllType(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();

wms/src/main/java/com/yxt/wms/feign/warehouse/inventoryadjustmentdetail/InventoryAdjustmentDetailFeign.java

@@ -0,0 +1,41 @@
+package com.yxt.wms.feign.warehouse.inventoryadjustmentdetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentDto;
+import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentQuery;
+import com.yxt.wms.biz.func.inventoryadjustment.InventoryAdjustmentVo;
+import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailQuery;
+import com.yxt.wms.biz.func.inventoryadjustmentdetail.InventoryAdjustmentDetailVo;
+import com.yxt.wms.utils.OrgPathQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存调整明细")
+@FeignClient(
+        contextId = "ss-common-warehouse-InventoryAdjustmentDetail",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/inventoryadjustmentdetail"
+        )
+public interface InventoryAdjustmentDetailFeign {
+    @ApiOperation("分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<InventoryAdjustmentDetailVo>> listPage(@RequestBody PagerQuery<InventoryAdjustmentDetailQuery> pq);
+
+}