wms

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

@@ -3,10 +3,7 @@ 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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.*;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuService;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuService;
@@ -41,7 +38,7 @@ public class BaseGoodsSkuRest {
     }
     @ApiOperation("入库添加商品列表")
     @PostMapping("/getSelectList")
-    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+    ResultBean<PagerVo<SkuSelectList1>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
         return baseGoodsSkuService.getSelectList(pagerQuery);
     }
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java

@@ -11,7 +11,26 @@ import lombok.Data;
 @Data
 public class BaseGoodsSkuSelectQuery implements Query {
 
-    private String goodsSkuCode;
-    private String goodsSpuName;
     private String createOrgSid;
+    //商品编码
+    private String goodsCode;
+    //商品名称
+    private String goodsName;
+    //条形码
+    private String barCode;
+    //规格编码
+    private String goodsSkuCode;
+    //规格型号
+    private String title;
+    //具体规格
+    private String ownSpec;
+    //品牌
+    private String brandName;
+    //厂家
+    private String manufacturerName;
+    //分类
+    private String typeName;
+    //厂家货号
+    private String manufacturerCode;
+
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java

@@ -124,7 +124,7 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         return rb.success().setData(baseGoodsSkuDetailsVo);
     }
 
-    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+    public ResultBean<PagerVo<SkuSelectList1>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
         return baseGoodsSkuFeign.getSelectList(pagerQuery);
     }
 

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/SkuSelectList1.java

@@ -0,0 +1,49 @@
+package com.yxt.wms.biz.func.basegoodssku;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class SkuSelectList1 {
+
+    //spusid
+    private String goodsSpuSid;
+    //商品编码
+    private String goodsCode;
+    //商品名称
+    private String goodsName;
+    //条形码
+    private String barCode;
+
+    private String goodsSkuSid;
+    //规格编码
+    private String goodsSkuCode;
+    //规格型号
+    private String title;
+    //具体规格
+    private String ownSpec;
+    //分类
+    private String typeName;
+    private String typeSid;
+    //品牌
+    private String brandName;
+    private String brandSid;
+    //厂家名
+    private String manufacturerSid;
+    private String manufacturerName;
+    //厂家货号
+    private String factoryCode;
+    //单位
+    private String unit;
+    private String unitSid;
+    //销售单价
+    private BigDecimal salesPrice=new BigDecimal(0);
+
+
+}

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

