1

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

+package com.junmp.jyzb.api.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+public class BussinessInventoryDto implements Serializable {
+
+    private String totalNum;
+
+    private List<EquipmentListDto> equipmentList;
+
+}
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class EquipmentListDto {
+
+        private String typeId;
+
+        private String typeName;
+        private String sizeId;
+
+        private String sizeName;
+        private String planNum;
+
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/BussinessInventoryReq.java

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class BussinessInventoryReq {
+    @NotNull(message = "预览时，盘点仓库不能为空", groups = {  ValidationApi.detail.class})
+    private String warehouseId;
+    private String orderId;
+    private String inventoryType;
+    private String inventoryState;
+    private String examineState;
+    private String type;
+    private String typeList;
+    private String orgId;
+    private String orderState;
+    private String pageNo;
+    private String pageSize;
+    private String startTime;
+    private String endTime;
+    private String column;
+    private String order;
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CompanyReq.java

-package com.junmp.jyzb.api.bean.query;
-
-import com.junmp.v2.common.bean.request.BaseRequest;
-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;
-
-/**
- * <pre>
- *
- * 描述：
- * 版本：1.0.0
- * 日期：2022/8/1 10:56
- * 作者：ningzp@junmp.com.cn
- * <br>修改记录
- * <br>修改日期        修改人          修改内容
- *
- * </pre>
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class CompanyReq extends BaseRequest {
-
-    @NotNull(message = "企业编号不能为空", groups = {edit.class, delete.class, detail.class})
-    private Long bizId;
-
-    @NotBlank(message = "企业编码不能为空", groups = {edit.class})
-    @TableUniqueValue(
-            message = "编码重复",
-            groups = {edit.class},
-            tableName = "biz_company",
-            columnName = "biz_code",
-            idFieldName = "biz_id")
-    private String bizCode;
-
-    /**
-     * 单位类型
-     */
-    private String bizType;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 简称
-     */
-    private String shortName;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

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

@@ -44,6 +44,10 @@ public class InventorySumReq extends BaseRequest {
      */
     public List<String>  typeIds;
     /**
+     * 号型IDs
+     */
+    public List<String>  sizeIds;
+    /**
      * 类型名称
      */
     private String typeName;

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class UpdateInventoryReq   {
+    /**
+     * id
+     */
+    @NotBlank(message = "id不能为空", groups = {ValidationApi.edit.class})
+    private String id;
+
+    private String applyTime;
+    /**
+     * 工作流
+     */
+    private String processDefinitionId;
+
+    /**
+     *
+     */
+    @NotBlank(message = "组织机构id不能为空", groups = {ValidationApi.edit.class})
+
+    private Long orgId;
+
+    /**
+     *
+     */
+    @NotBlank(message = "仓库id不能为空", groups = {ValidationApi.edit.class})
+    private String warehouseId;
+    /**
+     * 单据单号
+     */
+    private String operator;
+
+    private String inventoryType;
+
+    private String rules;
+
+    private String ExamineState;
+}
+

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java

@@ -6,9 +6,10 @@ import lombok.Getter;
 
 @Getter
 public enum InventoryExceptionEnum implements IExceptionEnum {
-    INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备信息不存在"),
-    INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_USER_ERROR_CODE,"填写的报废的装备数量大于实际能进行报废的数量"),
-    BROKENNUM_BEYOND_STOCK(CommonConstant.DEFAULT_USER_ERROR_CODE,"审核中的数量已存在最大可报废数量，现提交失败"),
+    INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"装备信息不存在"),
+    INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"填写的报废的装备数量大于实际能进行报废的数量"),
+    BROKENNUM_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"审核中的数量已存在最大可报废数量，现提交失败"),
+    ORDER_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"盘点单据不存在"),
     ;
     /**
      * 错误编码

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

@@ -26,7 +26,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("/BussinessManage")
-@Api(tags = "业务管理模块")
+@Api(tags = "[业务]业务管理模块")
 public class BussinessController {
     @Resource
     public BusFormService busFormService;

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

+package com.junmp.jyzb.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
+import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
+import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
+import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
+import com.junmp.jyzb.entity.BussinessInventory;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.service.BussinessInventoryService;
+import com.junmp.jyzb.service.CabinetBoxService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequestMapping("/BussinessInventory")
+@Api(tags = "[盘点]盘点管理模块")
+public class BussinessInventoryController {
+    @Resource
+    private BussinessInventoryService BussinessInventoryService;
+
+    //盘库申请
+    @PostMapping("/AddStocktake")
+    @ApiOperation("盘库申请")
+    public ApiRes<String> AddStocktake (@RequestBody @Validated(ValidationApi.add.class) UpdateInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
+        {
+            req.setExamineState("none");
+        }
+        else
+        {
+            req.setExamineState("working");
+        }
+        return ApiRes.success(BussinessInventoryService.AddInvOrder(req));
+    }
+
+    //盘库申请
+    @PostMapping("/Check")
+    @ApiOperation("预览盘点单")
+    public ApiRes<BussinessInventoryDto> Check (@RequestBody @Validated(ValidationApi.detail.class) BussinessInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+
+        return ApiRes.success(BussinessInventoryService.Check(req));
+    }
+    //盘库申请
+    @PostMapping("/Start")
+    @ApiOperation("开始盘点")
+    public ApiRes<Boolean> Start (@RequestBody  BussinessInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.Start(req));
+    }
+    //盘库申请
+    @PostMapping("/GetPage")
+    @ApiOperation("查询列表")
+    public ApiRes<PageResult<BussinessInventory>> GetPage (@RequestBody  BussinessInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.GetPage(req));
+    }
+
+}

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

@@ -19,7 +19,7 @@ import javax.annotation.Resource;
 @RestController
 @Slf4j
 @RequestMapping("/CabinetBox")
-@Api(tags = "箱门信息模块")
+@Api(tags = "[基础信息]箱门信息模块")
 public class CabinetBoxController {
     @Resource
     private CabinetBoxService cabinetBoxService;

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

@@ -26,7 +26,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Cabinet")
-@Api(tags = "单警柜基础信息模块")
+@Api(tags = "[基础信息]单警柜基础信息模块")
 public class CabinetController {
     @Resource
     public CabinetService cabinetService;

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

-package com.junmp.jyzb.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.junmp.jyzb.api.bean.query.CompanyReq;
-import com.junmp.jyzb.doc.CompanyDoc;
-import com.junmp.jyzb.entity.Company;
-import com.junmp.jyzb.service.CompanyService;
-import com.junmp.v2.common.bean.request.ValidationApi;
-import com.junmp.v2.common.bean.response.ApiRes;
-import com.junmp.v2.common.exception.base.ServiceException;
-import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
-import com.junmp.v2.db.api.page.PageResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <pre>
- *
- * 描述：
- * 版本：1.0.0
- * 日期：2022/8/1 10:24
- * 作者：ningzp@junmp.com.cn
- * <br>修改记录
- * <br>修改日期        修改人          修改内容
- *
- * </pre>
- */
-@RestController
-@Slf4j
-@RequestMapping("/api")
-public class CompanyController implements CompanyDoc {
-
-    @Resource
-    private CompanyService companyService;
-
-
-    @PostMapping(path = "/company", name = "新增企业")
-    @Override
-    public ApiRes<Boolean> addBiz(@RequestBody @Validated(CompanyReq.add.class) CompanyReq req) {
-        try {
-            companyService.addBiz(req);
-            return ApiRes.success();
-        } catch (ServiceException ex) {
-            log.error("企业新增异常>>" + ex.getMessage());
-            return ApiRes.failure(DefaultBizExceptionEnum.SYS_RUNTIME_ERROR);
-        }
-    }
-
-    @PutMapping(path = "/company", name = "编辑企业")
-    @Override
-    public ApiRes<Boolean> editBiz(@RequestBody @Validated(ValidationApi.edit.class) CompanyReq req) {
-        boolean flag = companyService.editBiz(req);
-        if (flag) {
-            return ApiRes.success();
-        } else {
-            return ApiRes.failure(StrUtil.format("单位编码:{},更新失败", req.getBizCode()));
-        }
-    }
-
-    @GetMapping(path = "/company", name = "企业列表")
-    @Override
-    public ApiRes<List<Company>> list(CompanyReq req) {
-        List<Company> list = companyService.findList(req);
-        return ApiRes.success(list);
-    }
-
-    @DeleteMapping(path = "/company", name = "删除企业")
-    @Override
-    public ApiRes<Boolean> delBiz(@RequestBody @Validated(ValidationApi.delete.class) CompanyReq req) {
-        boolean flag = companyService.del(req);
-        if (flag) {
-            return ApiRes.success();
-        } else {
-            return ApiRes.failure(StrUtil.format("单位编码:{},删除失败", req.getBizCode()));
-        }
-    }
-
-    @GetMapping(path = "/company/page", name = "分页企业信息")
-    @Override
-    public ApiRes<PageResult<Company>> page(CompanyReq req) {
-        return ApiRes.success(companyService.findPage(req));
-    }
-}

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

