添加接口

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

@@ -85,8 +85,19 @@ public class InvoicingApi {
     @ApiOperation(value="获取物料分类树", notes="获取物料分类树")
     @GetMapping(value = "/getMaterialTreeData")
     public Result<List<Map<String,Object>>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) {
+        configMaterialCategory.setIzEnabled("0");
         List<Map<String,Object>> pageList = invoicingApi.getMaterialTreeData(configMaterialCategory);
         return Result.OK(pageList);
     }
 
+
+    @ApiOperation(value="修改库房启用停用", notes="修改库房启用停用")
+    @AutoLog(value = "修改库房启用停用")
+    @PostMapping(value = "/updateKfstatus")
+    public Result<String> updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity) {
+        invoicingApi.updateKfstatus(nuBaseInfoEntity);
+        return Result.OK("修改成功！");
+    }
+
+
 }

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

@@ -60,4 +60,7 @@ public class MaterialCategoryEntity implements Serializable {
     private Integer typeRowSpan;
 
     private Integer num;
+
+    private java.lang.String appIconPath;
+    private java.lang.String appCheckIconPath;
 }

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

@@ -105,4 +105,6 @@ public class MaterialInfoEntity implements Serializable {
     @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id")
     private String nuId;//库房id
 
+    private java.lang.String wlParamInfo;
+
 }

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

@@ -22,4 +22,6 @@ public interface IInvoicingApi {
     void reviewPurchaseOrder(CgdMainEntity cgdMainEntity);
 
     List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory);
+
+    void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity);
 }

nursing-unit-invoicing/nu-invoicing-biz/pom.xml

@@ -37,6 +37,12 @@
 			<artifactId>pinyin4j</artifactId>
 			<version>2.5.0</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.nursingunit.boot</groupId>
+            <artifactId>nu-nu-biz</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 </project>

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

@@ -71,6 +71,10 @@ public class ConfigMaterialCategory implements Serializable {
     private java.lang.String sysOrgCode;
     private java.lang.String icon;
 
+    private java.lang.String appIconPath;
+    private java.lang.String appCheckIconPath;
+
+
     private Integer sort;
 
     @TableField(exist = false)

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java

@@ -212,6 +212,8 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
             infoMap.put("children",wllxMap2List);
             infoMap.put("categoryId",par.getId());
             infoMap.put("parentIzEnabled",par.getIzEnabled());
+            infoMap.put("appIconPath",par.getAppIconPath());
+            infoMap.put("appCheckIconPath",par.getAppCheckIconPath());
             infoMap.put("icon",par.getIcon());
             infoMapList.add(infoMap);
         }

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

@@ -19,6 +19,8 @@ import com.nu.modules.cgd.service.INuInvoicingCgdMainService;
 import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
 import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper;
 import com.nu.modules.invoicing.api.IInvoicingApi;
+import com.nu.modules.nubaseinfo.entity.NuBaseInfo;
+import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper;
 import com.nu.modules.qgd.entity.QgdInfo;
 import com.nu.modules.qgd.entity.QgdMain;
 import com.nu.modules.qgd.mapper.QgdInfoMapper;
@@ -78,6 +80,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Autowired
     private IConfigMaterialCategoryService configMaterialCategoryService;
 
+    @Autowired
+    private NuBaseInfoMapper nuBaseInfoMapper;
+
     @Override
     public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
 
@@ -163,6 +168,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         BeanUtils.copyProperties(materialInfoEntityDto,warehouseMaterialInfo);
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialInfo, req.getParameterMap(), customeRuleMap);
+        queryWrapper.apply(StringUtils.isNotBlank(warehouseMaterialInfo.getWlParamInfo()),"( material_name like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or material_no like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or pinyin like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or specification_model like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' ) ");
         Page<BlWarehouseMaterialInfo> page = new Page<>(pageNo, pageSize);
         List<BlWarehouseMaterialInfo> list = warehouseMaterialInfoMapper.selectList(page,queryWrapper);
         IPage<MaterialInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@@ -373,4 +379,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         List<Map<String,Object>> pageList = configMaterialCategoryService.getMaterialTreeData(configMaterialCategory);
         return pageList;
     }
+
+    @Override
+    public void updateKfstatus(NuBaseInfoEntity nuBaseInfoEntity) {
+        NuBaseInfo nuBaseInfo = new NuBaseInfo();
+        BeanUtils.copyProperties(nuBaseInfoEntity,nuBaseInfo);
+        nuBaseInfoMapper.updateById(nuBaseInfo);
+    }
 }