@@ -27,6 +27,8 @@ public class BaseGoodsSpuQuery implements Query {
     private String brandName;
     //厂家
     private String manufacturerName;
+    //分类
+    private String typeName;
     //厂家货号
     private String manufacturerCode;
     private String orgLevelKey;//权限等级

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

@@ -137,7 +137,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     public void download(HttpServletRequest request, HttpServletResponse response) {
 
         // 指定要下载的文件路径
-        String filePath = path + "商享通商品导入明细模版 .xls";
+        String filePath = path + "商享通商品导入明细模版.xls";
         String fileName = new File(filePath).getName();
         String encodedFileName = null;
         try {
@@ -186,27 +186,27 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 BaseGoodsSpuDto dto = new BaseGoodsSpuDto();
                 String spuCode = StringUtils.isEmpty(list.get(i)[0]) ? null : list.get(i)[0];
                 if (StringUtils.isBlank(spuCode)) {
-                    return rb.setMsg("第" + (i + 1) + "商品编码为空！");
+                    return rb.setMsg("第" + (i + 1) + "行商品编码为空！");
                 }
                 String spuName = StringUtils.isEmpty(list.get(i)[2]) ? null : list.get(i)[2];
                 if (StringUtils.isBlank(spuName)) {
-                    return rb.setMsg("第" + (i + 1) + "商品名称为空！");
+                    return rb.setMsg("第" + (i + 1) + "行商品名称为空！");
                 }
                 String type = StringUtils.isEmpty(list.get(i)[6]) ? null : list.get(i)[6];
                 if (StringUtils.isBlank(type)) {
-                    return rb.setMsg("第" + (i + 1) + "商品分类为空！");
+                    return rb.setMsg("第" + (i + 1) + "行商品分类为空！");
                 }
                 String brand = StringUtils.isEmpty(list.get(i)[7]) ? null : list.get(i)[7];
                 if (StringUtils.isBlank(brand)) {
-                    return rb.setMsg("第" + (i + 1) + "品牌为空！");
+                    return rb.setMsg("第" + (i + 1) + "行品牌为空！");
                 }
                 String cj = StringUtils.isEmpty(list.get(i)[8]) ? null : list.get(i)[8];
                 if (StringUtils.isBlank(cj)) {
-                    return rb.setMsg("第" + (i + 1) + "厂家为空！");
+                    return rb.setMsg("第" + (i + 1) + "行厂家为空！");
                 }
                 String unit = StringUtils.isEmpty(list.get(i)[9]) ? null : list.get(i)[9];
                 if (StringUtils.isBlank(unit)) {
-                    return rb.setMsg("第" + (i + 1) + "商品单位为空！");
+                    return rb.setMsg("第" + (i + 1) + "行商品单位为空！");
                 }
                 String taxRate = StringUtils.isEmpty(list.get(i)[10]) ? null : list.get(i)[10];
                 if (!isNumeric(taxRate)) {

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java

@@ -45,7 +45,24 @@ public class WarehouseInventoryQuery implements Query {
     private String userSid;
     private int index;
 
+    //商品编码
+    private String goodsCode;
+    //商品名称
+    private String goodsName;
 
+    //规格型号
+    private String title;
+    //具体规格
+    private String ownSpec;
+    //品牌
+    private String brandName;
+    //厂家
+    private String manufacturerName;
+    //分类
+    private String typeName;
+    //厂家货号
+    private String manufacturerCode;
+    private String warehouseRackCode;
 
     //供应商
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java

@@ -11,6 +11,7 @@ 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.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
@@ -18,6 +19,7 @@ import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.wms.feign.base.basegoodsskuextend.BaseGoodsSkuExtendFeign;
 import com.yxt.wms.feign.base.basegoodsspu.BaseGoodsSpuFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
@@ -46,6 +48,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     @Resource
     private BaseGoodsSpuFeign baseGoodsSpuFeign;
     @Resource
+    private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
+    @Resource
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
@@ -114,9 +118,12 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         PagerVo<WarehouseInventoryVo>warehouseInventoryVoPagerVo=warehouseInventoryFeign.selInventoryByWareSid(pq).getData();
         for (WarehouseInventoryVo record : warehouseInventoryVoPagerVo.getRecords()) {
             BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()).getData();
+            BaseGoodsSkuExtendVo vo=baseGoodsSkuExtendFeign.getExtendBySkuSid(record.getGoodsSkuSid()).getData();
             record.setSid(record.getGoodsSpuSid());
             record.setBarCode(v.getBarCode());
             record.setGoodsSpuCode(v.getGoodsCode());
+            record.setFactoryCode(v.getFactoryCode());
+            record.setSalesPrice(new BigDecimal(vo.getSalesPrice()));
         }
         return rb.success().setData(warehouseInventoryVoPagerVo);
     }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java

@@ -76,5 +76,9 @@ public class WarehouseInventoryVo implements Vo {
     private String alertUpperLimit;//上限
     private String warningLowerLimit;//下限
     private List<WarehouseInventoryVo> children=new ArrayList<>();
+    private String manufacturerSid;
+    private String manufacturerName;
+    private BigDecimal salesPrice;
+    private String factoryCode;//厂家货号
 
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@@ -3,10 +3,7 @@ package com.yxt.wms.feign.base.basegoodssku;
 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.basegoodssku.BaseGoodsSku;
+import com.yxt.wms.biz.func.basegoodssku.*;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectList;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -34,7 +31,7 @@ public interface BaseGoodsSkuFeign {
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query);
     @ApiOperation("入库添加商品列表")
     @PostMapping("/getSelectList")
-    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery);
+    ResultBean<PagerVo<SkuSelectList1>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery);
     @ApiOperation("初始化")
     @GetMapping("/initialization/{sid}")
     public ResultBean<BaseGoodsSkuVo> initialization(@PathVariable("sid") String sid);

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -3,10 +3,7 @@ package com.yxt.wms.feign.base.basegoodssku;
 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.basegoodssku.BaseGoodsSku;
+import com.yxt.wms.biz.func.basegoodssku.*;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectList;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
-import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
@@ -30,7 +27,7 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
     }
 
     @Override
-    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+    public ResultBean<PagerVo<SkuSelectList1>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
         return null;
     }