Merge branch 'develop' into develop-zhaojw

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

@@ -40,6 +40,16 @@ public class BusFormDto  {
     private String orgName;
 
     /**
+     * 发物单位id
+     */
+    private Long startOrgId;
+
+    /**
+     * 发物单位
+     */
+    private String startOrgName;
+
+    /**
      * 收物单位id
      */
     private Long endOrgId;
@@ -69,6 +79,8 @@ public class BusFormDto  {
      */
     private String attachmentLocation;
 
+    private String agentId;
+
     /**
      * 经办人
      */
@@ -107,7 +119,7 @@ public class BusFormDto  {
     /**
      * 调拨类型（2支拨，1价拨）
      */
-    private Integer transferType;
+    private String allocateType;
 
     /**
      * 备注
@@ -144,4 +156,25 @@ public class BusFormDto  {
      * 更新人
      */
     private String updateUser;
+
+    /**
+     * 报废类型（1报废出库，2移入报废区）
+     */
+    private Integer type;
+    /**
+     * 维修单位id
+     */
+    private String repairId;
+    /**
+     * 维修单位名称
+     */
+    private String repairName;
+    /**
+     * 销毁、报废单位id
+     */
+    private String destoryId;
+    /**
+     * 销毁、报废单位名称
+     */
+    private String destoryName;
 }

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

@@ -76,4 +76,6 @@ public class EquipmentSizeDto {
 
     private String photo;
 
+    private String instructions;
+
 }

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

-package com.junmp.jyzb.api.bean.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class InOutRecordsDto implements Serializable {
-    //序号
-    private String Id;
-    //操作人员
-    private String userName;
-    // 存储名称
-    private String locationName;
-    //出入库时间
-    private Date useTime;
-    // 出入库状态
-    private String outInState;
-}

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

 package com.junmp.jyzb.api.bean.dto;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,50 +8,93 @@ import java.util.Date;
 @Data
 public class LogDetailDto implements Serializable {
     /**
+     * 出入库明细ID
+     */
+    private Integer id;
+
+    /**
      * 物资id
      */
-    @ApiModelProperty(value = "物资id")
     private String inventoryId;
 
     /**
+     * 出入库汇总ID
+     */
+    private Integer summaryId;
+
+    /**
      * 单据ID
      */
-    @ApiModelProperty(value = "单据ID")
     private String orderMainId;
 
     /**
      * EPC信息
      */
-    @ApiModelProperty(value = "EPC信息")
     private String epc;
 
     /**
      * 装备名称
      */
-    @ApiModelProperty(value = "装备名称")
     private String equipmentName;
 
     /**
      * 装备号型
      */
-    @ApiModelProperty(value = "装备号型")
     private String equipmentSize;
 
     /**
      * 供应商
      */
-    @ApiModelProperty(value = "供应商")
     private String equipmentSupplier;
 
     /**
      * 装备类型:0单件/1装备包
      */
-    @ApiModelProperty(value = "装备类型:0单件/1装备包")
     private Integer equipmentType;
 
     /**
      * 状态，0正常/1异常
      */
-    @ApiModelProperty(value = "状态，0正常/1异常")
     private Integer errorState;
+
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 照片信息
+     */
+    private String picture;
+
+    /**
+     * 作业设备：0手持机 1单警柜 2通道）
+     */
+    private Integer deviceType;
+
+    /**
+     * 存储ID
+     */
+    private String locationId;
+
+    /**
+     * 存储名称：XX仓库，XX单警柜
+     */
+    private String locationName;
 }

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

 package com.junmp.jyzb.api.bean.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,87 +9,97 @@ import java.util.List;
 public class LogSummaryDto implements Serializable {
 
     /**
+     * 出入库汇总ID
+     */
+    private Integer id;
+
+    /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID")
-    private String orgId;
+    private Long orgId;
 
     /**
      * 组织机构名称
      */
-    @ApiModelProperty(value = "组织机构名称")
     private String orgName;
 
     /**
      * 单据id
      */
-    @ApiModelProperty(value = "单据id")
     private String orderMainId;
 
     /**
      * 存储ID
      */
-    @ApiModelProperty(value = "存储ID")
     private String locationId;
 
     /**
      * 存储名称：XX仓库，XX单警柜
      */
-    @ApiModelProperty(value = "存储名称")
     private String locationName;
 
     /**
      * 设备标识
      */
-    @ApiModelProperty(value = "设备标识")
     private String device;
 
     /**
      * 出入设备:0手持机/1单警柜/2通道
      */
-    @ApiModelProperty(value = "出入设备:0手持机/1单警柜/2通道")
     private Integer deviceType;
 
     /**
      * 操作时间
      */
-    @ApiModelProperty(value = "操作时间")
     private Date useTime;
 
     /**
      * 业务类型
      */
-    @ApiModelProperty(value = "业务类型")
     private String bussinessType;
     /**
      * 操作人员姓名
      */
-    @ApiModelProperty(value = "操作人员姓名")
     private String userName;
 
     /**
      * 出入库类型:0出库/1入库
      */
-    @ApiModelProperty(value = "出入库类型:0出库/1入库")
     private Integer outInState;
 
     /**
      * 照片信息
      */
-    @ApiModelProperty(value = "照片信息")
     private String picture;
 
     /**
      * 装备记录集合，警棍、盾牌
      */
-    @ApiModelProperty(value = "装备记录集合")
-    private String equipments;
+    private String equipmentList;
 
     /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+    /**
      * 装备详细信息
      */
-    @ApiModelProperty(value = "装备详细信息")
-    private List<LogDetailDto> equipmentList;
+    private List<LogDetailDto> logList;
 
 
 }

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

@@ -27,6 +27,8 @@ public class OrderDetailDto implements Serializable {
 
     private String warehouseId;
 
+    private String warehouseName;
+
     /**
      * 计划数量
      */
@@ -37,4 +39,9 @@ public class OrderDetailDto implements Serializable {
     private Integer actualNum;
 
     private BigDecimal price;
+
+    /**
+     * 在库数
+     */
+    private Integer stockNumber;
 }

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

@@ -22,6 +22,7 @@ public class OrderMainDto implements Serializable {
 
     //订单编号
     private String orderCode;
+    //业务单据单号
     private String bussinessCode;
 
     //发物单位

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

@@ -42,5 +42,5 @@ public class PolicemanDto {
     private List<PoliceFingerDto> fingersList;
     private String fileContent;
 
-    private String userId;
+    private Long userId;
 }
\ No newline at end of file

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

@@ -32,6 +32,10 @@ public class InventoryReq extends BaseRequest {
      */
     private String typeId;
     /**
+     * 装备类型名称
+     */
+    private String typeName;
+    /**
      * 装备号型ID
      */
     private String sizeId;
@@ -73,6 +77,8 @@ public class InventoryReq extends BaseRequest {
      */
     @NotNull(message = "组织机构不能为空",groups = {export.class})
     private Long orgId;
+
+    private String orgName;
     /**
      * 单警柜id
      */
@@ -101,8 +107,6 @@ public class InventoryReq extends BaseRequest {
      */
     private String locationState;
 
-
-
     /**
      * 生产日期
      */

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

@@ -13,6 +13,7 @@ public class InventorySumReq extends BaseRequest {
      * 组织机构
      */
     private Long orgId;
+
     /**
      * 组织机构名称
      */
@@ -25,6 +26,11 @@ public class InventorySumReq extends BaseRequest {
      * 位置信息
      */
     private String locationName;
+
+    /**
+     * 位置类型（0仓库，1单警柜）
+     */
+    private String locationType;
     /**
      * 类型ID
      */
@@ -42,4 +48,43 @@ public class InventorySumReq extends BaseRequest {
      */
     private String sizeName;
 
+    /**
+     * 排序规则
+     */
+    private String order;
+
+    /**
+     * 排序列
+     */
+    private String column;
+
+    /**
+     * 装备总数
+     */
+    private String number;
+    /**
+     * 在库数
+     */
+    private String stockNumber;
+    /**
+     * 出库数
+     */
+    private String outboundNumber;
+    /**
+     * 过质保数
+     */
+    private String expireNumber;
+    /**
+     * 报废数
+     */
+    private String brokenNumber;
+    /**
+     * 单价
+     */
+    private String unitPrice;
+    /**
+     * 总金额
+     */
+    private String price;
+
 }

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

+package com.junmp.jyzb.api.bean.query;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LogDetailReq {
+
+    /**
+     * 出入库明细ID
+     */
+    private Integer id;
+
+    /**
+     * 物资id
+     */
+    private String inventoryId;
+
+    /**
+     * 出入库汇总ID
+     */
+    private Integer summaryId;
+
+    /**
+     * 单据ID
+     */
+    private String orderMainId;
+
+    /**
+     * EPC信息
+     */
+    private String epc;
+
+    /**
+     * 装备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 装备号型
+     */
+    private String equipmentSize;
+
+    /**
+     * 供应商
+     */
+    private String equipmentSupplier;
+
+    /**
+     * 装备类型:0单件/1装备包
+     */
+    private Integer equipmentType;
+
+    /**
+     * 状态，0正常/1异常
+     */
+    private Integer errorState;
+
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 照片信息
+     */
+    private String picture;
+
+    /**
+     * 作业设备：0手持机 1单警柜 2通道）
+     */
+    private Integer deviceType;
+
+    /**
+     * 存储ID
+     */
+    private String locationId;
+
+    /**
+     * 存储名称：XX仓库，XX单警柜
+     */
+    private String locationName;
+}

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

+package com.junmp.jyzb.api.bean.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.junmp.jyzb.api.bean.dto.LogDetailDto;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LogSummaryReq extends BaseRequest {
+    /**
+     * 出入库汇总ID
+     */
+    private Integer id;
+
+    /**
+     * 组织机构ID
+     */
+    @NotNull(message = "组织机构id不能为空",groups = {detail.class})
+    private Long orgId;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 单据id
+     */
+    private String orderMainId;
+
+    /**
+     * 存储ID
+     */
+    private String locationId;
+
+    /**
+     * 箱门id
+     */
+    private String cabinetboxId;
+
+    /**
+     * 存储名称：XX仓库，XX单警柜
+     */
+    private String locationName;
+
+    /**
+     * 0仓库，1单警柜
+     */
+    private Integer locationType;
+
+    /**
+     * 设备标识
+     */
+    private String device;
+
+    /**
+     * 出入设备:0手持机/1单警柜/2通道
+     */
+    private Integer deviceType;
+
+    /**
+     * 操作时间
+     */
+    private Date useTime;
+
+    /**
+     * 业务类型
+     */
+    private String bussinessType;
+    /**
+     * 操作人员姓名
+     */
+    private String userName;
+
+    /**
+     * 出入库类型:0出库/1入库
+     */
+    private Integer outInState;
+
+    /**
+     * 照片信息
+     */
+    private String picture;
+
+    /**
+     * 装备记录集合，警棍、盾牌
+     */
+    private String equipmentList;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+    /**
+     * 装备详细信息
+     */
+    private List<LogDetailReq> logList;
+
+    private String typeId;
+
+}

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

@@ -50,6 +50,8 @@ public class OrderDetailReq extends BaseRequest {
 
     private String warehouseId;
 
+    private String warehouseName;
+
     /**
      * 修改后数量
      */

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

@@ -45,6 +45,16 @@ public class QueryBusFormReq extends BaseRequest {
     private String orgName;
 
     /**
+     * 发物单位id
+     */
+    private Long startOrgId;
+
+    /**
+     * 发物单位
+     */
+    private String startOrgName;
+
+    /**
      * 收物单位id
      */
     private Long endOrgId;
@@ -73,6 +83,8 @@ public class QueryBusFormReq extends BaseRequest {
      * 附件地址
      */
     private String attachmentLocation;
+
+    private String agentId;
     /**
      * 经办人
      */
@@ -112,7 +124,7 @@ public class QueryBusFormReq extends BaseRequest {
     /**
      * 调拨类型（2支拨，1价拨）
      */
-    private Integer transferType;
+    private Integer allocateType;
 
     /**
      * 备注
@@ -169,4 +181,26 @@ public class QueryBusFormReq extends BaseRequest {
      * 排序规则
      */
     private String order;
+
+    /**
+     * 报废类型（1报废出库，2移入报废区）
+     */
+    private Integer type;
+
+    /**
+     * 维修单位id
+     */
+    private String repairId;
+    /**
+     * 维修单位名称
+     */
+    private String repairName;
+    /**
+     * 销毁、报废单位id
+     */
+    private String destoryId;
+    /**
+     * 销毁、报废单位名称
+     */
+    private String destoryName;
 }

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

@@ -25,4 +25,6 @@ public class QueryEquipmentSizeReq extends BaseRequest {
     private BigDecimal price;
 
     private Integer state;
+
+    private String instructions;
 }

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.jyzb.api.bean.query.InventoryReq;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CabinetInOutRecordsReq {
+    //组织机构id
+    private Long orgId;
+
+    //组织机构名称
+    private String orgName;
+    //表示装备
+    private String device;
+
+    //出入设备:0手持机/1单警柜/2通道
+    private Integer deviceType;
+
+    /**
+     * 单警柜id
+     */
+    private String locationId;
+    //单警柜名称
+    private String locationName;
+
+    /**
+     * 箱门id
+     */
+    private String cabinetboxId;
+    //操作时间
+    private Date useTIme;
+    /**
+     * 操作人员
+     */
+    private String userName;
+    /**
+     * 出入装备集合
+     */
+    private List<InventoryReq> inventoryList;
+
+}

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

+package com.junmp.jyzb.api.bean.req;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DestoryUnitReq extends BaseRequest {
+    /**
+     * 报废/销毁收物单位id
+     */
+    private String id;
+
+    /**
+     * 报废/销毁收物单位名称
+     */
+    @NotBlank(message = "报废/销毁收物单位不能为空",groups = {add.class,edit.class})
+    private String name;
+
+    /**
+     * 报废/销毁收物单位短码
+     */
+    @NotBlank(message = "报废/销毁收物单位短码不能为空",groups = {add.class})
+
+    /**
+     * 简称
+     */
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 批量删除报废/销毁单位id
+     */
+    private List<String> deleteList;
+}

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

@@ -28,6 +28,7 @@ public class ManufacturerReq extends BaseRequest {
     /**
      * 厂商短码
      */
+    @NotBlank(message = "生产厂商短码不能为空",groups = {add.class})
     private String code;
 
     /**

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

@@ -6,6 +6,7 @@ import com.junmp.jyzb.api.bean.query.OrderMainReq;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -16,4 +17,17 @@ public class RabbitMqOrderReq implements Serializable {
     private OrderDetailReq orderDetailReq;
     //具体装备epc
     private  List<InventoryReq> inventoryReqList;
+    //设备标识
+    private String device;
+    //出入设备
+    private Integer deviceType;
+    /**
+     * 操作人员
+     */
+    private String userName;
+    /**
+     * 操作时间
+     */
+    private Date useTime;
+
 }

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RepairUnitReq extends BaseRequest {
+    /**
+     * 维修单位id
+     */
+    private String id;
+
+    /**
+     * 维修单位名称
+     */
+   @NotBlank(message = "维修单位名称不能为空",groups = {add.class,edit.class})
+    private String name;
+
+    /**
+     * 维修单位短码
+     */
+    @NotBlank(message = "维修单位短码不能为空",groups = {add.class})
+    private String code;
+
+    /**
+     * 简称
+     */
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 批量删除维修单位id
+     */
+    private List<String> deleteList;
+
+}

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

@@ -18,7 +18,7 @@ public class UpdateBusFormReq extends BaseRequest {
     @NotBlank(message = "单据id不能为空",groups = {edit.class})
     private String id;
 
-    private String userId;
+//    private String userId;
     /**
      * 工作流id
      */
@@ -47,6 +47,15 @@ public class UpdateBusFormReq extends BaseRequest {
     private String orgName;
 
     /**
+     * 发物单位id
+     */
+    private Long startOrgId;
+
+    /**
+     * 发物单位
+     */
+    private String startOrgName;
+    /**
      * 收物单位id
      */
     private Long endOrgId;
@@ -76,6 +85,7 @@ public class UpdateBusFormReq extends BaseRequest {
      */
     private String attachmentLocation;
 
+    private String agentId;
     /**
      * 经办人
      */
@@ -114,7 +124,7 @@ public class UpdateBusFormReq extends BaseRequest {
     /**
      * 调拨类型（2支拨，1价拨）
      */
-    private Integer transferType;
+    private Integer allocateType;
 
     /**
      * 备注
@@ -151,4 +161,26 @@ public class UpdateBusFormReq extends BaseRequest {
      * 更新人
      */
     private String updateUser;
+
+    /**
+     * 报废类型（1报废出库，2移入报废区）
+     */
+    private Integer type;
+
+    /**
+     * 维修单位id
+     */
+    private String repairId;
+    /**
+     * 维修单位名称
+     */
+    private String repairName;
+    /**
+     * 销毁、报废单位id
+     */
+    private String destoryId;
+    /**
+     * 销毁、报废单位名称
+     */
+    private String destoryName;
 }

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

@@ -27,4 +27,6 @@ public class UpdateEquipmentSizeReq {
     private String state;
 
     private String photo;
+
+    private String instructions;
 }

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

@@ -46,6 +46,8 @@ public class UpdateOrderDetailReq implements Serializable {
 
     private String warehouseId;
 
+    private String warehouseName;
+
     private String orderId;
 
     private Integer actualNum;

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

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -41,6 +42,9 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      */
     private String  orderCode;
 
+    /**
+     * 业务单据单号
+     */
     private String bussinessCode;
     /**
      * 发物单位
@@ -87,11 +91,15 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     /**
      * 总价格
      */
-    private String  price;
+    private BigDecimal price;
     /**
      * 应入库数量
      */
-    private String  inventoryQuantity;
+    private Integer  inventoryQuantity;
+    /**
+     * 实际入库数量
+     */
+    private Integer actualQuantity;
     /**
      * 附件地址
      */

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

@@ -36,6 +36,9 @@ public class UpdatePolicemanReq extends BaseRequest {
 
     private String doorCode;
 
+    /**
+     * 用户名
+     */
     private String account;
 
     private String password;

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

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum DestoryUnitExceptionEnum implements IExceptionEnum {
+    /**
+     * 删除时未选中需要删除的销毁/报废收物单位
+     */
+    DESTORYUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE,"删除时未选中需要删除的销毁/报废收物单位"),
+    /**
+     * 销毁、报废收物单位不存在
+     */
+    DESTORYUNIT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"销毁、报废收物单位不存在"),
+    /**
+     * 销毁、报废收物单位已存在
+     */
+    DESTORYUNIT_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"销毁、报废收物单位已存在"),;
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    DestoryUnitExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum RepairUnitExceptionEnum implements IExceptionEnum {
+    /**
+     * 删除时未选中需要删除的维修收物单位
+     */
+    REPAIRUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE,"删除时未选中需要删除的维修收物单位"),
+    /**
+     * 维修单位不存在
+     */
+    REPAIRUNIT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"维修单位不存在"),
+    /**
+     * 维修单位已存在
+     */
+    REPAIRUNIT_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"维修单位已存在"),;
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    RepairUnitExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.junmp.jyzb.service.DestoryUnitService;
+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
+@Api(tags = "报废/销毁单位模块")
+@RequestMapping("/DestoryUnit")
+public class DestoryUnitController {
+    @Resource
+    private DestoryUnitService destoryUnitService;
+
+    //创建报废/销毁单位
+    @PostMapping("/AddDestoryUnit")
+    @ApiOperation("创建报废/销毁单位")
+    public ApiRes<String> addDestoryUnit(@RequestBody @Validated(ValidationApi.add.class) DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.addDestoryUnit(req));
+    }
+
+    //修改报废/销毁单位
+    @PostMapping("/UpdateDestoryUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> updateDestoryUnit(@RequestBody @Validated(ValidationApi.edit.class) DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.updateDestoryUnit(req));
+    }
+
+    //查询报废/销毁单位(list)
+    @PostMapping("/ShowDestoryUnitList")
+    @ApiOperation("查询报废/销毁单位(list)")
+    public ApiRes<List<DestoryUnit>> showDestoryUnitList(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.showDestoryUnitList(req));
+    }
+
+    //查询报废/销毁单位(page)
+    @PostMapping("/ShowDestoryUnitPage")
+    @ApiOperation("修改报废/销毁单位(page)")
+    public ApiRes<PageResult<DestoryUnit>> showDestoryUnitPage(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.showDestoryUnitPage(req));
+    }
+    //删除报废/销毁单位
+    @PostMapping("/DelDestoryUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> delDestoryUnit(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.delDestoryUnit(req));
+    }
+}

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

@@ -4,8 +4,9 @@ import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.query.*;
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
 import com.junmp.jyzb.api.bean.req.EquipmentBindReq;
-import com.junmp.jyzb.entity.Inventory;
 import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.entity.LogDetail;
+import com.junmp.jyzb.entity.LogSummary;
 import com.junmp.jyzb.service.*;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -90,20 +91,13 @@ public class InventoryController {
         return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
     }
 
-
-    //根据组织机构/单警柜id/仓库id查询每件装备细信的详息（返回结果是List）
-    @PostMapping("/")
-    @ApiOperation("查询库存装备详细信息(list)")
-    public ApiRes<List<InventoryDto>> EqsBySearchType(@RequestBody @Validated(ValidationApi.edit.class) InventoryReq req ){
-        return ApiRes.success(inventoryService.EqsBySearchType(req));
+    //根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额(和getEquipmentInfo同时调用，汇总出符合查询条件的装备)
+    @PostMapping("/getTotalNumberAndPrice")
+    @ApiOperation("查询总金额以及各个汇总数量")
+    public ApiRes<List<InventorySummary>> getTotalNumberAndPrice(@RequestBody InventorySumReq req){
+        return ApiRes.success(inventorySummaryService.getTotalNumberAndPrice(req));
     }
 
-    //根据组织机构/单警柜id/仓库id查询每件装备细信的详息(返回结果是page)
-    @PostMapping("/EqsByTypePage")
-    @ApiOperation("查询库存装备详细信息(page)")
-    public ApiRes<PageResult<InventoryDto>> EqsByTypePage(@RequestBody @Validated(ValidationApi.edit.class) InventoryReq req ){
-        return ApiRes.success(inventoryService.EqsByTypePage(req));
-    }
 
     //根据装备id查询出装备的详细信息
     @PostMapping("/GetDetail")
@@ -194,9 +188,9 @@ public class InventoryController {
         return ApiRes.success(inventoryService.GetListEquipment(req));
     }
 
-    //根据条件查询仓库下的所有装备信息（业务状态，在库状态，仓库id，超期状态）
+    //根据条件查询仓库/单警柜下的所有装备信息
     @PostMapping("/GetDetailByTerms")
-    @ApiOperation("根据条件查询仓库下的所有装备信息")
+    @ApiOperation("根据条件查询仓库/单警柜下的所有装备信息")
     public ApiRes<PageResult<InventoryDto>> GetDetailByTerms(@RequestBody @Validated(ValidationApi.export.class) InventoryReq req){
         return ApiRes.success(inventoryService.GetDetailByTerms(req));
     }
@@ -221,10 +215,43 @@ public class InventoryController {
         return ApiRes.success(inventoryService.BatchEditingInvsInfo(req));
     }
 
-    //装备出入库记录（通过装备id）-----------------------需要修改成page
-    @PostMapping("/GetInOutRecords")
-    @ApiOperation("装备出入库记录查询展示")
-    public ApiRes<List<InOutRecordsDto>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
+    //装备出入库记录（根据单据id）
+    @PostMapping("/ShowInOutRecordsByOrder")
+    @ApiOperation("出入库单据查询展示")
+    public ApiRes<PageResult<LogSummary>> ShowInOutRecordsByOrder(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
+        return ApiRes.success(inventoryService.ShowInOutRecordsByOrder(req));
+    }
+
+
+    //装备出入库记录（根据条件查询）
+    @PostMapping("/ShowInOutRecordsByItems")
+    @ApiOperation("出入库记录条件查询展示")
+    public ApiRes<PageResult<LogSummary>> ShowInOutRecordsByItems(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
+        return ApiRes.success(inventoryService.ShowInOutRecordsByItems(req));
+    }
+
+    //通过装备id查询某一件装备的出入库记录
+    @PostMapping("/ShowInOutRecordsByEqs")
+    @ApiOperation("出入库记录装备id查询展示")
+    public ApiRes<PageResult<LogDetail>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
         return ApiRes.success(inventoryService.getInOutRecords(req));
     }
+
+    @PostMapping("/test")
+    public ApiRes<Boolean> test(@RequestBody InventorySumReq req){
+        System.out.println("req = " + req);
+
+        return ApiRes.success(true);
+    }
+
+    @PostMapping("/EquipmentStatistics")
+    @ApiOperation("装备数量数据统计")
+    public ApiRes<List<InventorySummary>> EquipmentStatistics(@RequestBody InventorySumReq req){
+
+        return ApiRes.success(inventorySummaryService.EquipmentStatistics(req));
+    }
+
+
+
+
 }

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

@@ -70,6 +70,7 @@ public class OrderController {
         return ApiRes.success(orderMainService.updateOrder(req));
     }
 
+
     //查询任务列表(根据组织机构id)
     @PostMapping("/GetOrderPage")
     @ApiOperation("/查询任务列表")

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.RepairUnitReq;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.RepairUnit;
+import com.junmp.jyzb.service.RepairUnitService;
+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
+@Api(tags = "维修单位模块")
+@RequestMapping("/RepairUnit")
+public class RepairUnitController {
+    @Resource
+    private RepairUnitService repairUnitService;
+
+    //创建报废/销毁单位
+    @PostMapping("/AddRepairUnit")
+    @ApiOperation("创建报废/销毁单位")
+    public ApiRes<String> addRepairUnit(@RequestBody @Validated(ValidationApi.add.class) RepairUnitReq req){
+        return ApiRes.success(repairUnitService.addRepairUnit(req));
+    }
+
+    //修改报废/销毁单位
+    @PostMapping("/UpdateRepairUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> updateRepairUnit(@RequestBody @Validated(ValidationApi.edit.class) RepairUnitReq req){
+        return ApiRes.success(repairUnitService.updateRepairUnit(req));
+    }
+
+    //查询报废/销毁单位(list)
+    @PostMapping("/ShowRepairUnitList")
+    @ApiOperation("查询报废/销毁单位(list)")
+    public ApiRes<List<RepairUnit>> showRepairUnitList(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.showRepairUnitList(req));
+    }
+
+    //查询报废/销毁单位(page)
+    @PostMapping("/ShowRepairUnitPage")
+    @ApiOperation("修改报废/销毁单位(page)")
+    public ApiRes<PageResult<RepairUnit>> showRepairUnitPage(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.showRepairUnitPage(req));
+    }
+    //删除报废/销毁单位
+    @PostMapping("/DelRepairUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> delRepairUnit(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.delRepairUnit(req));
+    }
+}

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

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
+import com.junmp.jyzb.service.TestService;
 import com.junmp.jyzb.utils.ResponseResult;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+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;
+
 @RestController
 @Slf4j
 @RequestMapping("/api")
 public class TestController {
+
+    @Resource
+    private TestService testService;
     @RequestMapping("/hello")
     public ResponseResult Hello(){
         return new ResponseResult(10000,"操作成功","hello");
     }
+
+    @PostMapping("/uploadResult")
+    @ApiOperation("模拟本地主机上传结果到rabbitmq")
+    public Boolean uploadResult(@RequestBody RabbitMqOrderReq req){
+
+        return testService.uploadResult(req);
+    }
 }

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

@@ -65,7 +65,7 @@ public class WarehouseController {
     @PostMapping("/ShowWarehouse")
     @ApiOperation("查询仓库列表")
     public ApiRes<List<WarehouseDto>> getAllWarehouse(@RequestBody @Validated(ValidationApi.edit.class) WarehouseReq req){
-        return ApiRes.success(warehouseService.getAllWarehouse(req));
+        return ApiRes.success(warehouseService.getAllWarehouse(req.getOrgId()));
     }
 
     //通过仓库id查询列表

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

@@ -41,7 +41,7 @@ public class Application implements Serializable  {
     private String name;
 
     /**
-     * 类型（0内部软件管理，1外部软件管理，2插件/环境安装包）
+     * 类型（0内部软件管理，1外部软件管理，2插件/环境安装包，3导出模板维护，4导入模板维护）
      */
     private Integer type;
 

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

@@ -51,6 +51,17 @@ public class BusForm implements Serializable {
     private String orgName;
 
     /**
+     * 发物单位id
+     */
+    @TableField(value = "start_org_id")
+    private Long startOrgId;
+
+    /**
+     * 发物单位
+     */
+    @TableField(value = "start_org_name")
+    private String startOrgName;
+    /**
      * 收物单位id
      */
     @TableField(value = "end_org_id")
@@ -85,6 +96,11 @@ public class BusForm implements Serializable {
      */
     @TableField(value = "attachment_location")
     private String attachmentLocation;
+    /**
+     * 经办人id
+     */
+    @TableField(value = "agent_id")
+    private String agentId;
 
     /**
      * 经办人
@@ -131,8 +147,8 @@ public class BusForm implements Serializable {
     /**
      * 调拨类型（2支拨，1价拨）
      */
-    @TableField(value = "transfer_type")
-    private Integer transferType;
+    @TableField(value = "allocate_type")
+    private Integer allocateType;
 
     /**
      * 备注
@@ -187,6 +203,31 @@ public class BusForm implements Serializable {
     @TableField(value = "update_user")
     private String updateUser;
 
+    /**
+     * 报废类型（1报废出库，2移入报废区）
+     */
+    private Integer type;
+    /**
+     * 维修单位id
+     */
+    @TableField(value = "repair_id")
+    private String repairId;
+    /**
+     * 维修单位名称
+     */
+    @TableField(value = "repair_name")
+    private String repairName;
+    /**
+     * 销毁、报废单位id
+     */
+    @TableField(value = "destory_id")
+    private String destoryId;
+    /**
+     * 销毁、报废单位名称
+     */
+    @TableField(value = "destory_name")
+    private String destoryName;
+
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 报废收物单位表
+ * @TableName base_destory_unit
+ */
+@TableName(value ="base_destory_unit")
+@Data
+public class DestoryUnit implements Serializable {
+    /**
+     * 报废收物单位id
+     */
+    private String id;
+
+    /**
+     * 报废收物单位名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 报废收物单位短码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 简称
+     */
+    @TableField(value = "short_name")
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    @TableField(value = "contacts")
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    @TableField(value = "phone")
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    @TableField(value = "state")
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

@@ -81,5 +81,11 @@ public class EquipmentSize implements Serializable {
 
     private String photo;
 
+    /**
+     * 使用教学说明
+     */
+    @TableField(value = "instructions")
+    private String instructions;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -33,17 +33,26 @@ public class Inventory implements Serializable {
      */
     @TableField("type_id")
     private String typeId;
+
+    @TableField(exist = false)
+    private String typeName;
     /**
      * 装备类型ID
      */
     @TableField("size_id")
     private String sizeId;
+
+    @TableField(exist = false)
+    private String sizeName;
     /**
      * 供应商ID
      */
     @TableField("supplier_id")
     private String supplierId;
 
+    @TableField(exist = false)
+    private String supplierName;
+
     /**
      * 部门ID
      */
@@ -137,6 +146,12 @@ public class Inventory implements Serializable {
     private String locationId ;
 
     /**
+     * 位置名称
+     */
+    @TableField(exist = false)
+    private String locationName ;
+
+    /**
      * 是否遗失
      */
     @TableField(value = "lost_flag")

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

@@ -134,6 +134,27 @@ public class InventorySummary implements Serializable {
     private Integer expireNumber;
 
     /**
+     * 报废数量
+     */
+    @ApiModelProperty(value = "报废数量")
+    @TableField("broken_number")
+    private Integer brokenNumber;
+
+    /**
+     * 临近报废数量
+     */
+    @ApiModelProperty(value = "临近报废数量")
+    @TableField("near_broken_number")
+    private Integer nearBrokenNumber;
+
+    /**
+     * 使用中数量（领用和借用）
+     */
+    @ApiModelProperty(value = "使用中数量（领用和借用）")
+    @TableField("use_number")
+    private Integer useNumber;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
@@ -170,6 +191,8 @@ public class InventorySummary implements Serializable {
     @TableField(exist = false,updateStrategy  = FieldStrategy.IGNORED)
     private String photo;
 
+    @TableField(exist = false)
+    private String instructions;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogDetail.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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
-
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@ApiModel(value = "com-junmp-jyzb-domain-LogDetail")
+/**
+ * 
+ * @TableName base_log_detail
+ */
+@TableName(value ="base_log_detail")
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("base_log_detail")
 public class LogDetail implements Serializable {
     /**
      * 出入库明细ID
      */
-    @ApiModelProperty(value = "出入库明细ID")
-    private Integer id;
 
+    private Long id;
+    /**
+     * 出入库汇总id
+     */
+    @TableField(value = "summary_id")
+    private Long summaryId;
     /**
      * 物资id
      */
-    @ApiModelProperty(value = "物资id")
-    @TableField("inventory_id")
+    @TableField(value = "inventory_id")
     private String inventoryId;
 
     /**
-     * 出入库汇总ID
+     * 单据ID
      */
-    @ApiModelProperty(value = "出入库汇总ID")
-    @TableField("summary_id")
-    private Integer summaryId;
+    @TableField(value = "order_main_id")
+    private String orderMainId;
 
     /**
-     * 单据ID
+     * 单据编号
      */
-    @ApiModelProperty(value = "单据ID")
-    @TableField("order_main_id")
-    private String orderMainId;
+    @TableField(value = "order_code")
+    private String orderCode;
+
+    /**
+     * 业务类型
+     */
+    @TableField(value = "bussiness_type")
+    private String bussinessType;
 
     /**
      * EPC信息
      */
-    @ApiModelProperty(value = "EPC信息")
+    @TableField(value = "epc")
     private String epc;
 
     /**
-     * 装备名称
+     * 装备类型id
+     */
+    @TableField(value = "type_id")
+    private String typeId;
+
+    /**
+     * 装备类型名称
+     */
+    @TableField(value = "type_name")
+    private String typeName;
+
+    /**
+     * 装备号型id
      */
-    @ApiModelProperty(value = "装备名称")
-    @TableField("equipment_name")
-    private String equipmentName;
+    @TableField(value = "size_id")
+    private String sizeId;
 
     /**
-     * 装备号型
+     * 装备号型名称
      */
-    @ApiModelProperty(value = "装备号型")
-    @TableField("equipment_size")
-    private String equipmentSize;
+    @TableField(value = "size_name")
+    private String sizeName;
 
     /**
-     * 供应商
+     * 供应商id
      */
-    @ApiModelProperty(value = "供应商")
-    @TableField("equipment_supplier")
-    private String equipmentSupplier;
+    @TableField(value = "supplier_id")
+    private String supplierId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supplier_name")
+    private String supplierName;
 
     /**
      * 装备类型:0单件/1装备包
      */
-    @ApiModelProperty(value = "装备类型:0单件/1装备包")
-    @TableField("equipment_type")
+    @TableField(value = "equipment_type")
     private Integer equipmentType;
 
     /**
+     * 位置id（存放单警柜id或者是仓库id）
+     */
+    @TableField(value = "location_id")
+    private String locationId;
+
+    /**
+     * 位置名称（单警柜，仓库）
+     */
+    @TableField(value = "location_name")
+    private String locationName;
+
+    /**
+     * 箱门id
+     */
+    @TableField(value = "cabinetbox_id")
+    private String cabinetboxId;
+
+    /**
      * 状态，0正常/1异常
      */
-    @ApiModelProperty(value = "状态，0正常/1异常")
-    @TableField("error_state")
+    @TableField(value = "error_state")
     private Integer errorState;
 
+    /**
+     * 出入状态：in入库，out出库
+     */
+    @TableField(value = "out_in_state")
+    private String outInState;
 
     /**
      * 创建时间
      */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @TableField(value = "update_time", fill = FieldFill.UPDATE)
+    @TableField(value = "update_time")
     private Date updateTime;
 
     /**
      * 更新人员
      */
-    @TableField(value = "update_user", fill = FieldFill.INSERT)
+    @TableField(value = "update_user")
     private String updateUser;
 
     /**
      * 创建人员
      */
-    @TableField(value = "create_user", fill = FieldFill.UPDATE)
+    @TableField(value = "create_user")
     private String createUser;
 
     /**
      * 照片信息
      */
-    @ApiModelProperty(value = "照片信息")
+    @TableField(value = "picture")
     private String picture;
 
     /**
-     * 作业设备：0手持机 1单警柜 2通道）
+     * 出入设备:0手持机/1单警柜/2通道
      */
-    @ApiModelProperty(value = "业务类型")
-    @TableField("device_type")
+    @TableField(value = "device_type")
     private Integer deviceType;
 
     private static final long serialVersionUID = 1L;
+
+
 }
\ No newline at end of file

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

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+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;
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
+import java.util.List;
+
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@ApiModel(value = "com-junmp-jyzb-domain-LogSummary")
+/**
+ * 
+ * @TableName base_log_summary
+ */
+@TableName(value ="base_log_summary")
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("base_log_summary")
 public class LogSummary implements Serializable {
     /**
      * 出入库汇总ID
      */
-    @ApiModelProperty(value = "出入库汇总ID")
-    private Integer id;
+    private Long id;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID")
-    @TableField("org_id")
-    private String orgId;
+    @TableField(value = "org_id")
+    private Long orgId;
 
     /**
      * 组织机构名称
      */
-    @ApiModelProperty(value = "组织机构名称")
-    @TableField("org_name")
+    @TableField(value = "org_name")
     private String orgName;
 
     /**
-     * 单据id
+     * 单据ID
      */
-    @ApiModelProperty(value = "单据id")
-    @TableField("order_main_id")
+    @TableField(value = "order_main_id")
     private String orderMainId;
-
-    /**
-     * 存储ID
-     */
-    @ApiModelProperty(value = "存储ID")
-    @TableField("location_id")
-    private String locationId;
-
     /**
-     * 存储名称：XX仓库，XX单警柜
+     * 单据编号
      */
-    @ApiModelProperty(value = "存储名称")
-    @TableField("location_name")
-    private String locationName;
+    @TableField(value = "order_code")
+    private String orderCode;
 
     /**
      * 设备标识
      */
-    @ApiModelProperty(value = "设备标识")
+    @TableField(value = "device")
     private String device;
 
     /**
      * 出入设备:0手持机/1单警柜/2通道
      */
-    @ApiModelProperty(value = "出入设备:0手持机/1单警柜/2通道")
-    @TableField("device_type")
+    @TableField(value = "device_type")
     private Integer deviceType;
 
+
+
+    /**
+     * 所属位置（0仓库1单警柜）
+     */
+    @TableField(value = "location_type")
+    private Integer locationType;
+
     /**
      * 操作时间
      */
-    @ApiModelProperty(value = "操作时间")
-    @TableField("use_time")
+    @TableField(value = "use_time")
     private Date useTime;
 
     /**
      * 业务类型
      */
-    @ApiModelProperty(value = "业务类型")
-    @TableField("bussiness_type")
+    @TableField(value = "bussiness_type")
     private String bussinessType;
+
     /**
      * 操作人员姓名
      */
-    @ApiModelProperty(value = "操作人员姓名")
-    @TableField("user_name")
+    @TableField(value = "user_name")
     private String userName;
 
     /**
-     * 出入库类型:0出库/1入库
-     */
-    @ApiModelProperty(value = "出入库类型:0出库/1入库")
-    @TableField("out_in_state")
-    private Integer outInState;
-
-    /**
      * 照片信息
      */
-    @ApiModelProperty(value = "照片信息")
+    @TableField(value = "picture")
     private String picture;
 
     /**
-     * 装备记录集合，警棍、盾牌
+     * 装备记录集合,警棍/盾牌
      */
-    @ApiModelProperty(value = "装备记录集合")
-    @TableField("equipment_List")
+    @TableField(value = "equipment_list")
     private String equipmentList;
 
     /**
      * 创建时间
      */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @TableField(value = "update_time", fill = FieldFill.UPDATE)
+    @TableField(value = "update_time")
     private Date updateTime;
 
     /**
      * 更新人员
      */
-    @TableField(value = "update_user", fill = FieldFill.INSERT)
+    @TableField(value = "update_user")
     private String updateUser;
 
     /**
      * 创建人员
      */
-    @TableField(value = "create_user", fill = FieldFill.UPDATE)
+    @TableField(value = "create_user")
     private String createUser;
 
+    @TableField(exist = false)
+    private List<LogDetail> logDetailList;
+
+    /**
+     * 出入状态
+     */
+    @TableField(value = "out_in_state")
+    private String outInState;
+
     private static final long serialVersionUID = 1L;
+
+
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -46,6 +47,9 @@ import java.util.Date;
         @TableField("warehouse_id")
         private String warehouseId;
 
+        @TableField("warehouse_name")
+        private String warehouseName;
+
         @TableField("plan_num")
         private Integer planNum;
 
@@ -57,6 +61,8 @@ import java.util.Date;
 
         @TableField("order_type")
         private String orderType;
+
+
         /**
          * 创建时间
          */

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

@@ -76,7 +76,7 @@ public class Policeman implements Serializable {
     private Integer state;
 
     @TableField(value = "user_id",updateStrategy  = FieldStrategy.IGNORED)
-    private Long UserId;
+    private Long userId;
 
     /**
      * 0表示警员，1表示辅警

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 维修单位表
+ * @TableName base_repair_unit
+ */
+@TableName(value ="base_repair_unit")
+@Data
+public class RepairUnit implements Serializable {
+    /**
+     * 维修单位id
+     */
+    private String id;
+
+    /**
+     * 维修单位名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 维修单位短码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 简称
+     */
+    @TableField(value = "short_name")
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    @TableField(value = "contacts")
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    @TableField(value = "phone")
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    @TableField(value = "state")
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

@@ -23,11 +23,13 @@ import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
 import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.UserTask;
+import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 import com.junmp.junmpProcess.enums.AssigneeTypeEnums;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -50,6 +52,9 @@ public class CounterSignListener implements ExecutionListener {
     private RepositoryService repositoryService;
     @Resource
     private OrgUserMapper orgUserMapper;
+
+    @Resource
+    private HistoryService historyService;
     @Override
     public void notify(DelegateExecution execution) {
         String currentActivityId = execution.getCurrentActivityId();
@@ -178,13 +183,14 @@ public class CounterSignListener implements ExecutionListener {
                  execution.setVariable(variable, assigneeList);
 
 
+
                  assigneeList.forEach(userId->//为相应的用户推送消息
                  {
                      MessageSendReq sendReq = new MessageSendReq();
                      sendReq.setReceiveUserIds(String.valueOf(userId));
-                     sendReq.setMsgTitle("BizTypeEnum.YW.getDesc()");
-                     sendReq.setBizType("BizTypeEnum.YW.getValue()");
-                     sendReq.setMsgContent("msgContent");
+                     sendReq.setMsgTitle("单据审批提示");
+                     sendReq.setBizType("单据审批");
+                     sendReq.setMsgContent("您有一条单据流程需要进行审批");
                      sendReq.setPriority("0");
                      sendReq.setSendTime(DateTime.now());
                      messageApi.sendMessage(sendReq);
@@ -194,7 +200,7 @@ public class CounterSignListener implements ExecutionListener {
                      req1.setReadFlag(0);
                      req1.setReceiveUserId(Long.valueOf(userId));
                      Integer count1 = messageApi.queryCount(req1);
-                     messageApi.pushMsgToUser(String.valueOf(userId),count1);
+                     messageApi.pushMsgToUser(userId,count1);
                  });
 
              }

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

@@ -12,7 +12,7 @@ import java.util.Map;
 @Mapper
 public interface CabinetMapper extends BaseMapper<Cabinet> {
 
-    List<Cabinet> getAllCabinetByOrgList(List<Long> allOrgId);
+    List<Cabinet> getAllCabinetByOrgList(@Param("list") List<Long> allOrgId);
 
 
     boolean SetInventoryInfo(String id);

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

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_destory_unit(报废收物单位表)】的数据库操作Mapper
+* @createDate 2023-10-16 09:35:03
+* @Entity com.junmp.jyzb.entity.DestoryUnit
+*/
+public interface DestoryUnitMapper extends BaseMapper<DestoryUnit> {
+
+}
+
+
+
+

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

@@ -26,12 +26,11 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     boolean deleteAllMsg();
 
     //根据单警柜统计装备信息
-    boolean SetCabinetInventory();
+    boolean SetCabinetInventory(@Param("brokenNumberDays") Integer brokenNumberDays);
 
     //根据仓库统计装备信息
-    boolean SetWarehouseInventory();
+    boolean SetWarehouseInventory(@Param("brokenNumberDays") Integer brokenNumberDays);
 
-    List<InventoryDto> EqsBySearchType(InventoryReq req);
 
     //根据货架id查询汇总信息(list)
     List<InventorySummary> getSumByShelf(String shelfId);
@@ -54,11 +53,10 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     //查询组织机构下面的装备信息
     List<InventoryVo> selectListByOrg(Long orgId);
 
-    IPage<InventoryDto> EqsByTypePage(Page<InventoryDto> page,@Param("queryType")String queryType,@Param("orgId") Long orgId,@Param("warehouseId")String warehouseId,@Param("cabinetId")String cabinetId);
 
     //通过单警柜箱门id获取箱门下的装备汇总信息(page)
     IPage<InventorySummary> EqsByCabinetBoxIdPage(Page<InventorySummary> page, String id);
 
 
-     boolean insertInventorySummary(@Param("req") BatchEditingInvsReq req);
+     boolean insertInventorySummary(@Param("req") BatchEditingInvsReq req,@Param("brokenNumberDays")Integer brokenNumberDays);
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
+import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.entity.InventorySummary;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,5 +13,20 @@ import java.util.List;
 @Mapper
 public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
 
+    //用于出库单中的装备选择
     List<InventorySumDto> GetInventorySumInfo(@Param("req") InventorySumReq req);
+
+    //根据仓库id删除装备汇总信息
+    boolean deleteByWarehouse(@Param("list") List<WarehouseDto> allWarehouse);
+
+    boolean getSumByWarehouse(@Param("list") List<WarehouseDto> allWarehouse,@Param("brokenNumberDays")Integer brokenNumberDays);
+
+    //根据单警柜删除装备汇总信息
+    boolean deleteByCabinet(@Param("cabinetId") String cabinetId);
+
+    boolean getSumByCabinet(@Param("cabinetId") String cabinetId,@Param("brokenNumberDays")Integer brokenNumberDays);
+
+    InventorySummary getTotalNumberAndPrice(@Param("req") InventorySumReq req);
+
+    InventorySummary EquipmentStatistics(@Param("req") InventorySumReq req);
 }
\ No newline at end of file

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

 package com.junmp.jyzb.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.entity.LogDetail;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-@Mapper
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_detail】的数据库操作Mapper
+* @createDate 2023-10-13 08:29:42
+* @Entity com.junmp.jyzb.entity.LogDetail
+*/
 public interface LogDetailMapper extends BaseMapper<LogDetail> {
-}
+
\ No newline at end of file
+}
+
+
+
+

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

 package com.junmp.jyzb.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.junmp.jyzb.api.bean.query.LogSummaryReq;
 import com.junmp.jyzb.entity.LogSummary;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
-@Mapper
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_summary】的数据库操作Mapper
+* @createDate 2023-10-13 08:29:36
+* @Entity com.junmp.jyzb.entity.LogSummary
+*/
 public interface LogSummaryMapper extends BaseMapper<LogSummary> {
-}
+    IPage<LogSummary> ShowInOutRecordsByOrder(Page<LogSummary> page, @Param("req") LogSummaryReq req);
\ No newline at end of file
+    IPage<LogSummary> ShowInOutRecordsByWarehouse(Page<LogSummary> page,@Param("req") LogSummaryReq req);
+    IPage<LogSummary> ShowInOutRecordsByCabinet(Page<LogSummary> page,@Param("req") LogSummaryReq req);
+//    IPage<LogSummary> ShowInOutRecordsPage(Page<LogSummary> page,@Param("req") LogSummaryReq req);
+//    IPage<LogSummary> ShowInOutRecordsByItems(Page<LogSummary> page,@Param("req") LogSummaryReq req);
+}
+
+
+
+

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

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.entity.RepairUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_repair_unit(维修单位表)】的数据库操作Mapper
+* @createDate 2023-10-16 09:35:11
+* @Entity com.junmp.jyzb.entity.RepairUnit
+*/
+public interface RepairUnitMapper extends BaseMapper<RepairUnit> {
+
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/CabinetLogReceiver.java

+package com.junmp.jyzb.rabbitmq;
+
+import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
+import com.junmp.jyzb.service.InventorySummaryService;
+import com.rabbitmq.client.Channel;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+
+/**
+ * 单警柜出入库记录上报并且记录到数据库中
+ */
+
+@Component
+public class CabinetLogReceiver {
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+
+    @RabbitListener(queues = "11111")//监听队列名
+    private void a(CabinetInOutRecordsReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
+
+        try {
+            System.out.println("req = " + req);
+            //将消息进行消费
+            Boolean result = inventorySummaryService.cabinetInOutRecords(req);
+            if (result){
+                // 手动确认消息
+                channel.basicAck(deliveryTag, false);
+            }else {
+                channel.basicNack(deliveryTag, false, true);
+            }
+        } catch (Exception e) {
+            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
+            try {
+                channel.basicNack(deliveryTag, false, true);
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/DirectReceiver.java

 package com.junmp.jyzb.rabbitmq;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.service.OrderLogService;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -16,18 +17,14 @@ import java.io.IOException;
  * 创建消息接收监听�
  * */
 @Component
-@RabbitListener(queues = "Test1Exchange") //监听的队列名 TestDirectQueue
+@RabbitListener(queues = "1369509498032809902") //监听的队列名 （模拟本地主机接收单据）
 public class DirectReceiver {
-    @Resource
-    private OrderLogService orderLogService;
+
     @RabbitHandler
-    private void modelConvert(String content, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
+    private void modelConvert(UpdateOrderReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
 
         try {
-//            ObjectMapper objectMapper=new ObjectMapper();
-//            OrderLog orderLog = objectMapper.readValue(content, OrderLog.class);
-//            // 进行消息处理和条件判断
-//            orderLogService.save(orderLog);
+            System.out.println("req = " + req);
             // 手动确认消息
             channel.basicAck(deliveryTag, false);
         } catch (Exception e) {

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OrderMQReceiver.java

@@ -21,19 +21,21 @@ public class OrderMQReceiver {
     @Resource
     private InventorySummaryService inventorySummaryService;
 
-    @RabbitListener(queues = "11111")//监听队列名
+    @RabbitListener(queues = "orderResult")//监听队列名
     private void a(RabbitMqOrderReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {
-            //将消息进行消费
             System.out.println("req = " + req);
-            Boolean result = inventorySummaryService.processInventoryRecords(req);
-            if (result){
-                // 手动确认消息
-                channel.basicAck(deliveryTag, false);
-            }else {
-                channel.basicNack(deliveryTag, false, true);
-            }
+            //将消息进行消费
+//            Boolean result = inventorySummaryService.processInventoryRecords(req);
+//            if (result){
+//                // 手动确认消息
+//                channel.basicAck(deliveryTag, false);
+//            }else {
+//                channel.basicNack(deliveryTag, false, true);
+//            }
+            // 手动确认消息
+            channel.basicAck(deliveryTag, false);
         } catch (Exception e) {
             // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
             try {

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

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.api.bean.req.DestoryUnitReq;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.v2.db.api.page.PageResult;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_destory_unit(报废收物单位表)】的数据库操作Service
+* @createDate 2023-10-16 09:35:03
+*/
+public interface DestoryUnitService extends IService<DestoryUnit> {
+
+    String addDestoryUnit(DestoryUnitReq req);
+
+    boolean updateDestoryUnit(DestoryUnitReq req);
+
+    List<DestoryUnit> showDestoryUnitList(DestoryUnitReq req);
+
+    PageResult<DestoryUnit> showDestoryUnitPage(DestoryUnitReq req);
+
+    boolean delDestoryUnit(DestoryUnitReq req);
+}

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

@@ -6,15 +6,14 @@ import com.junmp.jyzb.api.bean.query.*;
 
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
 import com.junmp.jyzb.api.bean.req.EquipmentBindReq;
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.Inventory;
 import com.junmp.jyzb.entity.InventorySummary;
-import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.jyzb.entity.LogDetail;
+import com.junmp.jyzb.entity.LogSummary;
 import com.junmp.v2.db.api.page.PageResult;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 public interface InventoryService extends IService<Inventory> {
     //根据装备id查询出装备的详细信息
@@ -33,11 +32,7 @@ public interface InventoryService extends IService<Inventory> {
 
     List<InventoryDto> GetInvInfoByEpc(InventoryReq req);
 
-    //根据组织机构/单警柜id/仓库id查询每件装备细信的详息（返回结果是List）
-    List<InventoryDto> EqsBySearchType(InventoryReq req);
 
-    //根据组织机构/单警柜id/仓库id查询每件装备细信的详息（返回结果是page）
-    PageResult<InventoryDto> EqsByTypePage(InventoryReq req);
 
     //查询箱门（cabinetBox下）所有装备简要信息列表（传递cabinetBoxId）
     List<EqsBriefDto> searchEqsByBoxId(CabinetBoxReq req);
@@ -71,8 +66,6 @@ public interface InventoryService extends IService<Inventory> {
     //通过组织机构id对该组织机构下的装备进行导出
     void ExportInventoryExcel(InventoryReq req);
 
-    //获取装备的出入库记录
-    List<InOutRecordsDto> getInOutRecords(InventoryReq req);
 
     //通过条件查询装备数量报表
     List<EqsSumDto> GetListEquipment(InventoryReq req);
@@ -85,4 +78,16 @@ public interface InventoryService extends IService<Inventory> {
 
     //批量信息修改
     boolean BatchEditingInvsInfo(BatchEditingInvsReq req);
+
+
+    //获取装备的出入库记录(根据装备id获取某件装备的出入库记录信息)
+    PageResult<LogDetail> getInOutRecords(InventoryReq req);
+
+    //根据单据获取出入库记录
+    PageResult<LogSummary> ShowInOutRecordsByOrder(LogSummaryReq req);
+    PageResult<LogSummary> ShowInOutRecordsByItems(LogSummaryReq req);
+
+    boolean test(RabbitMqOrderReq req);
+
+
 }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
+import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.v2.db.api.page.PageResult;
@@ -20,4 +21,15 @@ public interface InventorySummaryService extends IService<InventorySummary> {
 
     //处理本地主机返回单据结果
     Boolean processInventoryRecords(RabbitMqOrderReq req);
+    //对summary表中数据进行重新计算装备信息汇总
+    Boolean updateSummaryInsByOrder(Long orgId);
+
+    //处理单警柜返回单据结果
+    Boolean cabinetInOutRecords(CabinetInOutRecordsReq req);
+
+    //根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额
+    List<InventorySummary> getTotalNumberAndPrice(InventorySumReq req);
+
+    //计算装备总数（装备数量数据统计）
+    List<InventorySummary> EquipmentStatistics(InventorySumReq req);
 }

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

 package com.junmp.jyzb.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.entity.LogDetail;
-public interface LogDetailService extends IService<LogDetail> {
+import com.baomidou.mybatisplus.extension.service.IService;
 
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_detail】的数据库操作Service
+* @createDate 2023-10-13 08:29:42
+*/
+public interface LogDetailService extends IService<LogDetail> {
 
 }

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

 package com.junmp.jyzb.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
 import com.junmp.jyzb.entity.LogSummary;
+import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_summary】的数据库操作Service
+* @createDate 2023-10-13 08:29:36
+*/
 public interface LogSummaryService extends IService<LogSummary> {
 
-
-    //上传出入日志
-    List<LogSummaryDto> getLogs();
 }

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

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.api.bean.req.RepairUnitReq;
+import com.junmp.jyzb.entity.RepairUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.v2.db.api.page.PageResult;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_repair_unit(维修单位表)】的数据库操作Service
+* @createDate 2023-10-16 09:35:11
+*/
+public interface RepairUnitService extends IService<RepairUnit> {
+
+    String addRepairUnit(RepairUnitReq req);
+
+    boolean updateRepairUnit(RepairUnitReq req);
+
+    List<RepairUnit> showRepairUnitList(RepairUnitReq req);
+
+    PageResult<RepairUnit> showRepairUnitPage(RepairUnitReq req);
+
+    boolean delRepairUnit(RepairUnitReq req);
+}

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

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
+
+public interface TestService {
+
+
+    Boolean uploadResult(RabbitMqOrderReq req);
+}

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

@@ -40,7 +40,7 @@ public interface WarehouseService extends IService<Warehouse> {
 
     boolean changeWarehouseState(WarehouseReq req);
 
-    List<WarehouseDto> getAllWarehouse(WarehouseReq orgId);
+    List<WarehouseDto> getAllWarehouse(Long orgId);
 
 
     //通过仓库id 判断仓库是否存在

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

@@ -22,11 +22,14 @@ 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 com.junmp.v2.sys.user.entity.SysUserOrg;
+import com.junmp.v2.sys.user.service.SysUserOrgService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +45,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     @Resource
     private IFlowInstanceService FlowInstanceService;
 
+    @Resource
+    private SysUserOrgService sysUserOrgService;
+
     /**
      * 创建业务单
      * @param req
@@ -51,12 +57,30 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     public String AddBussinessOrder(UpdateBusFormReq req) {
         BusForm busForm = new BusForm();
         BeanUtil.copyProperties(req,busForm);
-        OrderNum orderNum = stocktakeService.setOrderCode(req.getBussinessType(), req.getOrgId());
-        String codeValue=String.format("%04d",orderNum.getNum());
-        busForm.setBussinessCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
-                LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
-        busForm.setCreateTime(DateTimeUtil.getCurrentDateTime());
-        save(busForm);
+
+        if (ObjectUtil.isNull(req.getId())){
+            String id= UUID.randomUUID().toString();
+            busForm.setId(id);
+            //设置单据号（调拨的单号根据和登录人员的组织机构id有关）
+            //根据userId去查询组织机构id
+            OrderNum orderNum=new OrderNum();
+            if (req.getBussinessType().equals("allocate")){
+                if (req.getStartOrgId() == req.getOrgId()){
+                    orderNum = stocktakeService.setOrderCode(req.getBussinessType(), req.getStartOrgId());
+                } else {
+                    orderNum = stocktakeService.setOrderCode(req.getBussinessType(), req.getEndOrgId());
+                }
+            }else {
+                orderNum = stocktakeService.setOrderCode(req.getBussinessType(), req.getOrgId());
+            }
+            String codeValue=String.format("%04d",orderNum.getNum());
+            busForm.setBussinessCode(orderNum.getBussinessType()+orderNum.getYear()+
+                    String.format("%02d",LocalDateTime.now().getMonth().getValue())+
+                    String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
+
+            busForm.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        }
+
         //执行工作流
         if (req.getExamineState().equals("working"))
         {
@@ -64,9 +88,18 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
             startProcessInstanceDTO.setOrderId(busForm.getId());
             startProcessInstanceDTO.setOrderType("workOrder");
-            startProcessInstanceDTO.setUserId(req.getUserId());
+            startProcessInstanceDTO.setUserId(req.getApplyUserId());
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             busForm.setProcessId(ProcessInstanceId);
+
+        }
+
+        if(ObjectUtil.isNotNull(req.getId())){
+            //已经是一个草稿，在点击提交的时候只需要更新即可，因为数据库中已经存在该单据
+            updateById(busForm);
+        }else {
+            //保存
+            this.save(busForm);
         }
         return busForm.getId();
     }
@@ -106,8 +139,8 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 //单据类型
                 .eq(ObjectUtil.isNotNull(req.getBussinessType()), BusForm::getBussinessType, req.getBussinessType())
                 //审核状态
-                .eq(ObjectUtil.isNotNull(req.getExamineState()), BusForm::getExamineState, req.getExamineState())
-                //
+                .eq(ObjectUtil.isNotNull(req.getExamineState()) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState, req.getExamineState())
+                //仓库id
                 .eq(ObjectUtil.isNotNull(req.getWarehouseId()), BusForm::getWarehouseId, req.getWarehouseId())
                 .eq(ObjectUtil.isNotNull(req.getOrgId()),BusForm::getOrgId,req.getOrgId())
                 .ge(ObjectUtil.isNotNull(req.getStartTime()), BusForm::getCreateTime, req.getStartTime())

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

+package com.junmp.jyzb.service.impl;
+
+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.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.api.exception.enums.DestoryUnitExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.ManufacturerExceptionEnum;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.junmp.jyzb.service.DestoryUnitService;
+import com.junmp.jyzb.mapper.DestoryUnitMapper;
+import com.junmp.jyzb.utils.DateTimeUtil;
+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 org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_destory_unit(报废收物单位表)】的数据库操作Service实现
+* @createDate 2023-10-16 09:35:03
+*/
+@Service
+public class DestoryUnitServiceImpl extends ServiceImpl<DestoryUnitMapper, DestoryUnit>
+    implements DestoryUnitService{
+
+
+    @Override
+    public String addDestoryUnit(DestoryUnitReq req) {
+        //判断是否已经存在短码，如果存在则不再允许添加成功
+        DestoryUnit one = getOne(new LambdaQueryWrapper<DestoryUnit>().eq(DestoryUnit::getCode, req.getName()));
+        if (ObjectUtil.isNotNull(one)){
+            throw new ServiceException(DestoryUnitExceptionEnum.DESTORYUNIT_IS_EXIST);
+        }
+        DestoryUnit destoryUnit = new DestoryUnit();
+        BeanPlusUtil.copyProperties(req,destoryUnit);
+        destoryUnit.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        save(destoryUnit);
+        return destoryUnit.getId();
+    }
+
+    @Override
+    public boolean updateDestoryUnit(DestoryUnitReq req) {
+        DestoryUnit destoryUnit = new DestoryUnit();
+        BeanPlusUtil.copyProperties(req,destoryUnit);
+        destoryUnit.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return updateById(destoryUnit);
+    }
+
+    @Override
+    public List<DestoryUnit> showDestoryUnitList(DestoryUnitReq req) {
+        LambdaQueryWrapper<DestoryUnit> wrapper = createWrapper(req);
+        return  list(wrapper);
+    }
+
+    @Override
+    public PageResult<DestoryUnit> showDestoryUnitPage(DestoryUnitReq req) {
+        LambdaQueryWrapper<DestoryUnit> wrapper = createWrapper(req);
+        Page<DestoryUnit> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delDestoryUnit(DestoryUnitReq req) {
+        //抛出异常，销毁、报废单位未选中
+        if (req.getDeleteList().size()==0){
+            throw new ServiceException(DestoryUnitExceptionEnum.DESTORYUNIT_NOT_CHOOSE);
+        }
+        //查询出全部的销毁、报废单位
+        Set<String> collect = list().stream().map(DestoryUnit::getId).collect(Collectors.toSet());
+        Set<String> delList=new HashSet<>(req.getDeleteList());
+        if (collect.containsAll(delList)){
+            return removeBatchByIds(req.getDeleteList());
+        }else {
+            throw new ServiceException(DestoryUnitExceptionEnum.DESTORYUNIT_NOT_EXIST);
+        }
+    }
+
+    private LambdaQueryWrapper<DestoryUnit> createWrapper(DestoryUnitReq req){
+        LambdaQueryWrapper<DestoryUnit> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)){
+            return wrapper;
+        }
+        wrapper.eq(ObjectUtil.isNotNull(req.getId()),DestoryUnit::getId,req.getId());
+        wrapper.eq(ObjectUtil.isNotNull(req.getState()),DestoryUnit::getState,req.getState());
+        wrapper.like(ObjectUtil.isNotNull(req.getName()),DestoryUnit::getName,req.getName());
+        wrapper.like(ObjectUtil.isNotNull(req.getShortName()),DestoryUnit::getShortName,req.getShortName());
+        wrapper.like(ObjectUtil.isNotNull(req.getContacts()),DestoryUnit::getContacts,req.getContacts());
+        wrapper.orderByDesc(DestoryUnit::getCreateTime);
+        return wrapper;
+    }
+}
+
+
+
+

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

@@ -3,14 +3,20 @@ package com.junmp.jyzb.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.entity.LogDetail;
 import com.junmp.jyzb.service.LogDetailService;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.LogDetailMapper;
+import org.springframework.stereotype.Service;
 
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_detail】的数据库操作Service实现
+* @createDate 2023-10-13 08:29:42
+*/
 @Service
-public class LogDetailServiceImpl extends ServiceImpl<LogDetailMapper, LogDetail> implements LogDetailService {
-
-    @Resource
-    private LogDetailMapper logDetailMapper;
+public class LogDetailServiceImpl extends ServiceImpl<LogDetailMapper, LogDetail>
+    implements LogDetailService{
 
 }
+
+
+
+

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

 package com.junmp.jyzb.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.api.bean.dto.LogDetailDto;
-import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
-import com.junmp.jyzb.entity.LogDetail;
 import com.junmp.jyzb.entity.LogSummary;
-import com.junmp.jyzb.mapper.LogSummaryMapper;
-import com.junmp.jyzb.service.LogDetailService;
 import com.junmp.jyzb.service.LogSummaryService;
-import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.jyzb.mapper.LogSummaryMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-
-import java.util.ArrayList;
-import java.util.List;
 
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_log_summary】的数据库操作Service实现
+* @createDate 2023-10-13 08:29:36
+*/
 @Service
-public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSummary> implements LogSummaryService {
-    @Resource
-    private LogDetailService logDetailService;
-    @Override
-    public List<LogSummaryDto> getLogs() {
-        List<LogSummary> list = list(new LambdaQueryWrapper<LogSummary>().orderByDesc(LogSummary::getCreateTime));
-        List<LogSummaryDto> logSummaryDtoList=new ArrayList<>();
-        List<LogDetailDto> logDetailDtoList=new ArrayList<>();
-        for (LogSummary logSummary:list) {
-            LogSummaryDto logSummaryDto = new LogSummaryDto();
-            BeanPlusUtil.copyProperties(logSummary,logSummaryDto);
-            List<LogDetail> list1 = logDetailService.list(new LambdaQueryWrapper<LogDetail>()
-                    .eq(LogDetail::getSummaryId, logSummary.getId()));
-            for (LogDetail logDetail:list1) {
-                LogDetailDto logDetailDto = new LogDetailDto();
-                BeanPlusUtil.copyProperties(logDetail,logDetailDto);
-                logDetailDtoList.add(logDetailDto);
-            }
-            logSummaryDto.setEquipmentList(logDetailDtoList);
-            logSummaryDtoList.add(logSummaryDto);
-        }
-        return logSummaryDtoList;
-    }
+public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSummary>
+    implements LogSummaryService{
+
 }
+
+
+
+

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

 package com.junmp.jyzb.service.impl;
 
-import com.junmp.jyzb.api.bean.query.InventorySumReq;
-import com.junmp.jyzb.service.LogSummaryService;
 import com.junmp.jyzb.service.MQProductService;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

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

@@ -35,7 +35,8 @@ public class ManufacturerServiceImpl extends ServiceImpl<ManufacturerMapper, Man
 
     @Override
     public String addManufacturer(ManufacturerReq req) {
-        Manufacturer one = getOne(new LambdaQueryWrapper<Manufacturer>().eq(Manufacturer::getName, req.getName()));
+        //判断是否已经存在生产厂商短码，如果存在则不再允许添加成功
+        Manufacturer one = getOne(new LambdaQueryWrapper<Manufacturer>().eq(Manufacturer::getCode, req.getName()));
         if (ObjectUtil.isNotNull(one)){
             throw new ServiceException(ManufacturerExceptionEnum.MANUTACTURER_IS_EXIST);
         }

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

+package com.junmp.jyzb.service.impl;
+
+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.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.RepairUnitReq;
+import com.junmp.jyzb.api.exception.enums.DestoryUnitExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.RepairUnitExceptionEnum;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.RepairUnit;
+import com.junmp.jyzb.service.RepairUnitService;
+import com.junmp.jyzb.mapper.RepairUnitMapper;
+import com.junmp.jyzb.utils.DateTimeUtil;
+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 org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_repair_unit(维修单位表)】的数据库操作Service实现
+* @createDate 2023-10-16 09:35:11
+*/
+@Service
+public class RepairUnitServiceImpl extends ServiceImpl<RepairUnitMapper, RepairUnit>
+    implements RepairUnitService{
+
+    @Override
+    public String addRepairUnit(RepairUnitReq req) {
+        //判断是否已经存在短码，如果存在则不再允许添加成功
+        RepairUnit one = getOne(new LambdaQueryWrapper<RepairUnit>().eq(RepairUnit::getCode, req.getName()));
+        if (ObjectUtil.isNotNull(one)){
+            throw new ServiceException(RepairUnitExceptionEnum.REPAIRUNIT_IS_EXIST);
+        }
+        RepairUnit repairUnit = new RepairUnit();
+        BeanPlusUtil.copyProperties(req,repairUnit);
+        repairUnit.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        save(repairUnit);
+        return repairUnit.getId();
+    }
+
+    @Override
+    public boolean updateRepairUnit(RepairUnitReq req) {
+        RepairUnit repairUnit = new RepairUnit();
+        BeanPlusUtil.copyProperties(req,repairUnit);
+        repairUnit.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return updateById(repairUnit);
+    }
+
+    @Override
+    public List<RepairUnit> showRepairUnitList(RepairUnitReq req) {
+        LambdaQueryWrapper<RepairUnit> wrapper = createWrapper(req);
+        return  list(wrapper);
+    }
+
+    @Override
+    public PageResult<RepairUnit> showRepairUnitPage(RepairUnitReq req) {
+        LambdaQueryWrapper<RepairUnit> wrapper = createWrapper(req);
+        Page<RepairUnit> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delRepairUnit(RepairUnitReq req) {
+        //抛出异常，销毁、报废单位未选中
+        if (req.getDeleteList().size()==0){
+            throw new ServiceException(RepairUnitExceptionEnum.REPAIRUNIT_NOT_CHOOSE);
+        }
+        //查询出全部的销毁、报废单位
+        Set<String> collect = list().stream().map(RepairUnit::getId).collect(Collectors.toSet());
+        Set<String> delList=new HashSet<>(req.getDeleteList());
+        if (collect.containsAll(delList)){
+            return removeBatchByIds(req.getDeleteList());
+        }else {
+            throw new ServiceException(RepairUnitExceptionEnum.REPAIRUNIT_NOT_EXIST);
+        }
+    }
+
+    private LambdaQueryWrapper<RepairUnit> createWrapper(RepairUnitReq req){
+        LambdaQueryWrapper<RepairUnit> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)){
+            return wrapper;
+        }
+        wrapper.eq(ObjectUtil.isNotNull(req.getId()),RepairUnit::getId,req.getId());
+        wrapper.eq(ObjectUtil.isNotNull(req.getState()),RepairUnit::getState,req.getState());
+        wrapper.like(ObjectUtil.isNotNull(req.getName()),RepairUnit::getName,req.getName());
+        wrapper.like(ObjectUtil.isNotNull(req.getShortName()),RepairUnit::getShortName,req.getShortName());
+        wrapper.like(ObjectUtil.isNotNull(req.getContacts()),RepairUnit::getContacts,req.getContacts());
+        wrapper.orderByDesc(RepairUnit::getCreateTime);
+        return wrapper;
+    }
+}
+
+
+
+

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

@@ -55,13 +55,16 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
         Stocktake stocktake = new Stocktake();
         BeanPlusUtil.copyProperties(req,stocktake);
         //设置单号
-        OrderNum orderNum = setOrderCode(req.getBussinessType(),req.getOrgId());
-        String codeValue=String.format("%04d",orderNum.getNum());
-        stocktake.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
-                LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
+        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());
-        this.save(stocktake);
+
         //执行工作流
         if (req.getExamineState().equals("working"))
         {
@@ -73,6 +76,7 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             stocktake.setProcessId(ProcessInstanceId);
         }
+        this.save(stocktake);
         return stocktake.getId();
     }
 

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

+package com.junmp.jyzb.service.impl;
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
+import com.junmp.jyzb.service.TestService;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Exchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class TestServiceImpl implements TestService {
+
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+    @Resource
+    private RabbitAdmin rabbitAdmin;
+    @Override
+    public Boolean uploadResult(RabbitMqOrderReq req) {
+        String exchangeName="OrderResultExchange";
+        Queue queue=new Queue( "orderResult",true,false,false);
+        Exchange exchange = new DirectExchange(exchangeName, true, false);
+        rabbitAdmin.declareQueue(queue);
+        rabbitAdmin.declareExchange(exchange);
+        rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with("123456").noargs());
+        rabbitTemplate.convertAndSend(exchangeName,"123456", req);
+        return true;
+    }
+}

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

@@ -88,15 +88,15 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
 
 
     @Override
-    public List<WarehouseDto> getAllWarehouse(WarehouseReq msg) {
+    public List<WarehouseDto> getAllWarehouse(Long orgId) {
         List<WarehouseDto> warehouseDtoList=new ArrayList<>();
         //判断组织机构是否存在
-        PubOrg pubOrg = pubOrgService.PubOrgExist(msg.getOrgId());
+        PubOrg pubOrg = pubOrgService.PubOrgExist(orgId);
         //根据组织机构id查询组织机构名称
         String orgName = pubOrg.getOrgName();
 
         List<Warehouse> list = list(new LambdaQueryWrapper<Warehouse>()
-                .eq(Warehouse::getOrgId, msg.getOrgId()));
+                .eq(Warehouse::getOrgId, orgId));
         for (Warehouse warehouse:list) {
             WarehouseDto warehouseDto = new WarehouseDto();
             BeanPlusUtil.copyProperties(warehouse,warehouseDto);

jyzb-biz/src/main/resources/mapper/DestoryUnitMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.DestoryUnitMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.DestoryUnit">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="code" column="code" jdbcType="VARCHAR"/>
+            <result property="shortName" column="short_name" jdbcType="VARCHAR"/>
+            <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
+            <result property="phone" column="phone" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,name,code,
+        short_name,contacts,phone,
+        state,create_time,create_user,
+        update_time,update_user
+    </sql>
+</mapper>

jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.LogDetailMapper">
-  <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogDetail">
-    <!--@mbg.generated-->
-    <!--@Table base_log_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="summary_id" jdbcType="INTEGER" property="summaryId" />
-    <result column="order_id" jdbcType="VARCHAR" property="orderId" />
-    <result column="epc" jdbcType="VARCHAR" property="epc" />
-    <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName" />
-    <result column="equipment_size" jdbcType="VARCHAR" property="equipmentSize" />
-    <result column="equipment_supplier" jdbcType="VARCHAR" property="equipmentSupplier" />
-    <result column="equipment_type" jdbcType="INTEGER" property="equipmentType" />
-    <result column="error_state" jdbcType="INTEGER" property="errorState" />
-    <result column="note" jdbcType="VARCHAR" property="note" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, summary_id, order_id, epc, equipment_name, equipment_size, equipment_supplier, 
-    equipment_type, error_state, note
-  </sql>
-</mapper>
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogDetail">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="VARCHAR"/>
+            <result property="orderMainId" column="order_main_id" jdbcType="VARCHAR"/>
+            <result property="bussinessType" column="bussiness_type" jdbcType="VARCHAR"/>
+            <result property="epc" column="epc" jdbcType="VARCHAR"/>
+            <result property="typeId" column="type_id" jdbcType="VARCHAR"/>
+            <result property="typeName" column="type_name" jdbcType="VARCHAR"/>
+            <result property="sizeId" column="size_id" jdbcType="VARCHAR"/>
+            <result property="sizeName" column="size_name" jdbcType="VARCHAR"/>
+            <result property="supplierId" column="supplier_id" jdbcType="VARCHAR"/>
+            <result property="supplierName" column="supplier_name" jdbcType="VARCHAR"/>
+            <result property="equipmentType" column="equipment_type" jdbcType="INTEGER"/>
+            <result property="errorState" column="error_state" jdbcType="INTEGER"/>
+            <result property="outInState" column="out_in_state" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
\ No newline at end of file
+            <result property="picture" column="picture" jdbcType="VARCHAR"/>
+            <result property="deviceType" column="device_type" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,inventory_id,order_main_id,
+        bussiness_type,epc,type_id,
+        type_name,size_id,size_name,
+        supplier_id,supplier_name,equipment_type,
+        error_state,out_in_state,create_time,
+        update_time,update_user,create_user,
+        picture,device_type
+    </sql>
+</mapper>

jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.LogSummaryMapper">
-  <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogSummary">
-    <!--@mbg.generated-->
-    <!--@Table base_log_summary-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="org_id" jdbcType="VARCHAR" property="orgId" />
-    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
-    <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
-    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
-    <result column="device" jdbcType="VARCHAR" property="device" />
-    <result column="device_type" jdbcType="INTEGER" property="deviceType" />
-    <result column="use_time" jdbcType="TIMESTAMP" property="useTime" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="out_in_state" jdbcType="INTEGER" property="outInState" />
-    <result column="picture" jdbcType="VARCHAR" property="picture" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, org_id, org_name, warehouse_id, warehouse_name, device, device_type, use_time, 
-    user_name, out_in_state, picture
-  </sql>
-</mapper>
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogSummary">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
+            <result property="orderMainId" column="order_main_id" jdbcType="VARCHAR"/>
+            <result property="device" column="device" jdbcType="VARCHAR"/>
+            <result property="deviceType" column="device_type" jdbcType="INTEGER"/>
+            <result property="locationId" column="location_id" jdbcType="VARCHAR"/>
+            <result property="locationName" column="location_name" jdbcType="VARCHAR"/>
+            <result property="locationType" column="location_type" jdbcType="INTEGER"/>
+            <result property="useTime" column="use_time" jdbcType="TIMESTAMP"/>
+            <result property="bussinessType" column="bussiness_type" jdbcType="VARCHAR"/>
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="picture" column="picture" jdbcType="VARCHAR"/>
+            <result property="equipmentList" column="equipment_List" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+    </resultMap>
\ No newline at end of file
+
+    <sql id="Base_Column_List">
+        id,org_id,org_name,
+        order_main_id,device,device_type,
+        location_id,location_name,location_type,
+        use_time,bussiness_type,user_name,
+        picture,equipment_List,create_time,
+        update_time,update_user,create_user
+    </sql>
+    <select id="ShowInOutRecordsByOrder" resultType="com.junmp.jyzb.entity.LogSummary">
+        select * from base_log_summary ls
+        where ls.org_id = #{req.orgId} and ls.order_main_id=#{req.orderMainId}
+    </select>
+
+    <select id="ShowInOutRecordsByWarehouse" resultType="com.junmp.jyzb.entity.LogSummary">
+        select * from base_log_summary ls
+        left join base_log_detail ld on ls.id = ld.summary_id
+        where ls.org_id = #{req.orgId} and ls.location_type=0
+        <if test="req.bussinessType != null and req.bussinessType !=''">
+            and ls.bussiness_type=#{req.bussinessType}
+        </if>
+        <if test="req.locationId != null and req.locationId !=''">
+            and ls.location_id=#{locationId}
+        </if>
+        <if test="req.typeId != null and req.typeId !=''">
+            and ld.type_id=#{req.typeId}
+        </if>
+    </select>
+
+    <select id="ShowInOutRecordsByCabinet" resultType="com.junmp.jyzb.entity.LogSummary">
+        select * from base_log_summary ls
+        left join base_log_detail ld on ls.id = ld.summary_id
+        where ls.org_id = #{req.orgId} and ls.location_type=1
+        <if test="req.locationId != null and req.locationId !=''">
+            and ls.location_id=#{req.locationId}
+          <if test="req.cabinetboxId != null and req.cabinetboxId !=''">
+             and ld.cabinetbox_id in (select id from base_cabinet_box cb where cb.cabinet_id=#{req.locationId})
+          </if>
+        </if>
+
+    </select>
+
+</mapper>

jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml

@@ -67,7 +67,7 @@
         select * FROM bussiness_order_main WHERE  order_type=#{req.orderType}
         <if test="req.typeId != null and req.typeId != ''">
             and id in(
-            SELECT order_id FROM bussiness_order_detail WHERE equipment_type = #{req.typeId})
+            SELECT order_id FROM bussiness_order_detail WHERE type_id = #{req.typeId})
         </if>
         <if test="null !=  req.bussinessType  and '' != req.bussinessType  ">
         and bussiness_type = #{req.bussinessType}

jyzb-biz/src/main/resources/mapper/RepairUnitMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.RepairUnitMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.RepairUnit">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="code" column="code" jdbcType="VARCHAR"/>
+            <result property="shortName" column="short_name" jdbcType="VARCHAR"/>
+            <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
+            <result property="phone" column="phone" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,name,code,
+        short_name,contacts,phone,
+        state,create_time,create_user,
+        update_time,update_user
+    </sql>
+</mapper>

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

@@ -3,6 +3,7 @@ package com.junmp.junmpProcess.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.PageUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -25,6 +26,7 @@ import com.junmp.junmpProcess.vo.*;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.sys.user.entity.SysUser;
@@ -260,8 +262,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setTaskId(task.getId());
             taskVO.setProcessInstanceId(task.getProcessInstanceId());
             taskVO.setProcessDefinitionName(bpmnModel.getMainProcess().getName());
-            taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
-            }).getUserInfo());
+//            taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
+//            }).getUserInfo());
+            String s = (String) processVariables.get(START_USER_INFO);
+            taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
 
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
@@ -323,8 +327,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             {
                 taskVO.setProcessDefinitionName(bpmnModel.getMainProcess().getName());
             }
-            taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
-            }).getUserInfo());
+//            taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
+//            }).getUserInfo());
+            String s = (String) processVariables.get(START_USER_INFO);
+            taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
 
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
@@ -387,9 +393,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
-            historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
-            }).getUserInfo());
-//            historyProcessInstanceVO.setStartUser(StartUser)
+//            historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
+//            }).getUserInfo());
+            String s = (String) processVariables.get(START_USER_INFO);
+            historyProcessInstanceVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
+
             historyProcessInstanceVO.setStartTime(historicProcessInstance.getStartTime());
             historyProcessInstanceVO.setEndTime(historicProcessInstance.getEndTime());
             Boolean flag = historicProcessInstance.getEndTime() == null ? false : true;
@@ -549,14 +557,17 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }
         // 根据 processInstanceId 查询正在执行的任务
-        Task currentTask = taskService.createTaskQuery()
+        List<Task> list1 = taskService.createTaskQuery()
                 .processInstanceId(processInstanceId)
-                .list().get(0);
-        // 使用 Stream API 进行过滤和修改
-        taskDetailVOS.stream()
-                .filter(taskDetail -> taskDetail.getActivityId().equals(currentTask.getTaskDefinitionKey()))
-                .findFirst()
-                .ifPresent(matchingTask -> matchingTask.setTaskStatusWrapper("待审核"));
+                .list();
+        if (list1.size()>0) {
+            Task currentTask =list1.get(0);
+            // 使用 Stream API 进行过滤和修改
+            taskDetailVOS.stream()
+                    .filter(taskDetail -> taskDetail.getActivityId().equals(currentTask.getTaskDefinitionKey()))
+                    .findFirst()
+                    .ifPresent(matchingTask -> matchingTask.setTaskStatusWrapper("待审核"));
+        }
 
         JSONObject jsonForm = JSON.parseObject(formJson.toString());