增加库存统计页面

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventorySumDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+@Data
+public class InventorySumDto {
+    /**
+     * 组织机构
+     */
+    private String OrgName;
+    /**
+     * 位置
+     */
+    private String locationType;
+
+    /**
+     *总数
+     */
+    private int Num;
+
+    /**
+     *总价
+     */
+    private int totalPrice;
+
+
+
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventorySumReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class InventorySumReq {
+    /**
+     * 批次主键
+     */
+    @NotBlank(message = "组织机构号不能为空", groups = {ValidationApi.edit.class})
+    private Long orgId;
+    /**
+     * 位置ID
+     */
+    private String orgName;
+    /**
+     * 位置ID
+     */
+    private String locationId;
+    /**
+     * 位置信息
+     */
+    private String locationName;
+    /**
+     * 类型ID
+     */
+    private String typeId;
+    /**
+     * 号型ID
+     */
+    private String sizeId;
+    /**
+     * 根据类型分组
+     */
+    private String groupBy;
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java

 package com.junmp.jyzb.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.bean.dto.InventoryDto;
+import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
 import com.junmp.jyzb.api.bean.req.InventoryReq;
+import com.junmp.jyzb.api.bean.req.InventorySumReq;
 import com.junmp.jyzb.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.api.bean.req.ProductReq;
 import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.service.InventoryService;
+import com.junmp.jyzb.service.InventorySummaryService;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
@@ -27,12 +34,13 @@ import java.util.Map;
 public class InventoryController {
     @Resource
     public InventoryService inventoryService;
+    @Resource
+    public InventorySummaryService inventorySummaryService;
 
     @PostMapping("/GetEquipmentInfo")
-    @ApiOperation("根据组织机构或者仓库查询库存信息")
-    public ResponseResult getEquipmentInfo(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = inventoryService.getEquipmentInfo(msg);
-        return returnMsg;
+    @ApiOperation("根据组织机构查询库存信息")
+    public ApiRes<PageResult<InventorySummary>> getEquipmentInfo(@RequestBody InventorySumReq req) {
+        return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
     }
 
     @PostMapping("/SetInventoryMsg")
@@ -43,7 +51,7 @@ public class InventoryController {
     }
 
     @PostMapping("/GetInventoryList")
-    @ApiOperation("查询库存详细信息")
+    @ApiOperation("查询库存汇总信息")
     public ResponseResult getInventoryList(@RequestBody Map<String,Object> msg) {
         ResponseResult returnMsg = inventoryService.getInventoryList(msg);
         return returnMsg;
@@ -54,6 +62,12 @@ public class InventoryController {
     public ApiRes<InventoryDto> getDetail(@RequestBody InventoryReq req) {
         return   ApiRes.success(inventoryService.getInventoryDetail(req));
     }
+    @PostMapping("/getEquipmentInfo")
+    @ApiOperation("查询库存明细信息")
+    public ResponseResult getEquipmentInfo(@RequestBody Map<String, Object> msg) {
+        ResponseResult returnMsg = inventoryService.getEquipmentInfo(msg);
+        return  returnMsg;
+    }
 
     @PostMapping("/UpdateInventoryNum")
     @ApiOperation("手动重置库存数量信息")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -27,7 +27,7 @@ public class InventorySummary implements Serializable {
      * 组织机构id
      */
     @ApiModelProperty(value = "组织机构id")
-    @TableField("org_id")
+    @TableField("org_id_int")
     private String orgId;
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.java

 package com.junmp.jyzb.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +24,7 @@ public class PubOrg implements Serializable {
     /**
      * 主键
      */
-    @TableField(value = "org_id")
+    @TableId(type = IdType.AUTO, value = "org_id")
     private Long orgId;
 
     /**
@@ -193,5 +195,5 @@ public class PubOrg implements Serializable {
     @TableField(value = "org_name")
     private String orgName;
 
-    private static final long serialVersionUID = 1L;
+//    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java

 package com.junmp.jyzb.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.entity.ProductBatch;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface InventorySummaryMapper {
+public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentSizeService.java

 package com.junmp.jyzb.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
 import java.util.Map;
 
-public interface EquipmentSizeService{
+public interface EquipmentSizeService extends IService<EquipmentSize> {
     ResponseResult addSize(Map<String, Object> msg);
 
     ResponseResult getOneSize(Map<String,Object> id);

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java

 package com.junmp.jyzb.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
 import java.util.Map;
 
-public interface EquipmentTypeService{
+public interface EquipmentTypeService extends IService<EquipmentType> {
 
     ResponseResult addEquipment(Map<String, Object> msg);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java

 package com.junmp.jyzb.service;
 
-public interface InventorySummaryService{
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.InventorySumDto;
+import com.junmp.jyzb.api.bean.req.InventorySumReq;
+import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.db.api.page.PageResult;
 
+public interface InventorySummaryService extends IService<InventorySummary> {
+
+    PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req);
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java

@@ -9,9 +9,7 @@ import com.junmp.jyzb.api.bean.dto.InventoryDto;
 import com.junmp.jyzb.api.bean.req.InventoryReq;
 import com.junmp.jyzb.entity.Inventory;
 
-import com.junmp.jyzb.service.CabinetService;
-import com.junmp.jyzb.service.InventoryService;
-import com.junmp.jyzb.service.WarehouseService;
+import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnData;
@@ -33,13 +31,13 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     @Resource
     private InventoryMapper inventoryMapper;
     @Resource
-    private EquipmentTypeServiceImpl equipmentTypeService;
+    private EquipmentTypeService equipmentTypeService;
     @Resource
-    private EquipmentSizeServiceImpl equipmentSizeService;
+    private EquipmentSizeService equipmentSizeService;
     @Resource
     private WarehouseService warehouseService;
     @Resource
-    private PubOrgServiceImpl PubOrgService;
+    private PubOrgService PubOrgService;
 
     @Resource
     private CabinetService cabinetService;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.InventoryDto;
+import com.junmp.jyzb.api.bean.dto.InventorySumDto;
+import com.junmp.jyzb.api.bean.req.InventorySumReq;
+import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.jyzb.service.InventorySummaryService;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 @Service
-public class InventorySummaryServiceImpl implements InventorySummaryService {
+public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMapper, InventorySummary> implements InventorySummaryService {
+
+
+
+    @Override
+    public PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req) {
+        LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
+        Page<InventorySummary> sumList= this.page(PageFactory.getDefaultPage(),wp);
+        return PageResultFactory.createPageResult(sumList);
+    }
+    private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
+        LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据组织机构号查询
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
+        //根据组织机构名模糊查询
+        wrapper.like(ObjectUtil.isNotEmpty(req.getOrgName()), InventorySummary::getOrgName, req.getOrgName());
+        //位置信息
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getLocationId()), InventorySummary::getLocationId, req.getLocationId());
+
+        wrapper.like(ObjectUtil.isNotEmpty(req.getLocationName()), InventorySummary::getLocationName, req.getLocationName());
+        //根据类别
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()), InventorySummary::getTypeId, req.getTypeId());
+        //号型
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), InventorySummary::getSizeId, req.getSizeId());
+
 
-    @Resource
-    private InventorySummaryMapper inventorySummaryMapper;
+        wrapper.orderByDesc(InventorySummary::getUpdateTime);
 
+        return wrapper;
+    }
 }

jyzb-boot/pom.xml

@@ -10,7 +10,7 @@
     <artifactId>jyzb-boot</artifactId>
     <version>1.0.0</version>
     <name>jyzb-boot</name>
-    <packaging>war</packaging>
+<!--    <packaging>war</packaging>-->
     <dependencies>
 
         <dependency>

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -45,6 +45,7 @@ import org.flowable.engine.*;
 import org.flowable.engine.delegate.ExecutionListener;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.history.HistoricProcessInstanceQuery;
 import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -255,13 +256,24 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
                 DeleteFlowableProcessInstanceCmd cmd = new DeleteFlowableProcessInstanceCmd(processInstancesItem.getId(), "删除流程实例", true);
                 managementService.executeCommand(cmd);
-                processTemplateService.removeById(processInstance.getTemplateId());
 
+                // 删除与已删除流程定义相关的部署数据
+                repositoryService.deleteDeployment(processInstancesItem.getDeploymentId(), true);
             } else {
-                historyService.deleteHistoricProcessInstance(processInstancesItem.getId());
-
+                HistoricProcessInstanceQuery query= historyService.createHistoricProcessInstanceQuery()
+                        .processInstanceId(processInstancesItem.getId());
+                // 查询历史流程实例数据
+                HistoricProcessInstance historicProcessInstance = query.singleResult();
+                if (historicProcessInstance != null) {
+                    historyService.deleteHistoricProcessInstance(processInstancesItem.getId());
+                }
             }
         }
+        ProcessTemplates pro=processTemplateService.getById(processInstance.getTemplateId());
+        if (pro!=null)
+        {
+            processTemplateService.removeById(processInstance.getTemplateId());
+        }
         return  true;