添加物料标签字段

nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/api/pad/invoicing")
@@ -80,4 +81,12 @@ public class InvoicingApi {
         return Result.OK("操作成功");
     }
 
+
+    @ApiOperation(value="获取物料分类树", notes="获取物料分类树")
+    @GetMapping(value = "/getMaterialTreeData")
+    public Result<List<Map<String,Object>>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) {
+        List<Map<String,Object>> pageList = invoicingApi.getMaterialTreeData(configMaterialCategory);
+        return Result.OK(pageList);
+    }
+
 }

nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java

@@ -96,6 +96,8 @@ public class MaterialInfoEntity implements Serializable {
     private String upperLimit;
     /**物料下县*/
     private String lowerLimit;
+    private String tagName;
+    private String tagType;
 
     private String treeId;//树id，用于查询
 

nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java

@@ -1,13 +1,11 @@
 package com.nu.modules.invoicing.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nu.entity.CgdInfoEntity;
-import com.nu.entity.CgdMainEntity;
-import com.nu.entity.MaterialInfoEntity;
-import com.nu.entity.QgdInfoEntity;
+import com.nu.entity.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 public interface IInvoicingApi {
 
@@ -22,4 +20,6 @@ public interface IInvoicingApi {
     IPage<CgdInfoEntity> queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req);
 
     void reviewPurchaseOrder(CgdMainEntity cgdMainEntity);
+
+    List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java

@@ -151,6 +151,9 @@ public class ConfigMaterialInfo implements Serializable {
     private java.lang.String upperLimit;
     /**物料下县*/
     private java.lang.String lowerLimit;
+    /**物料标签*/
+    @Dict(dicCode = "wl_tag_type")
+    private String tagType;
 
     @TableField(exist = false)
     private String treeId;//树id，用于查询

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nu.entity.*;
+import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory;
 import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo;
 import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper;
+import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService;
 import com.nu.modules.cgd.entity.NuInvoicingCgdInfo;
 import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
 import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo;
@@ -73,6 +75,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Autowired
     private NuWarehouseMaterialCrkInfoMapper crkInfoMapper;
 
+    @Autowired
+    private IConfigMaterialCategoryService configMaterialCategoryService;
+
     @Override
     public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
 
@@ -360,4 +365,12 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         baseMapper.updateById(cgdMain);
     }
+
+    @Override
+    public List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) {
+        ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory();
+        BeanUtils.copyProperties(materialCategoryEntity,configMaterialCategory);
+        List<Map<String,Object>> pageList = configMaterialCategoryService.getMaterialTreeData(configMaterialCategory);
+        return pageList;
+    }
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java

@@ -171,6 +171,12 @@ public class BlWarehouseMaterialInfo implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "物料下限")
     private java.lang.String lowerLimit;
+    @TableField(exist = false)
+    private java.lang.String tagName;
+    @TableField(exist = false)
+    private java.lang.String tagType;
+    @TableField(exist = false)
+    private java.lang.String materialImg;
 
     @TableField(exist = false)
     private java.lang.String wlParamInfo;//查询物料信息参数，可多个查询

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml

@@ -24,9 +24,13 @@
                 b.two_unit_price,
                 b.multi_unit_type,
                 b.upper_limit,
-                b.lower_limit
+                b.lower_limit,
+                b.tag_type,
+                b.material_img,
+                c.item_text as tagName
             from nu_warehouse_material_info a
             left join nu_config_material_info b on a.wl_id = b.id
+            left join sys_dict_item c on  b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
         ) a
         ${ew.customSqlSegment}