From b02cbc1f3212548683c9c68416cc20adad62e506 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 18 Sep 2024 11:25:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ERP=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopMaterialController.java     |  4 ++--
 .../service/ShopMaterialService.java           |  2 ++
 .../service/impl/ShopMaterialServiceImpl.java  | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/controller/ShopMaterialController.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/controller/ShopMaterialController.java
index bb4133bf..f8a6900f 100644
--- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/controller/ShopMaterialController.java
+++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/controller/ShopMaterialController.java
@@ -40,7 +40,7 @@ public class ShopMaterialController {
         shopMaterialService.queryTransMaterialById(inputObject, outputObject);
     }
 
-    @ApiOperation(id = "saveShopMaterial", value = "根据id获取商品信息，用于上架商城", method = "POST", allUse = "2")
+    @ApiOperation(id = "saveShopMaterial", value = "ERP商品上架商城", method = "POST", allUse = "2")
     @ApiImplicitParams(classBean = ShopMaterial.class)
     @RequestMapping("/post/ShopMaterialController/saveShopMaterial")
     public void saveShopMaterial(InputObject inputObject, OutputObject outputObject) {
@@ -52,7 +52,7 @@ public class ShopMaterialController {
         @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")})
     @RequestMapping("/post/ShopMaterialController/queryShopMaterialById")
     public void queryShopMaterialById(InputObject inputObject, OutputObject outputObject) {
-        shopMaterialService.selectById(inputObject, outputObject);
+        shopMaterialService.queryShopMaterialById(inputObject, outputObject);
     }
 
     @ApiOperation(id = "queryShopMaterialList", value = "获取商城商品信息列表", method = "POST", allUse = "0")
diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/ShopMaterialService.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/ShopMaterialService.java
index 2bb7a485..0abd3563 100644
--- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/ShopMaterialService.java
+++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/ShopMaterialService.java
@@ -24,4 +24,6 @@ public interface ShopMaterialService extends SkyeyeBusinessService<ShopMaterial>
     void queryShopMaterialList(InputObject inputObject, OutputObject outputObject);
 
     void queryShopMaterialByNormsIdList(InputObject inputObject, OutputObject outputObject);
+
+    void queryShopMaterialById(InputObject inputObject, OutputObject outputObject);
 }
diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
index 3976ac1f..4689ab10 100644
--- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
+++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/shopmaterial/service/impl/ShopMaterialServiceImpl.java
@@ -7,7 +7,6 @@ package com.skyeye.shopmaterial.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -22,6 +21,7 @@ import com.skyeye.common.object.OutputObject;
 import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
 import com.skyeye.material.classenum.MaterialShelvesState;
 import com.skyeye.material.entity.Material;
+import com.skyeye.material.service.MaterialNormsService;
 import com.skyeye.material.service.MaterialService;
 import com.skyeye.shopmaterial.dao.ShopMaterialDao;
 import com.skyeye.shopmaterial.entity.ShopMaterial;
@@ -51,6 +51,9 @@ public class ShopMaterialServiceImpl extends SkyeyeBusinessServiceImpl<ShopMater
     @Autowired
     private MaterialService materialService;
 
+    @Autowired
+    private MaterialNormsService materialNormsService;
+
     @Autowired
     private ShopMaterialNormsService shopMaterialNormsService;
 
@@ -165,4 +168,17 @@ public class ShopMaterialServiceImpl extends SkyeyeBusinessServiceImpl<ShopMater
         outputObject.settotal(shopMaterialNormsList.size());
     }
 
+    @Override
+    public void queryShopMaterialById(InputObject inputObject, OutputObject outputObject) {
+        String id = inputObject.getParams().get("id").toString();
+        ShopMaterial shopMaterial = selectById(id);
+        shopMaterial.getMaterialMation().setMaterialNorms(null);
+        materialNormsService.setDataMation(shopMaterial.getShopMaterialNormsList(), ShopMaterialNorms::getNormsId);
+        shopMaterial.getShopMaterialNormsList().forEach(shopMaterialNorms -> {
+            shopMaterialNorms.setEstimatePurchasePrice(null);
+        });
+        outputObject.setBean(shopMaterial);
+        outputObject.settotal(CommonNumConstants.NUM_ONE);
+    }
+
 }