@@ -26,7 +26,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Size")
-@Api(tags = "号型基础信息模块")
+@Api(tags = "[基础信息]号型基础信息模块")
 public class EquipmentSizeController {
     @Resource
     public EquipmentSizeService equipmentSizeService;

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

@@ -22,7 +22,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Equipment")
-@Api(tags = "物资基础信息模块")
+@Api(tags = "[基础信息]物资基础信息模块")
 public class EquipmentTypeController {
     @Resource
     public EquipmentTypeService equipmentTypeService;

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

@@ -25,7 +25,7 @@ import java.util.*;
 @RestController
 @Slf4j
 @RequestMapping("/Inventory")
-@Api(tags = "库存模块")
+@Api(tags = "[基础信息]库存模块")
 public class InventoryController {
     @Resource
     public InventoryService inventoryService;

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

@@ -21,7 +21,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Manufacturer")
-@Api(tags = "生产厂商模块")
+@Api(tags = "[基础信息]生产厂商模块")
 public class ManufacturerController {
     @Resource
     private ManufacturerService manufacturerService;

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

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 @RestController
 @Slf4j
 @RequestMapping("/OrderCommon")
-@Api(tags = "业务通用模块")
+@Api(tags = "[业务]业务通用模块")
 public class OrderCommonController {
     //单子拒绝之后，需要修改当前单子的审批状态，修改为已驳回
     @Resource

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

@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Order")
-@Api(tags = "业务模块")
+@Api(tags = "[业务]业务模块")
 public class OrderController {
     @Resource
     public OrderMainService orderMainService;

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

@@ -32,7 +32,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/OutAndInRecords")
-@Api(tags = "出入库模块")
+@Api(tags = "[业务]出入库模块")
 public class OutAndInboundController {
 
     @Resource

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

@@ -35,7 +35,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("/Police")
-@Api(tags = "警员基础信息模块")
+@Api(tags = "[基础信息]警员基础信息模块")
 public class PoliceController {
 
     @Resource

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

@@ -20,7 +20,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/PolicemanFinger")
-@Api(tags = "警员指纹信息模块")
+@Api(tags = "[基础信息]警员指纹信息模块")
 public class PolicemanFingerController implements PolicemanFingerDoc {
 
     @Resource

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

@@ -22,7 +22,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("/PubOrg")
-@Api(tags = "组织机构模块")
+@Api(tags = "[基础信息]组织机构模块")
 public class PubOrgController {
     @Resource
     public PubOrgService pubOrgService;

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

@@ -22,7 +22,7 @@ import java.util.List;
 
 @RestController
 @Slf4j
-@Api(tags = "维修单位模块")
+@Api(tags = "[业务]维修单位模块")
 @RequestMapping("/RepairUnit")
 public class RepairUnitController {
     @Resource

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

@@ -22,7 +22,7 @@ import javax.annotation.Resource;
 
 @RestController
 @Slf4j
-@Api(tags ="盘库管理")
+@Api(tags ="[盘点]盘库管理")
 @RequestMapping("/Stocktake")
 public class StocktakeController {
 

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

@@ -23,7 +23,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Supplier")
-@Api(tags = "供应商基础信息模块")
+@Api(tags = "[基础信息]供应商基础信息模块")
 public class SupplierController {
     @Resource
     public SupplierService supplierService;

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

@@ -24,7 +24,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Tj")
-@Api(tags = "统计报表模块")
+@Api(tags = "[报表]统计报表模块")
 public class TjController {
 
    @Resource

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

@@ -26,7 +26,7 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/Warehouse")
-@Api(tags = "仓库基础信息模块")
+@Api(tags = "[基础信息]仓库基础信息模块")
 public class WarehouseController {
     @Resource
     public WarehouseService warehouseService;

jyzb-biz/src/main/java/com/junmp/jyzb/doc/CompanyDoc.java

-package com.junmp.jyzb.doc;
-
-import com.junmp.jyzb.api.bean.query.CompanyReq;
-import com.junmp.jyzb.entity.Company;
-import com.junmp.v2.common.bean.response.ApiRes;
-import com.junmp.v2.db.api.page.PageResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-/**
- * <pre>
- *
- * 描述：
- * 版本：1.0.0
- * 日期：2022/8/1 10:47
- * 作者：ningzp@junmp.com.cn
- * <br>修改记录
- * <br>修改日期        修改人          修改内容
- *
- * </pre>
- */
-@Api(value = "企业管理", tags = "企业管理接口")
-public interface CompanyDoc {
-
-    /**
-     * 新增企业
-     */
-    @ApiOperation(value = "新增企业", tags = "企业管理接口")
-    ApiRes<Boolean> addBiz(CompanyReq req);
-
-    /**
-     * 更新企业
-     */
-    @ApiOperation(value = "更新企业", tags = "企业管理接口")
-    ApiRes<Boolean> editBiz(CompanyReq req);
-
-
-    /**
-     * 获取所有企业
-     */
-    @ApiOperation(value = "获取所有企业", tags = "企业管理接口")
-    ApiRes<List<Company>> list(CompanyReq req);
-
-    /**
-     * 删除企业
-     */
-    @ApiOperation(value = "删除企业",tags = "企业管理接口")
-    ApiRes<Boolean> delBiz(CompanyReq req);
-
-
-    /**
-     * 企业信息分页
-     */
-    @ApiOperation(value = "分页企业信息", tags = "企业管理接口")
-    ApiRes<PageResult<Company>> page(CompanyReq req);
-}

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@TableName(value ="bussiness_inventory_detail")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BussinessDetail implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @Id
+    private Long id;
+
+    /**
+     * 工作流id
+     */
+    @TableField(value = "inventory_id")
+    private Long inventoryId;
+    /**
+     * 工作流id
+     */
+    @TableField(value = "type_id")
+    private String typeId;
+
+    /**
+     * 单据业务类型
+     */
+    @TableField(value = "type_name")
+    private String typeName;
+
+    /**
+     * 单据编号
+     */
+    @TableField(value = "size_id")
+    private String sizeId;
+
+    /**
+     * 年度
+     */
+    @TableField(value = "size_name")
+    private String sizeName;
+
+    /**
+     * 月
+     */
+    @TableField(value = "stock_number")
+    private Integer stockNumber;
+
+    /**
+     * 申请时间
+     */
+    @TableField(value = "fix_number")
+    private Integer fixNumber;
+
+    /**
+     * 仓库名称
+     */
+    @TableField(value = "num")
+    private Integer num;
+    /**
+     * 仓库名称
+     */
+    @TableField(value = "state")
+    private String state;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @TableName base_bus_form
+ */
+@TableName(value ="bussiness_inventory")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BussinessInventory implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @Id
+    private String id;
+
+    /**
+     * 工作流id
+     */
+    @TableField(value = "process_id")
+    private Long processId;
+    /**
+     * 工作流id
+     */
+    @TableField(value = "current_assign")
+    private String currentAssign;
+
+    /**
+     * 单据编号
+     */
+    @TableField(value = "order_num")
+    private String orderNum;
+
+    /**
+     * 年度
+     */
+    @TableField(value = "year")
+    private Integer year;
+
+    /**
+     * 月
+     */
+    @TableField(value = "month")
+    private Integer month;
+
+    /**
+     * 申请时间
+     */
+    @TableField(value = "apply_time")
+    private Date applyTime;
+
+    /**
+     * 仓库名称
+     */
+    @TableField(value = "warehouse_id")
+    private String warehouseId;
+    /**
+     * 仓库名称
+     */
+    @TableField(value = "warehouse_name")
+    private String warehouseName;
+    /**
+     * 组织机构ID
+     */
+    @TableField(value = "org_id")
+    private Long orgId;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(value = "org_name")
+    private String orgName;
+
+    /**
+     * 经办人
+     */
+    @TableField(value = "operator")
+    private String operator;
+
+    /**
+     * 盘点状态
+     */
+    @TableField(value = "inventory_state")
+    private String inventoryState;
+
+    /**
+     *
+     */
+    @TableField(value = "inventory_type")
+    private Integer inventoryType;
+
+    /**
+     * 类别
+     */
+    @TableField(value = "rules")
+    private String rules;
+    /**
+     * 经办人id
+     */
+    @TableField(value = "result")
+    private String result;
+
+    /**
+     * 原有epc备份
+     */
+    @TableField(value = "epc_back")
+    private String epcBack;
+
+    /**
+     * 需要更新的epc汇总
+     */
+    @TableField(value = "epc_update")
+    private String epc_update;
+
+    /**
+     * 归还人
+     */
+    @TableField(value = "examine_state")
+    private String examineState;
+
+
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+    @TableField(value = "detail_list", exist = false)
+    private List<BussinessDetail> detailList;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@TableName(value ="bussiness_inventory_detail")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class InventoryDetail implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @Id
+    private Long id;
+
+    /**
+     * 盘点表主键
+     */
+    @TableField(value = "inventory_id")
+    private Long inventoryId;
+
+    /**
+     * 装备类型id
+     */
+    @TableField(value = "type_id")
+    private String typeId;
+
+    /**
+     * 装备类型名称
+     */
+    @TableField(value = "type_name")
+    private String typeName;
+
+    /**
+     * 装备号型id
+     */
+    @TableField(value = "size_id")
+    private String sizeId;
+
+    /**
+     * 装备号型名称
+     */
+    @TableField(value = "size_name")
+    private String sizeName;
+
+    /**
+     * 在库数（包含报废区）
+     */
+    @TableField(value = "stock_number")
+    private Integer stockNumber;
+
+    /**
+     * 修正后的在库数量
+     */
+    @TableField(value = "fix_number")
+    private Integer fixNumber;
+    /**
+     * 差距数量
+     */
+    @TableField(value = "num")
+    private Integer num;
+
+    /**
+     * 状态.0正常，1盈余，2亏损
+     */
+    @TableField(value = "state")
+    private Integer state;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+
+
+    private static final long serialVersionUID = 1L;
+
+}

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

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventory;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BussinessInventoryDetailMapper extends BaseMapper<BussinessDetail> {
+
+}
+
+
+
+
+

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

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.BusForm;
+import com.junmp.jyzb.entity.BussinessInventory;
+import com.junmp.jyzb.entity.CabinetBox;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface BussinessInventoryMapper extends BaseMapper<BussinessInventory> {
+
+}
+
+
+
+
+

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

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
+import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
+import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventory;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
+
+public interface BussinessInventoryDetailService extends IService<BussinessDetail> {
+
+
+}
\ No newline at end of file

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

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.BusFormDto;
+import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
+import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
+import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
+import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
+import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
+import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
+import com.junmp.jyzb.entity.BusForm;
+import com.junmp.jyzb.entity.BussinessInventory;
+import com.junmp.v2.db.api.page.PageResult;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
+import java.util.List;
+
+
+public interface BussinessInventoryService extends IService<BussinessInventory> {
+
+    String AddInvOrder(UpdateInventoryReq req);
+
+
+    BussinessInventoryDto Check(BussinessInventoryReq req);
+
+    Boolean Start(BussinessInventoryReq req);
+
+    PageResult<BussinessInventory> GetPage(BussinessInventoryReq req);
+}

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

-package com.junmp.jyzb.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.query.CompanyReq;
-import com.junmp.jyzb.entity.Company;
-import com.junmp.v2.db.api.page.PageResult;
-
-import java.util.List;
-
-/**
- * <pre>
- *
- * 描述：
- * 版本：1.0.0
- * 日期：2022/8/1 09:35
- * 作者：ningzp@junmp.com.cn
- * <br>修改记录
- * <br>修改日期        修改人          修改内容
- *
- * </pre>
- */
-public interface CompanyService extends IService<Company> {
-
-    /**
-     * 新增
-     *
-     * @param req
-     */
-    boolean addBiz(CompanyReq req);
-
-    /**
-     * 编辑
-     *
-     * @param req
-     */
-    boolean editBiz(CompanyReq req);
-
-    /**
-     * 删除
-     *
-     * @param req
-     */
-    boolean del(CompanyReq req);
-
-    /**
-     * 列表信息
-     *
-     * @param req
-     */
-    List<Company> findList(CompanyReq req);
-
-    /**
-     * 分页信息
-     *
-     * @param req
-     */
-    PageResult<Company> findPage(CompanyReq req);
-}

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

@@ -23,7 +23,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
 
     //根据条件查询库存汇总信息
     PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req);
-
+    List<InventorySummary> getEquipmentInfoList(InventorySumReq req);
     //根据条件查询装备汇总信息，用于出库单的选择装备
     List<InventorySumDto> GetInventorySumInfo(InventorySumReq req);
 

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

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventory;
+import com.junmp.jyzb.mapper.BussinessInventoryDetailMapper;
+import com.junmp.jyzb.mapper.BussinessInventoryMapper;
+import com.junmp.jyzb.service.BussinessInventoryDetailService;
+import com.junmp.jyzb.service.BussinessInventoryService;
+import org.springframework.stereotype.Service;
+
+    @Service
+    public class BussinessInventoryDetailServiceImpl extends ServiceImpl<BussinessInventoryDetailMapper, BussinessDetail>
+            implements BussinessInventoryDetailService {
+}

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

-package com.junmp.jyzb.service.impl;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-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.query.CompanyReq;
-import com.junmp.jyzb.api.exception.enums.CompanyExceptionEnum;
-import com.junmp.jyzb.api.util.GenCodeUtil;
-import com.junmp.jyzb.entity.Company;
-import com.junmp.jyzb.mapper.CompanyMapper;
-import com.junmp.jyzb.service.CompanyService;
-import com.junmp.v2.common.exception.base.ServiceException;
-import com.junmp.v2.common.util.BeanPlusUtil;
-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 lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <pre>
- *
- * 描述：
- * 版本：1.0.0
- * 日期：2022/8/1 09:35
- * 作者：ningzp@junmp.com.cn
- * <br>修改记录
- * <br>修改日期        修改人          修改内容
- *
- * </pre>
- */
-@Slf4j
-@Service
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
-
-    @Override
-    public boolean addBiz(CompanyReq req) {
-        Company company = new Company();
-        BeanPlusUtil.copyProperties(req, company);
-        Integer maxSn = baseMapper.getMaxSn();
-        //1-获取当前序号
-        Integer sn = maxSn + 1;
-        company.setSn(sn);
-        //2-获取当前编码
-        String bizCode = GenCodeUtil.genBizCode(sn);
-        company.setBizCode(bizCode);
-        return this.save(company);
-    }
-
-    @Override
-    public boolean editBiz(CompanyReq req) {
-        Company company = queryCompany(req);
-        BeanPlusUtil.copyProperties(req, company);
-        return this.updateById(company);
-    }
-
-    @Override
-    public boolean del(CompanyReq req) {
-        Company entity = queryCompany(req);
-        if (ObjectUtil.isNull(entity)) {
-            log.warn(StrUtil.format("企业信息不存在,企业编号为：{}", req.getBizId()));
-            return false;
-        } else {
-            return this.removeById(entity.getBizId());
-        }
-    }
-
-    @Override
-    public List<Company> findList(CompanyReq req) {
-        LambdaQueryWrapper<Company> wrapper = createWrapper(req);
-        return this.list(wrapper);
-    }
-
-    @Override
-    public PageResult<Company> findPage(CompanyReq req) {
-        LambdaQueryWrapper<Company> wrapper = createWrapper(req);
-        Page<Company> page = this.page(PageFactory.getDefaultPage(req.getPageNo(),req.getPageSize()), wrapper);
-        return PageResultFactory.createPageResult(page);
-    }
-
-
-    private Company queryCompany(CompanyReq req) {
-        Company app = this.getById(req.getBizId());
-        if (ObjectUtil.isNull(app)) {
-            throw new ServiceException(CompanyExceptionEnum.COMPANY_NOT_EXIST);
-        }
-        return app;
-    }
-
-
-    private LambdaQueryWrapper<Company> createWrapper(CompanyReq req) {
-        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
-        if (ObjectUtil.isEmpty(req)) {
-            return wrapper;
-        }
-        //根据业务编码查询
-        wrapper.like(ObjectUtil.isNotEmpty(req.getBizCode()), Company::getBizCode, req.getBizCode());
-        //根据企业名称模糊查询
-        wrapper.like(ObjectUtil.isNotEmpty(req.getName()), Company::getName, req.getName());
-        wrapper.orderByDesc(Company::getCreateTime);
-        return wrapper;
-    }
-}

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

@@ -116,6 +116,22 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         return PageResultFactory.createPageResult(page);
     }
 
+    @Override
+    public List<InventorySummary> getEquipmentInfoList(InventorySumReq req) {
+        //当没有参数传递的时候默认查询全部，但是如果传递了条件，根据条件查询并且如果是根据id进行查询，则需要判断该id是否存在
+        //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
+        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
+                ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
+            //修改字段，和数据库字段进行统一
+            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+            req.setOrder(req.getOrder().toLowerCase());
+        }
+        LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
+        return list(wp);
+
+    }
+
     /**
      * 用于出库单中的装备选择
      * @return
@@ -421,6 +437,10 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
             wrapper.and(qw -> req.typeIds.forEach(typeId -> qw.or().eq(InventorySummary::getTypeId, typeId)));
         }
         //根据类别
+        if (ObjectUtil.isNotEmpty(req.sizeIds) && req.sizeIds.size()>0) {
+            wrapper.and(qw -> req.sizeIds.forEach(sizeId -> qw.or().eq(InventorySummary::getSizeId, sizeId)));
+        }
+        //根据类别
         if (ObjectUtil.isNotEmpty(req.getSizeNames()) && req.getSizeNames().size()>0) {
             wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
         }

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

@@ -93,6 +93,42 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
         return stocktake.getId();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String AddInvOrder(UpdateStocktakeReq req) {
+        Stocktake stocktake = new Stocktake();
+        BeanPlusUtil.copyProperties(req,stocktake);
+        //设置单号
+        if (ObjectUtil.isNull(stocktake.getOrderCode())){
+            OrderNum orderNum = setOrderCode(req.getBussinessType(),req.getOrgId());
+            String codeValue=String.format("%04d",orderNum.getNum());
+            stocktake.setOrderCode(orderNum.getBussinessType()+orderNum.getYear()+
+                    String.format("%02d",LocalDateTime.now().getMonth().getValue())+
+                    String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
+        }
+        stocktake.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        stocktake.setApplyTime(DateTimeUtil.getCurrentDateTime());
+
+        //执行工作流
+        if (req.getExamineState().equals("working"))
+        {
+            StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+            startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+            startProcessInstanceDTO.setOrderId(stocktake.getId());
+            startProcessInstanceDTO.setOrderType("stocktakeOrder");
+            startProcessInstanceDTO.setUserId(req.getUserId());
+            String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+            stocktake.setProcessId(ProcessInstanceId);
+
+            String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
+            stocktake.setCurrentAssign(assigns);
+            updateById(stocktake);
+
+        }
+        this.save(stocktake);
+        return stocktake.getId();
+    }
+
     //盘库单据查询
     @Override
     public PageResult<Stocktake> ShowStocktakeOrderPage(StocktakeReq req) {