Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

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

@@ -138,7 +138,7 @@ public class BusFormDto  {
     /**
      * 厂商类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
      */
-    private Integer agencyType;
+    private String agencyType;
 
     /**
      * 装备类别拼接
@@ -168,7 +168,7 @@ public class BusFormDto  {
     /**
      * 报废类型（1销毁出库，2移入报废区）
      */
-    private Integer type;
+    private String type;
 
     /**
      * 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
@@ -194,5 +194,12 @@ public class BusFormDto  {
      * 维保期
      */
     private Integer maintenancePeriod;
-
+    /**
+     * 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderCurrentState;
+    /**
+     * 单据上次状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderLastState;
 }

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

@@ -41,7 +41,7 @@ public class OrderDetailDto implements Serializable {
     private Integer modifyQuantity;
 
     private BigDecimal price;
-
+    private BigDecimal totalPrice;
     /**
      * 在库数
      */
@@ -61,4 +61,6 @@ public class OrderDetailDto implements Serializable {
      * 维保期
      */
     private Integer maintenancePeriod;
+
+    private String remark;
 }

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

 package com.junmp.jyzb.api.bean.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,11 @@ public class OrderDto implements Serializable {
      */
     private String  bussinessType;
     /**
+     * 业务单据编号
+     */
+
+    private String bussinessCode;
+    /**
      * 订单号
      */
     private String  orderCode;
@@ -37,6 +43,7 @@ public class OrderDto implements Serializable {
     /**
      * 供应商名称
      */
+    private String supplierId;
     private String supplierName;
     /**
      * 收物单位
@@ -75,10 +82,7 @@ public class OrderDto implements Serializable {
      */
     private String  invList;
 
-    /**
-     * 生产厂商
-     */
-    private String manufacturerName;
+
     /**
      * 明细列表
      */
@@ -89,8 +93,6 @@ public class OrderDto implements Serializable {
     private String createUser;
     private String allocateType;
 
-    private String repairName;
-    private String destoryName;
 
     /**
      * 附件地址
@@ -103,4 +105,24 @@ public class OrderDto implements Serializable {
 
     private String returnUser;
 
+    /**
+     * 移入仓库id
+     */
+    private String locationId;
+    /**
+     * 移入仓库名称
+     */
+    private String locationName;
+
+    /**
+     * 移入仓库id
+     */
+    private String removeLocationId;
+    /**
+     * 移入仓库名称
+     */
+    private String removeLocationName;
+
+    private String note;
+
 }

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

 package com.junmp.jyzb.api.bean.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -36,7 +37,7 @@ public class OrderMainDto implements Serializable {
 
     //收物单位
     private String endOrgName;
-
+    private String supplierId;
     //供应商名称
     private String supplierName;
 
@@ -72,10 +73,7 @@ public class OrderMainDto implements Serializable {
      */
     private Integer manualState;
 
-    /**
-     * 生产厂商id
-     */
-    private String manufacturerId;
+
 
     /**
      * 调拨类型（2支拨，1价拨），调拨出入库才有
@@ -97,5 +95,23 @@ public class OrderMainDto implements Serializable {
      */
     private String createUser;
 
+    /**
+     * 移入仓库id
+     */
+    private String locationId;
+    /**
+     * 移入仓库名称
+     */
+    private String locationName;
+
+    /**
+     * 移入仓库id
+     */
+    private String removeLocationId;
+    /**
+     * 移入仓库名称
+     */
+    private String removeLocationName;
+
 }
 

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

+package com.junmp.jyzb.api.bean.dto;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class QuickSuggestionsDto {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 审批意见
+     */
+    private String text;
+
+    /**
+     * 应用场景（1为审批时使用）
+     */
+    private Integer useType;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

@@ -22,7 +22,7 @@ public class ReassignmentDto  {
     /**
      * 经办人
      */
-    private String userName;
+    private String agent;
 
     /**
      * 工作流id
@@ -46,7 +46,9 @@ public class ReassignmentDto  {
     /**
      * 警员带走装备
      */
-    private String eqsList;
+    private String detailList;
+
+    private String invList;
 
     /**
      * 组织机构id（谁申请，就是谁的组织机构号）
@@ -105,7 +107,7 @@ public class ReassignmentDto  {
     /**
      * 类型（调入警员0，调出警员1）
      */
-    private Integer reassigmentType;
+    private String reassignmentType;
 
 
 }
\ No newline at end of file

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

@@ -41,4 +41,7 @@ public class BussinessOrderDetialReq {
     private Integer maintenancePeriod;
     //在库数
     private Integer stockNumber;
+
+    //报废区数
+    private Integer brokenNumber;
 }

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

@@ -5,12 +5,21 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.List;
 
+/**
+ * 主单据实体类
+ */
 @Data
 public class OrderReq {
     private String id;
     private BigDecimal price;
     private Integer actualQuantity;
-    private Integer orderState;
+    private String orderState;
+    //组织机构id
+    private Long orgId;
+    //组织机构名称
+    private String orgName;
+    //业务类型
+    private String bussinessType;
     private List<DetailOrderReq> orderDetail;
     private List<PurchaseEqsReq> purchaseList;
 }

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

@@ -4,26 +4,19 @@ import lombok.Data;
 
 import java.util.List;
 
+/**
+ * 总的出入记录上报实体类对象
+ */
 @Data
 public class OutInLogsReq {
-    //组织机构id
-    private Long orgId;
-    //组织机构名称
-    private String orgName;
-    //设备标识
-    private String device;
-    //出入设备
-    private Integer deviceType;
-    //业务类型
-    private String bussinessType;
-    //出入状态
-    private String outInState;
-    //所属位置（0仓库1单警柜）
-    private Integer locationType;
-
-    private OrderReq orderMain;
-
-    private List<SummaryLogReq> logSummaryList;
+    /**
+     * 主单据对象
+     */
+    private OrderReq order;
+    /**
+     * 出入库记录对象
+     */
+    private List<SummaryLogReq> logList;
 
 
 }

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

@@ -15,9 +15,13 @@ public class PurchaseEqsReq {
     private Date productionDate;
     private Integer warranyPeriod;
     private Integer maintenancePeriod;
+    //仓库id和仓库name
+    private String locationId;
+    private String locationName;
     private String supplierId;
     private String supplierName;
     //装备类型0单件，1装备包
     private Integer equipmentType;
     private BigDecimal price;
+
 }

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

@@ -11,10 +11,25 @@ public class SummaryLogReq {
     private String orderCode;
     private String locationId;
     private String locationName;
+    //组织机构id
+    private Long orgId;
+    //组织机构名称
+    private String orgName;
     private String userName;
     private Date useTime;
     private String picture;
     private String equipmentList;
     private Integer number;
+    //业务类型
+    private String bussinessType;
+    //设备标识
+    private String device;
+    //出入设备
+    private Integer deviceType;
+
+    //出入状态
+    private String outInState;
+    //所属位置（0仓库1单警柜）
+    private Integer locationType;
     private List<DetailLogReq> logDetailList;
 }

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

@@ -36,7 +36,7 @@ public class OrderDetailReq extends BaseRequest {
 
     private Integer actualNum;
 
-
+    private BigDecimal totalPrice;
     private BigDecimal price;
 
     private String orderType;
@@ -72,5 +72,5 @@ public class OrderDetailReq extends BaseRequest {
      * 维保期
      */
     private Integer maintenancePeriod;
-
+    private String remark;
 }

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

 package com.junmp.jyzb.api.bean.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,6 +36,7 @@ public class OrderMainReq extends BaseRequest {
     private Long endOrgId;
 
     private String endOrgName;
+    private String supplierId;
     /**
      * 供应商名称
      */
@@ -65,6 +67,7 @@ public class OrderMainReq extends BaseRequest {
     private String attachmentLocation;
 
     private String invList;
+    private String typeName;
 
     /**
      * 创建时间
@@ -91,10 +94,7 @@ public class OrderMainReq extends BaseRequest {
     //排序规则
     private String order;
 
-    /**
-     * 生产厂商id
-     */
-    private String manufacturerName;
+
 
     /**
      * 调拨类型（2支拨，1价拨），调拨出入库才有
@@ -106,6 +106,24 @@ public class OrderMainReq extends BaseRequest {
      */
     private String returnUserId;
 
+    /**
+     * 移入仓库id
+     */
+    private String locationId;
+    /**
+     * 移入仓库名称
+     */
+    private String locationName;
+
+    /**
+     * 移入仓库id
+     */
+    private String removeLocationId;
+    /**
+     * 移入仓库名称
+     */
+    private String removeLocationName;
+
     private List<OrderDetailReq> detailList;
 
 }

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

@@ -13,10 +13,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class PolicemanReq extends BaseRequest {
 
-    @NotBlank(message = "警员主键不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    @NotBlank(message = "警员主键不能为空", groups = {add.class, detail.class})
     private String id;
 
-    @NotBlank(message = "姓名不能为空", groups = {add.class})
+    @NotBlank(message = "姓名不能为空")
     private String name;
 
     private String cabinetId;
@@ -30,7 +30,7 @@ public class PolicemanReq extends BaseRequest {
 
     private String policeCode;
 
-    @NotBlank(message = "性别不能为空", groups = {add.class})
+    @NotBlank(message = "性别不能为空")
     private String sex;
 
     private String faceInfo;
@@ -43,16 +43,16 @@ public class PolicemanReq extends BaseRequest {
     private String doorCode;
 
     //账号
-    @NotBlank(message = "账号不能为空", groups = {add.class})
+    @NotBlank(message = "账号不能为空")
     private String account;
 
     //密码
-    @NotBlank(message = "密码不能为空", groups = {add.class})
+    @NotBlank(message = "密码不能为空")
     private String password;
 
     private String photo;
 
-    @NotBlank(message = "电话不能为空", groups = {add.class})
+    @NotBlank(message = "电话不能为空")
     private String phone;
 
     private Date createTime;

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

 package com.junmp.jyzb.api.bean.query;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -189,7 +190,7 @@ public class QueryBusFormReq extends BaseRequest {
     /**
      * 报废销毁类型（1销毁出库，2移入报废区）
      */
-    private Integer type;
+    private String type;
 
     /**
      * 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
@@ -211,4 +212,13 @@ public class QueryBusFormReq extends BaseRequest {
 
     //是否创建空数据，true则创建，false则不创建
     private Boolean isCreateNullDate;
+
+    /**
+     * 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderCurrentState;
+    /**
+     * 单据上次状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderLastState;
 }

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

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class QueryQuickSuggestionsReq {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空",groups = {ValidationApi.detail.class})
+    private Long userId;
+
+    /**
+     * 审批意见
+     */
+    private String text;
+
+    /**
+     * 应用场景（1为审批时使用）
+     */
+    private Integer useType;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

@@ -21,7 +21,7 @@ public class QueryReassignmentReq extends BaseRequest {
     /**
      * 经办人
      */
-    private String userName;
+    private String agent;
 
     /**
      * 工作流id
@@ -43,7 +43,10 @@ public class QueryReassignmentReq extends BaseRequest {
     /**
      * 警员带走装备
      */
-    private String eqsList;
+    private String detailList;
+
+    private String invList;
+
 
     /**
      * 组织机构id（警员原组织机构id）
@@ -118,6 +121,12 @@ public class QueryReassignmentReq extends BaseRequest {
     /**
      * 类型（调入警员0，调出警员1）
      */
-    private Integer reassigmentType;
+    private String reassignmentType;
+
+    //登录人id
+    private String userId;
+
+    private String typeName;
+    private String sizeName;
 
 }

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

@@ -25,6 +25,11 @@ public class UpdateBusFormReq extends BaseRequest {
     private String processDefinitionId;
 
     /**
+     * 工作流实例id
+     */
+    private String processId;
+
+    /**
      * 单据业务类型
      */
     @NotBlank(message = "业务单据类型不能为空",groups = {add.class,edit.class})
@@ -168,7 +173,7 @@ public class UpdateBusFormReq extends BaseRequest {
     /**
      * 报废销毁类型（1销毁出库，2移入报废区）
      */
-    private Integer type;
+    private String type;
 
     /**
      * 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
@@ -180,5 +185,14 @@ public class UpdateBusFormReq extends BaseRequest {
      */
     private String invList;
 
+    /**
+     * 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderCurrentState;
+    /**
+     * 单据上次状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    private String orderLastState;
+
 }
 

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

@@ -41,7 +41,7 @@ public class UpdateOrderDetailReq implements Serializable {
     private String  supplierName;
 
     private Integer  planNum;
-
+    private BigDecimal totalPrice;
     private BigDecimal price;
 
     private String warehouseId;
@@ -79,4 +79,6 @@ public class UpdateOrderDetailReq implements Serializable {
      */
     private Integer maintenancePeriod;
 
+    private String remark;
+
 }

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

 package com.junmp.jyzb.api.bean.req;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.jyzb.api.bean.Validator.IsNumber;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
@@ -131,10 +132,6 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      */
     private List<UpdateOrderDetailReq>  detailList;
 
-    /**
-     * 生产厂商
-     */
-    private String manufacturerName;
 
     /**
      * 调拨类型（2支拨，1价拨），调拨出入库才有
@@ -155,6 +152,24 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
 
     //备注
     private String note;
+    /**
+     * 移入仓库id
+     */
+    private String locationId;
+    /**
+     * 移入仓库名称
+     */
+    private String locationName;
 
+    /**
+     * 移入仓库id
+     */
+    private String removeLocationId;
+    /**
+     * 移入仓库名称
+     */
+    private String removeLocationName;
+    //消息类型（）
+    private String api;
 }
 

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+@Data
+public class UpdateQuickSuggestionsReq {
+
+    /**
+     * id
+     */
+    @NotNull(message = "删除时主键id不能为空",groups = {ValidationApi.delete.class})
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空",groups = {ValidationApi.add.class})
+    private Long userId;
+
+    /**
+     * 审批意见
+     */
+    @NotBlank(message = "审批意见不能为空",groups = {ValidationApi.add.class})
+    private String text;
+
+    /**
+     * 应用场景（1为审批时使用）
+     */
+    @NotNull(message = "应用场景不能为空",groups = {ValidationApi.add.class})
+    private Integer useType;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

@@ -19,12 +19,14 @@ public class UpdateReassignmentReq extends BaseRequest {
     /**
      * 经办人
      */
-    private String userName;
+    private String agent;
     /**
      * 申请人id
      */
     private String userId;
 
+    private String orderCode;
+
     /**
      * 工作流id
      */
@@ -48,8 +50,8 @@ public class UpdateReassignmentReq extends BaseRequest {
     /**
      * 警员带走装备
      */
-    private String eqsList;
-
+    private String detailList;
+    private String invList;
     /**
      * 组织机构id（警员原组织机构id）
      */
@@ -108,6 +110,6 @@ public class UpdateReassignmentReq extends BaseRequest {
     /**
      * 类型（调入警员0，调出警员1）
      */
-    private Integer reassigmentType;
+    private String reassignmentType;
 
 }

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

@@ -6,7 +6,8 @@ import lombok.Getter;
 
 @Getter
 public enum InventoryExceptionEnum implements IExceptionEnum {
-    INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备信息不存在")
+    INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备信息不存在"),
+    INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_USER_ERROR_CODE,"填写的报废的装备数量大于实际能进行报废的数量"),
     ;
     /**
      * 错误编码

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

@@ -51,10 +51,10 @@ public class BussinessController {
     }
 
     //根据调拨单，一键生成采购单
-    @PostMapping("/GeneratePurchaseQuickly")
-    @ApiOperation("快速生成采购单")
-    public ApiRes<List<GeneratePurchaseQuicklyDto>> GeneratePurchaseQuickly(@RequestBody GeneratePurchaseQuicklyReq req){
-        return ApiRes.success(busFormService.GeneratePurchaseQuickly(req));
-    }
+//    @PostMapping("/GeneratePurchaseQuickly")
+//    @ApiOperation("快速生成采购单")
+//    public ApiRes<List<GeneratePurchaseQuicklyDto>> GeneratePurchaseQuickly(@RequestBody GeneratePurchaseQuicklyReq req){
+//        return ApiRes.success(busFormService.GeneratePurchaseQuickly(req));
+//    }
 
 }

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

@@ -265,4 +265,9 @@ public class InventoryController {
         return ApiRes.success(inventorySummaryService.selectTotalNum(req));
     }
 
+    @PostMapping("/selectSumByItems")
+    public ApiRes<List<InventorySummary>> selectSumByItems(@RequestBody SelectTotalNumReq req){
+        return ApiRes.success(inventorySummaryService.selectSumByItems(req));
+    }
+
 }

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

@@ -69,9 +69,9 @@ public class OutAndInboundController {
         return ApiRes.success(logDetailService.getInOutRecords(req));
     }
 
-    @PostMapping("/OutInRecords")
-    public ApiRes<Boolean> OutInRecords(@RequestBody OutInLogsReq req){
-        return ApiRes.success(logSummaryService.processInventoryRecords(req));
-    }
+//    @PostMapping("/OutInRecords")
+//    public ApiRes<Boolean> OutInRecords(@RequestBody OutInLogsReq req){
+//        return ApiRes.success(logSummaryService.processInventoryRecords(req));
+//    }
 
 }

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

@@ -186,8 +186,7 @@ public class PoliceController {
      */
     @PostMapping("/PoliceBindBox")
     @ApiOperation("人员绑定箱门")
-    public ApiRes<Boolean> PoliceBindBox(@RequestBody PolicemanReq req){
-
+    public ApiRes<Boolean> PoliceBindBox(@RequestBody @Validated(ValidationApi.add.class) PolicemanReq req){
         return ApiRes.success(policemanService.PoliceBindBox(req));
     }
 

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

@@ -225,10 +225,15 @@ public class BusForm implements Serializable {
     private String currentAssign;
 
     /**
-     * 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     * 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
      */
-    @TableField(value = "use_count")
-    private String useCount;
+    @TableField(value = "order_current_state")
+    private String orderCurrentState;
+    /**
+     * 单据上次状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
+     */
+    @TableField(value = "order_last_state")
+    private String orderLastState;
 
     private static final long serialVersionUID = 1L;
 

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

 package com.junmp.jyzb.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +18,7 @@ public class CabinetBoxPolice implements Serializable {
     /**
      * 
      */
-    @TableField(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

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

@@ -25,8 +25,8 @@ public class EquipmentSize implements Serializable {
      * 装备号型ID
      */
     @ApiModelProperty(value = "装备号型ID")
-    @TableField("id")
     @Id
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     private String id;
 
     /**

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

@@ -20,8 +20,10 @@ public class InventorySummary implements Serializable {
      * 装备汇总id
      */
     @ApiModelProperty(value = "装备汇总id")
-    private String id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
+    private String valuekey;
     /**
      * 组织机构id
      */

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

 package com.junmp.jyzb.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,7 +19,7 @@ public class LogDetail implements Serializable {
     /**
      * 出入库明细ID
      */
-
+    @TableId(type = IdType.AUTO)
     private Long detailId;
     /**
      * 出入库汇总id

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

@@ -20,6 +20,7 @@ public class LogSummary implements Serializable {
     /**
      * 出入库汇总ID
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

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

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -17,7 +15,7 @@ import java.util.Date;
     @NoArgsConstructor
     @TableName("bussiness_order_detail")
     public class OrderDetail implements Serializable {
-        @TableField("id")
+        @TableId(type = IdType.AUTO)
         private Long id;
 
         @TableField("order_id")
@@ -62,6 +60,9 @@ import java.util.Date;
         @TableField("price")
         private BigDecimal price;
 
+        @TableField("total_price")
+        private BigDecimal totalPrice;
+
         @TableField("order_type")
         private String orderType;
 
@@ -102,4 +103,7 @@ import java.util.Date;
          */
         @TableField("maintenance_period")
         private Integer maintenancePeriod;
+
+        @TableField("remark")
+        private String remark;
 }

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

@@ -14,7 +14,7 @@ import java.util.Date;
 @NoArgsConstructor
 @TableName("bussiness_order_main")
 public class OrderMain implements Serializable {
-
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     private String id;
 
     @TableField("order_type")
@@ -44,6 +44,8 @@ public class OrderMain implements Serializable {
     @TableField("end_org_name")
     private String endOrgName;
 
+    @TableField("supplier_id")
+    private String supplierId;
     @TableField("supplier_name")
     private String supplierName;
 
@@ -89,8 +91,7 @@ public class OrderMain implements Serializable {
     @TableField("current_assign")
     private String currentAssign;
 
-    @TableField("return_date")
-    private Date returnDate;
+
 
     @TableField("use_date")
     private Date useDate;
@@ -116,11 +117,6 @@ public class OrderMain implements Serializable {
     @TableField("update_user")
     private String updateUser;
 
-    /**
-     * 生产厂商id
-     */
-    @TableField("manufacturer_name")
-    private String manufacturerName;
 
     /**
      * 调拨类型（2支拨，1价拨）
@@ -133,16 +129,33 @@ public class OrderMain implements Serializable {
     @TableField("return_user_id")
     private String returnUserId;
 
-    @TableField("repair_name")
-    private String repairName;
-    @TableField("destory_name")
-    private String destoryName;
+    @TableField("return_user")
+    private String returnUser;
 
+    @TableField("return_date")
+    private Date returnDate;
+
+    /**
+     * 移入仓库id
+     */
     @TableField("location_id")
     private String locationId;
-
+    /**
+     * 移入仓库名称
+     */
     @TableField("location_name")
     private String locationName;
 
+    /**
+     * 移入仓库id
+     */
+    @TableField("remove_location_id")
+    private String removeLocationId;
+    /**
+     * 移入仓库名称
+     */
+    @TableField("remove_location_name")
+    private String removeLocationName;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -29,7 +27,7 @@ public class PoliceEquipment implements Serializable {
     /**
      * 警员ID
      */
-    @TableField("police_id")
+    @TableField(value = "police_id")
     private String policeId;
 
     @TableField("police_name")
@@ -68,9 +66,21 @@ public class PoliceEquipment implements Serializable {
     /**
      * 组织机构ID
      */
-    @TableField("org_id")
+    @TableField(value = "org_id",updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
+    /**
+     * 装备来源仓库id
+     */
+    @TableField(value = "location_id",updateStrategy = FieldStrategy.IGNORED)
+    private String locationId;
+
+    /**
+     * 装备存放位置
+     */
+    @TableField(value = "storage_location",updateStrategy = FieldStrategy.IGNORED)
+    private String storageLocation;
+
     //装备单价
     @TableField("price")
     private BigDecimal price;

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

@@ -88,5 +88,8 @@ public class Policeman implements Serializable {
     @TableField(value = "hk_face_device")
     private Integer hkFaceDevice;
 
+    @TableField(exist = false)
+    private List<PoliceEquipment> policeEquipmentList;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -24,7 +24,7 @@ import java.util.Date;
 @TableName("vie_price_sum_summary")
 public class PriceSumSummary implements Serializable {
 
-    @TableId(value = "id")
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     private String id;
 
     /**

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

 package com.junmp.jyzb.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,7 +24,7 @@ public class Reassignment implements Serializable {
     /**
      * id
      */
-
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -53,8 +54,14 @@ public class Reassignment implements Serializable {
     /**
      * 警员带走装备
      */
-    @TableField(value = "eqs_list")
-    private String eqsList;
+    @TableField(value = "detail_list")
+    private String detailList;
+
+    /**
+     * 警员带走装备
+     */
+    @TableField(value = "inv_list")
+    private String invList;
 
     /**
      * 组织机构id（谁申请，就是谁的组织机构号）
@@ -91,8 +98,8 @@ public class Reassignment implements Serializable {
     /**
      * 经办人
      */
-    @TableField(value = "user_name")
-    private String userName;
+    @TableField(value = "agent")
+    private String agent;
 
     /**
      * 申请时间
@@ -137,8 +144,11 @@ public class Reassignment implements Serializable {
     /**
      * 类型（调入警员0，调出警员1）
      */
-    @TableField(value = "reassigment_type")
-    private Integer reassigmentType;
+    @TableField(value = "reassignment_type")
+    private String reassignmentType;
+
+
+
 
 
     private static final long serialVersionUID = 1L;

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

@@ -17,6 +17,7 @@ import com.junmp.jyzb.service.BusFormService;
 import com.junmp.jyzb.service.OrderMainService;
 import com.junmp.jyzb.service.ReassignmentService;
 import com.junmp.jyzb.service.StocktakeService;
+import com.junmp.v2.auth.api.LoginUserApi;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.exception.base.ServiceException;
@@ -27,6 +28,8 @@ import com.junmp.v2.message.api.bean.req.MessageSendReq;
 import com.junmp.v2.sys.api.UserServiceApi;
 import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
 import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
+import com.junmp.v2.sys.user.entity.SysUserOrg;
+import com.junmp.v2.sys.user.service.SysUserOrgService;
 import com.junmp.v2.sys.user.service.SysUserService;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.UserTask;
@@ -67,6 +70,9 @@ public class CounterSignListener implements ExecutionListener {
     private OrgUserMapper orgUserMapper;
     @Resource
     private ReassignmentService reassignmentService;
+
+    @Resource
+    private SysUserOrgService sysUserOrgService;
     @Override
     public void notify(DelegateExecution execution) {
         String currentActivityId = execution.getCurrentActivityId();
@@ -90,7 +96,8 @@ public class CounterSignListener implements ExecutionListener {
             }
             ApproverGroups group=currentNode.getApproverGroups().get(0);
             String Type=group.getApproverType();
-            if (Type.equals("1")||Type.equals("8"))//指定人员，不处理
+//            if (Type.equals("1")||Type.equals("8"))//指定人员，不处理
+            if (Type.equals("8"))//指定人员，不处理
             {
 
                 List<String> assignedUser = group.getApproverIds();
@@ -114,6 +121,7 @@ public class CounterSignListener implements ExecutionListener {
 
                     roleList = roleList.substring(0, roleList.length() - 1);
                     roleList+=")";//至此拼接完成
+
                     LoginUser StartUser= LoginContext.getContext().getLoginUser();
                     List<UserListDTO> userList=orgUserMapper.QueryUserByRoleId(roleList, StartUser.getUserId().toString());
                         for (UserListDTO userId :userList)
@@ -173,21 +181,58 @@ public class CounterSignListener implements ExecutionListener {
             {
                 LoginUser StartUser= LoginContext.getContext().getLoginUser();
                 List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(StartUser.getUserId().toString());
+                List<String> Roles=group.getApproverIds();
+                String roleList="";
+                if (Roles.size()>0) { //角色不为空
+                    //开始拼接传入的多角色
+                    roleList = "(";
+                    for (String role : Roles) {
+                        roleList += role + ",";
+                    }
+
+                    roleList = roleList.substring(0, roleList.length() - 1);
+                    roleList += ")";//至此拼接完成
+                }else {
+                    throw new WorkFlowException("审核流配置不正确，无指定的组织机构！");
+                }
                 if (userList.size()<=0)//没有上级则本身已是上级
                 {
+                    //那么我就直接照同级下的满足角色的userId
+                    List<UserListDTO> userList1 = orgUserMapper.QueryUserByRoleId(roleList, StartUser.getUserId().toString());
+                    for (UserListDTO userId : userList1) {
+                        assigneeList.add(userId.getUserID());
+                    }
 
-                        assigneeList.add(StartUser.getUserId().toString());
+                }
+                else//表示他不是最上级的组织机构,还需要进行判断
+                {
 
+                    //判断当前登录人是否在上级的userIdlist中,如果存在,则表示下一个节点的也是当前登录人所在组织机构下的userID中
+                    boolean flag=false;
+                    for (UserListDTO currentUser :userList) {
+                        if (currentUser.getUserID().equals(StartUser.getUserId().toString())){
+                            flag=true;
+                        }
                     }
-                else//
+                    //如果未找到则表示下一个节点是上级组织机构下的某个角色的userId
+                    if (!flag){
+                        List<UserListDTO> userList1=orgUserMapper.QueryUserByRoleId(roleList, userList.get(0).getUserID());
+                        for (UserListDTO userId :userList1)
                         {
-                    for (UserListDTO userId :userList)
+                            assigneeList.add(userId.getUserID());
+                        }
+
+                    }
+                    else{//下一个节点的审核人和当前灯枯人是同一个组织机构
+                        List<UserListDTO> userList1=orgUserMapper.QueryUserByRoleId(roleList, StartUser.getUserId().toString());
+                        for (UserListDTO userId :userList1)
                         {
-                        assigneeList.add("1");
-//                        assigneeList.add(userId.getUserID());
+                            assigneeList.add(userId.getUserID());
                         }
                     }
 
+                }
+
 
             }
             else if (Type.equals("10"))//自己审批

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.junmp.junmpProcess.dto.json.ChildNode;
 import com.junmp.junmpProcess.utils.RabbitMQUtils2;
 //import com.rabbitmq.client.Channel;
@@ -15,6 +17,7 @@ import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
+import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.service.*;
@@ -66,6 +69,12 @@ import java.util.stream.Collectors;
     @Resource
     private StocktakeService stocktakeService;
 
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+
+    @Resource
+    private InventoryService inventoryService;
+
         protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
         @SneakyThrows
@@ -118,16 +127,7 @@ import java.util.stream.Collectors;
                                 .eq(BusForm::getProcessId, processInstanceId));
                         busForm.setExamineState("finished");
                         if (busForm.getBussinessType().equals("remove")){
-                            String detailList = busForm.getDetailList();
-                            List<BussinessOrderDetialReq> list = JSON.parseArray(detailList, BussinessOrderDetialReq.class);
-                            for (BussinessOrderDetialReq bussinessOrderDetialReq:list) {
-                                //如果数量相同则直接将全部在库数的装备表中的该仓库的装备状态全部设置为报废，并且修改库存汇总表中的数据
-                                if (bussinessOrderDetialReq.getPlanNum()==bussinessOrderDetialReq.getStockNumber()){
-                                    
-                                }else {//如果数量不相等，状态不进行修改，只修改库存汇总表中的信息
-
-                                }
-                            }
+                            busFormService.updateBrokenResult(busForm);
                         }
                         busFormService.updateById(busForm);
                     }
@@ -135,9 +135,10 @@ import java.util.stream.Collectors;
                         Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()
                                 .eq(Reassignment::getProcessId, processInstanceId));
                         UpdateReassignmentReq updateReassignmentReq = new UpdateReassignmentReq();
+                        one.setExamineState("finished");
                         BeanPlusUtil.copyProperties(one,updateReassignmentReq);
-                        updateReassignmentReq.setExamineState("finished");
                         policemanService.changePoliceOrg(updateReassignmentReq);
+                        reassignmentService.updateById(one);
                     }
                     if (Type.equals("stocktakeOrder")){//盘库申请单
 

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

@@ -36,7 +36,7 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
     List<InventorySummary> selectByEqs(@Param("orgId") Long orgId);
 
 
-    //出入库时无单据查询库存汇总并统计更新或者记账时根据单据查询库存汇总并统计更新
+    //根据组织机构,仓库,type,size,unitprice查询库存汇总信息
     List<InventorySummary> selectSumByItems(@Param("list") List<Object[]> searchCriteria);
 
     //根据组织机构查询报表中的本级及下一级信息

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

 package com.junmp.jyzb.rabbitmq;
 
+import com.alibaba.fastjson.JSON;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.service.LogSummaryService;
 import com.junmp.jyzb.service.OrderMainService;
@@ -18,11 +19,13 @@ public class OutInLogsReceiver {
     @Resource
     private LogSummaryService logSummaryService;
 
-    @RabbitListener(queues = "11111")//监听队列名
-    private void a(OutInLogsReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
+    @RabbitListener(queues = "orderResult")//监听队列名
+    private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {
-            System.out.println("req = " + req);
+            System.out.println("msg = " + msg);
+            OutInLogsReq req = JSON.parseObject(msg, OutInLogsReq.class);
+
             //将消息进行消费
             Boolean result = logSummaryService.processInventoryRecords(req);
             if (result){

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

@@ -34,5 +34,8 @@ public interface BusFormService extends IService<BusForm> {
     PageResult<BusFormDto> showBussinessOrder(QueryBusFormReq req);
 
     //根据调拨单，一键生成采购单
-    List<GeneratePurchaseQuicklyDto> GeneratePurchaseQuickly(GeneratePurchaseQuicklyReq req);
+//    List<GeneratePurchaseQuicklyDto> GeneratePurchaseQuickly(GeneratePurchaseQuicklyReq req);
+
+    //更新报废数量
+    boolean updateBrokenResult(BusForm busForm);
 }

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

@@ -42,7 +42,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     List<InventorySummary> EquipmentStatistics(InventorySumReq req);
 
     //出入库时无单据查询库存汇总并统计更新或者记账时根据单据查询库存汇总并统计更新
-    List<InventorySummary> selectSumByItems(List<Object[]> searchCriteria);
+    List<InventorySummary> selectSumByItems(SelectTotalNumReq req);
 
 
     boolean insertToSummary();

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

@@ -2,8 +2,11 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
@@ -17,13 +20,12 @@ import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.GeneratePurchaseQuicklyReq;
 import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
+import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
-import com.junmp.jyzb.service.BusFormService;
+import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.mapper.BusFormMapper;
-import com.junmp.jyzb.service.InventorySummaryService;
-import com.junmp.jyzb.service.StocktakeService;
 import com.junmp.jyzb.utils.CreateNullData;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;
@@ -36,6 +38,7 @@ import com.junmp.v2.sys.user.service.SysUserOrgService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -64,9 +67,15 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     private InventorySummaryService inventorySummaryService;
 
     @Resource
+    private InventoryService inventoryService;
+
+    @Resource
     private InventorySummaryMapper inventorySummaryMapper;
 
     @Resource
+    private OrderLogService orderLogService;
+
+    @Resource
     protected TaskService taskService;
 
     @Resource
@@ -93,13 +102,14 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             req.setExamineState("working");
         }
         //判断该单据是否可以进行修改(如果审核中则不允许修改)
-//        if (req.getExamineState().equals("working")){
-//            throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
-//        }
+        if (ObjectUtil.isNotNull(req.getProcessId()) && !req.getProcessId().trim().isEmpty()){
+            throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
+        }
         BusForm busForm = new BusForm();
         BeanUtil.copyProperties(req,busForm);
         //设置业务单的使用次数（默认是出库一次，入库一次）
-        busForm.setUseCount("bothUsing");
+        busForm.setOrderCurrentState("bothuseing");
+        busForm.setOrderLastState("bothuseing");
         if (ObjectUtil.isNull(req.getId())){
             String id= UUID.randomUUID().toString();
             busForm.setId(id);
@@ -238,78 +248,159 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
 
 
     //根据调拨单，一键生成采购单
+//    @Override
+//    public List<GeneratePurchaseQuicklyDto> GeneratePurchaseQuickly(GeneratePurchaseQuicklyReq req) {
+//        //先把所有发物单位是自己的业务单全部查询出来，然后一一进行比较到底那个是前端传递的数据
+////        List<BusForm> list = list(new LambdaQueryWrapper<BusForm>()
+////                .eq(BusForm::getOrgId, req.getOrgId())
+////                .eq(BusForm::getBussinessType, req.getBussinessType()));
+//
+//        //将所有调拨单中的装备添加到totalList,之后进行去重并且相应数量相加
+//        List<BussinessOrderDetialReq> totalList=new ArrayList<>();
+//        //将所有调拨单获取
+//        List<UpdateBusFormReq> busFormList = req.getBusFormList();
+//        for (UpdateBusFormReq updateBusFormReq:busFormList) {
+//            String detailList = updateBusFormReq.getDetailList();
+//            List<BussinessOrderDetialReq> list = JSONObject.parseArray(detailList, BussinessOrderDetialReq.class);
+//            totalList.addAll(list);
+//        }
+//        //newList用来去重，把相同size和type的数量进行相加
+//        List<BussinessOrderDetialReq> newList=new ArrayList<>();
+//        for (BussinessOrderDetialReq item :totalList) {
+//            boolean found=false;
+//            if (newList.size()==0){
+//                newList.add(item);
+//                continue;
+//            }
+//            for (BussinessOrderDetialReq listItem:newList) {
+//                if (listItem.getSizeId().equals(item.getSizeId()) && listItem.getTypeId().equals(item.getTypeId())) {
+//                    // 如果存在匹配的元素，则更新 num 值
+//                    listItem.setPlanNum(listItem.getPlanNum() + item.getPlanNum());
+//                    found = true;
+//                    break;
+//                }
+//            }
+//            if (!found){
+//                newList.add(item);
+//            }
+//        }
+//        //创建list，返回给前端（只返回库存不足的装备和数量）
+//        List<GeneratePurchaseQuicklyDto> returnList=new ArrayList<>();
+//        //查询库存数量（将该组织机构下面的所有类型和号型的数量查询出来）
+//        List<InventorySummary> sumList = inventorySummaryMapper.selectByEqs(req.getOrgId());
+//        for (BussinessOrderDetialReq bussinessOrderDetial:newList) {
+//            boolean flag=false;
+//            for (InventorySummary inventorySummary:sumList) {
+//                if (bussinessOrderDetial.getSizeId().equals(inventorySummary.getSizeId())
+//                        && bussinessOrderDetial.getTypeId().equals(inventorySummary.getSizeId())){
+//                    //判断两个数量谁打谁小
+//                    if (bussinessOrderDetial.getPlanNum()-inventorySummary.getStockNumber()>0){
+//                        GeneratePurchaseQuicklyDto generatePurchaseQuicklyDto = new GeneratePurchaseQuicklyDto();
+//                        generatePurchaseQuicklyDto.setNumber(bussinessOrderDetial.getPlanNum()-inventorySummary.getStockNumber());
+//                        generatePurchaseQuicklyDto.setSizeId(bussinessOrderDetial.getSizeId());
+//                        generatePurchaseQuicklyDto.setSizeName(bussinessOrderDetial.getSizeName());
+//                        generatePurchaseQuicklyDto.setTypeId(bussinessOrderDetial.getTypeId());
+//                        generatePurchaseQuicklyDto.setTypeName(bussinessOrderDetial.getTypeName());
+//                        returnList.add(generatePurchaseQuicklyDto);
+//                    }
+//                    flag=true;
+//                    break;
+//                }
+//
+//            }
+//            if (!flag){
+//                GeneratePurchaseQuicklyDto generatePurchaseQuicklyDto = new GeneratePurchaseQuicklyDto();
+//                generatePurchaseQuicklyDto.setNumber(bussinessOrderDetial.getPlanNum());
+//                generatePurchaseQuicklyDto.setSizeId(bussinessOrderDetial.getSizeId());
+//                generatePurchaseQuicklyDto.setSizeName(bussinessOrderDetial.getSizeName());
+//                generatePurchaseQuicklyDto.setTypeId(bussinessOrderDetial.getTypeId());
+//                generatePurchaseQuicklyDto.setTypeName(bussinessOrderDetial.getTypeName());
+//                returnList.add(generatePurchaseQuicklyDto);
+//            }
+//        }
+//
+//        return returnList;
+//    }
+
     @Override
-    public List<GeneratePurchaseQuicklyDto> GeneratePurchaseQuickly(GeneratePurchaseQuicklyReq req) {
-        //先把所有发物单位是自己的业务单全部查询出来，然后一一进行比较到底那个是前端传递的数据
-//        List<BusForm> list = list(new LambdaQueryWrapper<BusForm>()
-//                .eq(BusForm::getOrgId, req.getOrgId())
-//                .eq(BusForm::getBussinessType, req.getBussinessType()));
-
-        //将所有调拨单中的装备添加到totalList,之后进行去重并且相应数量相加
-        List<BussinessOrderDetialReq> totalList=new ArrayList<>();
-        //将所有调拨单获取
-        List<UpdateBusFormReq> busFormList = req.getBusFormList();
-        for (UpdateBusFormReq updateBusFormReq:busFormList) {
-            String detailList = updateBusFormReq.getDetailList();
-            List<BussinessOrderDetialReq> list = JSONObject.parseArray(detailList, BussinessOrderDetialReq.class);
-            totalList.addAll(list);
-        }
-        //newList用来去重，把相同size和type的数量进行相加
-        List<BussinessOrderDetialReq> newList=new ArrayList<>();
-        for (BussinessOrderDetialReq item :totalList) {
-            boolean found=false;
-            if (newList.size()==0){
-                newList.add(item);
-                continue;
-            }
-            for (BussinessOrderDetialReq listItem:newList) {
-                if (listItem.getSizeId().equals(item.getSizeId()) && listItem.getTypeId().equals(item.getTypeId())) {
-                    // 如果存在匹配的元素，则更新 num 值
-                    listItem.setPlanNum(listItem.getPlanNum() + item.getPlanNum());
-                    found = true;
-                    break;
-                }
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateBrokenResult(BusForm busForm) {
+        //获取数量
+        String detailList = busForm.getDetailList();
+        List<BussinessOrderDetialReq> list = JSON.parseArray(detailList, BussinessOrderDetialReq.class);
+        //更新inventory表的表达式
+        LambdaUpdateWrapper<Inventory> updateStateWrapper = Wrappers.lambdaUpdate();
+        List<Object[]> searchItem=new ArrayList<>();
+        for (BussinessOrderDetialReq detialReq:list) {
+            //我先去数据库查询summary表中的数据
+            Object[] item=new Object[]{busForm.getOrgId(),detialReq.getLocationId(),detialReq.getTypeId(),detialReq.getSizeId(),detialReq.getPrice()};
+            searchItem.add(item);
+
+        }
+        List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
+        List<InventorySummary> updateSummaryList=new ArrayList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("组织机构为:"+busForm.getOrgId()+"单号为:"+busForm.getBussinessCode()+"的报废业务单将报废数量进行修改:");
+        boolean a=false;
+        for (BussinessOrderDetialReq detialReq:list) {
+            for (InventorySummary is:inventorySummaryList) {
+                if (detialReq.getLocationId().equals(is.getLocationId()) && detialReq.getTypeId().equals(is.getTypeId())
+                    && detialReq.getSizeId().equals(is.getSizeId()) && detialReq.getPrice().compareTo(is.getUnitPrice())==0){
+                    //如果数量相同则直接将全部在库数的装备表中的该仓库的装备状态全部设置为报废，并且修改库存汇总表中的数据
+                    if (detialReq.getPlanNum()+is.getBrokenNumber()==is.getStockNumber()){
+                        a=true;
+                        //修改装备状态表达式
+                        updateStateWrapper.or().eq(Inventory::getOrgId, busForm.getOrgId())
+                                .eq(Inventory::getLocationId, detialReq.getLocationId())
+                                .eq(Inventory::getTypeId, detialReq.getTypeId())
+                                .eq(Inventory::getSizeId, detialReq.getSizeId())
+                                .eq(Inventory::getPrice, detialReq.getPrice())
+                                .eq(Inventory::getLocationType,1)
+                                .eq(Inventory::getLocationState,"in")
+                                .set(Inventory::getState, "broken");
+
+                        //将库存的报废数量根据单据重新进行计算
+                        Integer brokenNum=detialReq.getPlanNum()+is.getBrokenNumber();
+                        stringBuilder.append("装备为"+detialReq.getTypeName()+","+detialReq.getSizeName()+"的报废数量从"+is.getBrokenNumber()+"改成"+brokenNum+",");
+                        is.setBrokenNumber(brokenNum);
+                        updateSummaryList.add(is);
+                    } else if (detialReq.getPlanNum()+detialReq.getBrokenNumber()<detialReq.getStockNumber()){
+                        //如果数量不相等，状态不进行修改，只修改库存汇总表中的信息
+                        //将库存的报废数量根据单据重新进行计算
+                        Integer brokenNum=detialReq.getPlanNum()+is.getBrokenNumber();
+                        stringBuilder.append("装备为"+detialReq.getTypeName()+","+detialReq.getSizeName()+"的报废数量从"+is.getBrokenNumber()+"改成"+brokenNum+",");
+                        is.setBrokenNumber(brokenNum);
+                        updateSummaryList.add(is);
+                    }else {
+                        throw new ServiceException(InventoryExceptionEnum.INVENTORY_BEYOND_STOCK);
                     }
-            if (!found){
-                newList.add(item);
-            }
-        }
-        //创建list，返回给前端（只返回库存不足的装备和数量）
-        List<GeneratePurchaseQuicklyDto> returnList=new ArrayList<>();
-        //查询库存数量（将该组织机构下面的所有类型和号型的数量查询出来）
-        List<InventorySummary> sumList = inventorySummaryMapper.selectByEqs(req.getOrgId());
-        for (BussinessOrderDetialReq bussinessOrderDetial:newList) {
-            boolean flag=false;
-            for (InventorySummary inventorySummary:sumList) {
-                if (bussinessOrderDetial.getSizeId().equals(inventorySummary.getSizeId())
-                        && bussinessOrderDetial.getTypeId().equals(inventorySummary.getSizeId())){
-                    //判断两个数量谁打谁小
-                    if (bussinessOrderDetial.getPlanNum()-inventorySummary.getStockNumber()>0){
-                        GeneratePurchaseQuicklyDto generatePurchaseQuicklyDto = new GeneratePurchaseQuicklyDto();
-                        generatePurchaseQuicklyDto.setNumber(bussinessOrderDetial.getPlanNum()-inventorySummary.getStockNumber());
-                        generatePurchaseQuicklyDto.setSizeId(bussinessOrderDetial.getSizeId());
-                        generatePurchaseQuicklyDto.setSizeName(bussinessOrderDetial.getSizeName());
-                        generatePurchaseQuicklyDto.setTypeId(bussinessOrderDetial.getTypeId());
-                        generatePurchaseQuicklyDto.setTypeName(bussinessOrderDetial.getTypeName());
-                        returnList.add(generatePurchaseQuicklyDto);
-                    }
-                    flag=true;
                     break;
                 }
 
             }
-            if (!flag){
-                GeneratePurchaseQuicklyDto generatePurchaseQuicklyDto = new GeneratePurchaseQuicklyDto();
-                generatePurchaseQuicklyDto.setNumber(bussinessOrderDetial.getPlanNum());
-                generatePurchaseQuicklyDto.setSizeId(bussinessOrderDetial.getSizeId());
-                generatePurchaseQuicklyDto.setSizeName(bussinessOrderDetial.getSizeName());
-                generatePurchaseQuicklyDto.setTypeId(bussinessOrderDetial.getTypeId());
-                generatePurchaseQuicklyDto.setTypeName(bussinessOrderDetial.getTypeName());
-                returnList.add(generatePurchaseQuicklyDto);
         }
+        boolean b=true;
+        //改inventory表中的装备状态
+        if (a){
+            b=inventoryService.update(updateStateWrapper);
         }
+        //批量修改inventtorySummary表中的数据
+        boolean c=true;
+        if (updateSummaryList.size()>0){
+            c=inventorySummaryService.updateBatchById(updateSummaryList);
+        }
+        //创建log记录日志
+        OrderLog orderLog = new OrderLog();
+        orderLog.setHistoryMsg(stringBuilder.toString());
+        orderLog.setOrgId(busForm.getOrgId());
+        orderLog.setBussinessType(busForm.getBussinessType());
+        orderLog.setOrderCode(busForm.getBussinessCode());
+        orderLog.setOrderId(busForm.getId());
+        orderLog.setOrgName(busForm.getOrgName());
+        orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        orderLogService.save(orderLog);
 
-        return returnList;
+        return (b && c);
     }
 
 
@@ -375,6 +466,19 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             }
             eq.eq(ObjectUtil.isNotNull(req.getAllocateType()) && !req.getAllocateType().isEmpty(),BusForm::getAllocateType,req.getAllocateType());
         }
+        //当前单子状态
+        if (ObjectUtil.isNotNull(req.getOrderCurrentState())){
+            List<String> orderCurrentStateList=new ArrayList<>();
+            if (req.getOrderCurrentState().equals("incoming")){
+                orderCurrentStateList.add("incoming");
+                orderCurrentStateList.add("bothuseing");
+                eq.in( BusForm::getOrderCurrentState,orderCurrentStateList);
+            }else if (req.getOrderCurrentState().equals("outgoing")){
+                orderCurrentStateList.add("outgoing");
+                orderCurrentStateList.add("bothuseing");
+                eq.in( BusForm::getOrderCurrentState,orderCurrentStateList);
+            }
+        }
 
         return eq;
     }

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

@@ -284,7 +284,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
         ElasticsearchUtil es=new ElasticsearchUtil<>(client);
         // 先从ES中拿到检索数据
-        List<EquipmentType> searchResults = es.searchEntities("type_pinyin","name",0, 50, req.getTypeName(),EquipmentType.class);
+        List<EquipmentType> searchResults = es.searchEntities("type_pinyin","name",0, 50,req.getType(), req.getTypeName(),EquipmentType.class);
         LambdaQueryWrapper<EquipmentType> wp = this.createWrapper(req);
         // 获取所有组织机构数据
         List<EquipmentType> allTypes = this.list(wp);

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

@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -250,8 +251,45 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
 
     //出入库时无单据查询库存汇总并统计更新或者记账时根据单据查询库存汇总并统计更新
     @Override
-    public List<InventorySummary> selectSumByItems(List<Object[]> searchCriteria) {
-        return inventorySummaryMapper.selectSumByItems(searchCriteria);
+    public List<InventorySummary> selectSumByItems(SelectTotalNumReq req) {
+        List<InventorySumReq> list = req.getList();
+        List<Object[]> searchItem=new ArrayList<>();
+        for (InventorySumReq inv:list) {
+            Object[] item=new Object[]{inv.getOrgId(),inv.getLocationId(),inv.getTypeId(),inv.getSizeId(),inv.getUnitPrice()};
+            searchItem.add(item);
+        }
+        List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
+        //判断装备的list是否和传入的list的size是否相等，如果相等则表示所有的库存数量都能查询到，如果不相等则进行遍历将不满足要求的进行新增一条装备数量为0的库存信息进行返回给前端
+        if (list.size()==inventorySummaryList.size()){
+            return inventorySummaryList;
+        }else {
+            List<InventorySummary> returnList=new ArrayList<>();
+            for (InventorySumReq inv:list) {
+                boolean flag=false;
+                for (InventorySummary is:inventorySummaryList) {
+                    if (inv.getOrgId().equals(is.getOrgId())&& inv.getLocationId().equals(is.getLocationId())
+                            && inv.getTypeId().equals(is.getTypeId()) && inv.getSizeId().equals(is.getTypeId())
+                            && is.getUnitPrice().compareTo(new BigDecimal(inv.getUnitPrice()))==0){
+                        flag=true;
+                        returnList.add(is);
+                        break;
+                    }
+                }
+                if (!flag){
+                    InventorySummary inventorySummary = new InventorySummary();
+                    BeanPlusUtil.copyProperties(inv,inventorySummary);
+                    inventorySummary.setStockNumber(0);
+                    inventorySummary.setOutboundNumber(0);
+                    inventorySummary.setPrice(BigDecimal.ZERO);
+                    inventorySummary.setBrokenNumber(0);
+                    inventorySummary.setDestructionNumber(0);
+                    returnList.add(inventorySummary);
+                }
+
+            }
+            return returnList;
+        }
+
     }
 
     @Override

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

@@ -2,6 +2,8 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
@@ -22,8 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -83,32 +84,22 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
     }
 
     //本地主机返回出入库结果
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean processInventoryRecords(OutInLogsReq req) {
-        //1.判断业务类型,如果是采购，更新装备库存表
-        boolean a=false;
-        if (req.getBussinessType().equals("purchase")){
-            List<PurchaseEqsReq> purchaseList = req.getOrderMain().getPurchaseList();
-            List<Inventory> collect = purchaseList.stream().map(purchaseEqsReq -> {
-                Inventory inventory = new Inventory();
-                BeanPlusUtil.copyProperties(purchaseEqsReq, inventory);
-                return inventory;
-            }).collect(Collectors.toList());
-            a=inventoryService.saveBatch(collect);
-        }
-        //2.如果有单据，更新单据
-        boolean b=false;
-        boolean c=false;
-        if (ObjectUtil.isNotNull(req.getOrderMain())){
-            OrderReq orderMain = req.getOrderMain();
-            List<DetailOrderReq> orderDetailList = orderMain.getOrderDetail();
+
+        //1.判断是否有单据，order对象是否为空，如果不为空则进行处理
+        OrderReq order = req.getOrder();
+        boolean a=true;
+        boolean b=true;
+        boolean c=true;
+        if (ObjectUtil.isNotNull(order)){
+            List<DetailOrderReq> orderDetailList = order.getOrderDetail();
             OrderMain one = orderMainService.getOne(new LambdaQueryWrapper<OrderMain>()
-                    .eq(OrderMain::getId, orderMain.getId()));
-            one.setPrice(orderMain.getPrice());
-            one.setActualQuantity(orderMain.getActualQuantity());
+                    .eq(OrderMain::getId, order.getId()));
+            one.setPrice(order.getPrice());
+            one.setActualQuantity(order.getActualQuantity());
             one.setOrderState(one.getOrderState());
-            b=orderMainService.updateById(one);
+            a=orderMainService.updateById(one);
             List<OrderDetail> collect = orderDetailList.stream().map(detailOrderReq -> {
                 OrderDetail orderDetail = new OrderDetail();
                 BeanPlusUtil.copyProperties(detailOrderReq, orderDetail);
@@ -116,23 +107,194 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                 orderDetail.setModifyQuantity(detailOrderReq.getActualNum());
                 return orderDetail;
             }).collect(Collectors.toList());
-            c=orderDetailService.updateBatchById(collect);
+            b=orderDetailService.updateBatchById(collect);
+
+            //2.判断业务类型,如果是采购，更新装备库存表
+            if (order.getBussinessType().equals("purchase")){
+                List<PurchaseEqsReq> purchaseList = order.getPurchaseList();
+                List<Inventory> collect1 = purchaseList.stream().map(purchaseEqsReq -> {
+                    Inventory inventory = new Inventory();
+                    BeanPlusUtil.copyProperties(purchaseEqsReq, inventory);
+                    inventory.setId(UUID.randomUUID().toString());
+                    inventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                    inventory.setState("normal");
+                    inventory.setLocationState("in");
+                    inventory.setBussinessState("normal");
+                    inventory.setLocationType(0);
+                    inventory.setOrgId(order.getOrgId());
+                    return inventory;
+                }).collect(Collectors.toList());
+
+                c=inventoryService.saveBatch(collect1);
+            }
+        }
+
+        //3.处理出入库记录对象
+        //判断出入库记录是否为空
+        List<NormalInOutDto> normalInOutDtos=new ArrayList<>();
+        if(ObjectUtil.isNotNull(req.getLogList()) && req.getLogList().size()>0){
+            normalInOutDtos = saveInOutRecords(req);
+        }
+
+        //4.对正常出入库记录进行装备汇总统计
+        boolean d=true;
+        if (normalInOutDtos.size()>0){
+            String outInState = normalInOutDtos.get(0).getOutInState();
+            d = updateNumToSum(outInState, normalInOutDtos);
+        }
+
+        return a && b && c && d;
+    }
+
+//    对出入库记录进行分类汇总存储()
+    public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
+        //返回结果，用于日常出入库时计算更新库存汇总表
+        List<SummaryLogReq> logSummaryList = req.getLogList();
+
+        //遍历logSummaryList查询出没有单据的作为日常出入库，并再次存放到list中，后面用于进行修改库存汇总
+        //返回returnList结果，用于日常出入库时计算更新库存汇总表
+        List<NormalInOutDto> returnList=new ArrayList<>();
+        //存一个list用于修改库存inventory表的数据(采购时那么这个inventoryList就为空)
+        List<Inventory> inventoryList=new ArrayList<>();
+        for (SummaryLogReq logreq:logSummaryList) {
+            //如果类型为normal，那么则表示作为日常出入库的记录，否则则作为单据的出入库记录
+            List<DetailLogReq> logList = logreq.getLogDetailList();
+            //出入库list
+            List<LogDetail> collect = new ArrayList<>();
+            LogSummary logSummary = saveLogSummary(logreq);
+            logSummaryService.save(logSummary);
+            Map<String, String> map = setState(logreq.getOutInState(), logreq.getBussinessType());
+            //无单据的时候
+            for (DetailLogReq detailLogReq : logList) {
+                //将所有装备信息进行存放（为后面计算汇总信息）
+                if (logreq.getBussinessType().equals("normal")) {
+                    NormalInOutDto normalInOutDto = new NormalInOutDto();
+                    BeanPlusUtil.copyProperties(detailLogReq, normalInOutDto);
+                    normalInOutDto.setLocationId(logSummary.getLocationId());
+                    normalInOutDto.setLocationName(logSummary.getLocationName());
+                    normalInOutDto.setOrgId(logSummary.getOrgId());
+                    normalInOutDto.setOrgName(logSummary.getOrgName());
+                    normalInOutDto.setNumber(1);
+                    returnList.add(normalInOutDto);
+                }
+                //判断logSummary是否为采购，
+                //如果是采购则不处理，因为采购的inventory是跟着单子来处理的，其他的单子直接根据出入库记录来处理
+                if (!logreq.getBussinessType().equals("purchase")){
+                    if (logreq.getOutInState().equals("in")){
+                        Inventory inventory = saveInventory(detailLogReq, map, logSummary.getOutInState());
+                        inventoryList.add(inventory);
+                    }else {
+                        Inventory inventory = saveInventory(detailLogReq, map, logSummary.getOutInState());
+                        inventoryList.add(inventory);
+                    }
+
                 }
+                //存放logdetail信息
+                LogDetail logDetail = new LogDetail();
+                BeanPlusUtil.copyProperties(detailLogReq, logDetail);
+                logDetail.setSummaryId(logSummary.getId());
+                logDetail.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                logDetail.setBussinessType(logreq.getBussinessType());
+                logDetail.setOutInState(logreq.getOutInState());
+                collect.add(logDetail);
+
+            }
+            boolean b = logDetailService.saveBatch(collect);
 
-        //3.对出入库记录进行存储
-        List<NormalInOutDto> inventorySumDtos = saveInOutRecords(req);
+        }
+        //修改inventory表中的数据（如果不为空则表示不是采购单或者已经将采购单的信息过滤掉）
+        if (inventoryList.size()>0){
+            LambdaUpdateWrapper<Inventory> updateStateWrapper = Wrappers.lambdaUpdate();
+            for (Inventory inventory:inventoryList) {
+                updateStateWrapper.or().eq(Inventory::getId,inventory.getId())
+                        .set(Inventory::getLocationState,inventory.getLocationState())
+                        .set(Inventory::getBussinessState,inventory.getBussinessState())
+                        .set(Inventory::getState,inventory.getState());
+            }
+            inventoryService.update(updateStateWrapper);
+        }
 
-        //4.如果没有单据当作日常出入库或者采购时，需要对库存汇总表进行更新
-        boolean d=false;
-        if (req.getBussinessType().equals("normal")|| req.getBussinessType().equals("purchase")){
-            //获取到组织机构和仓库，将出入库的装备进行分组统计，并且对inventorysummary进行更新操作
-            d = updateNumToSum(req.getOutInState(), inventorySumDtos, req.getOutInState());
+        return returnList;
     }
-        return (a && b && c && d);
+//    创建logsummary
+    private LogSummary saveLogSummary(SummaryLogReq req){
+        LogSummary logSummary = new LogSummary();
+        BeanPlusUtil.copyProperties(req,logSummary);
+        logSummary.setOutInState(req.getOutInState());
+        logSummary.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        logSummary.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        logSummary.setBussinessType(req.getBussinessType());
+        logSummary.setOrgId(req.getOrgId());
+        logSummary.setOrgName(req.getOrgName());
+        return logSummary;
     }
 
-    //对库存汇总表进行更新（只限于日常出入库）
-    public boolean updateNumToSum(String outInState,List<NormalInOutDto> inventorySumDtos,String OutInState) {
+    private Inventory saveInventory(DetailLogReq req,Map<String, String> map,String outInState){
+        Inventory inventory = new Inventory();
+        BeanPlusUtil.copyProperties(req,inventory);
+        inventory.setId(req.getInventoryId());
+        inventory.setLocationState(outInState);
+        inventory.setState(map.get("state"));
+        inventory.setBussinessState(map.get("bussinessType"));
+        return inventory;
+    }
+
+    private Map<String,String> setState(String outInState,String bussinessType){
+        Map<String,String> map=new HashMap<>();
+        String state="";
+        String bussinessState="";
+        if (outInState.equals("in")){
+            switch (bussinessType){
+                case "return":
+                case "gift":
+                case "other":
+                    state="normal";
+                    bussinessState="normal";
+                    break;
+                case "allocate":
+                    state="normal";
+                    bussinessState="allocate";
+                    break;
+                case "repair":
+                    state="normal";
+                    bussinessState="repair";
+                    break;
+
+
+            }
+        }else {
+            switch (bussinessType){
+                case "use":
+                    state="normal";
+                    bussinessState="use";
+                    break;
+                case "allocate":
+                    state="normal";
+                    bussinessState="allocate";
+                    break;
+                case "repair":
+                    state="fix";
+                    bussinessState="repair";
+                    break;
+                case "destruction":
+                    state="destory";
+                    bussinessState="destruction";
+                    break;
+                case "other":
+                    state="normal";
+                    bussinessState="normal";
+                    break;
+
+            }
+        }
+        map.put("state",state);
+        map.put("bussinessState",bussinessState);
+        return map;
+    }
+
+
+//    对库存汇总表进行更新（只限于日常出入库）
+    public boolean updateNumToSum(String outInState,List<NormalInOutDto> inventorySumDtos) {
 
         List<NormalInOutDto> groupedResult = inventorySumDtos.stream()
                 .collect(Collectors.groupingBy(dto -> dto.getOrgId() + "_" + dto.getLocationId() + "_" +
@@ -211,78 +373,6 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         return a;
     }
 
-    //对出入库记录进行存储
-    public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
-        //返回结果，用于日常出入库时计算更新库存汇总表
-        List<NormalInOutDto> returnList=new ArrayList<>();
-        List<LogDetail> logDetailList=new ArrayList<>();
-        List<SummaryLogReq> logSummaryList = req.getLogSummaryList();
-        //如果是日常出入库，那么将这些出入库数据进行计算，最终更新库存汇总表中的数据
-        if (req.getBussinessType().equals("normal")){
-            for (SummaryLogReq summaryLogReq:logSummaryList) {
-                LogSummary logSummary = new LogSummary();
-                BeanPlusUtil.copyProperties(summaryLogReq,logSummary);
-                logSummary.setOutInState(req.getOutInState());
-                logSummary.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                logSummary.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-                logSummary.setBussinessType(req.getBussinessType());
-                logSummary.setOrgId(req.getOrgId());
-                logSummary.setOrgName(req.getOrgName());
-                logSummaryService.save(logSummary);
-                List<DetailLogReq> logList = summaryLogReq.getLogDetailList();
-                //出入库list
-                List<LogDetail> collect=new ArrayList<>();
-                //用于装备汇总list
-                List<NormalInOutDto> list=new ArrayList<>();
-                for (DetailLogReq detailLogReq: logList) {
-                    //将所有装备信息进行存放（为后面计算汇总信息）
-                    NormalInOutDto normalInOutDto = new NormalInOutDto();
-                    BeanPlusUtil.copyProperties(detailLogReq,normalInOutDto);
-                    normalInOutDto.setLocationId(logSummary.getLocationId());
-                    normalInOutDto.setLocationName(logSummary.getLocationName());
-                    normalInOutDto.setOrgId(logSummary.getOrgId());
-                    normalInOutDto.setOrgName(logSummary.getOrgName());
-                    normalInOutDto.setNumber(1);
-                    list.add(normalInOutDto);
-                    //存放logdetail信息
-                    LogDetail logDetail = new LogDetail();
-                    BeanPlusUtil.copyProperties(detailLogReq, logDetail);
-                    logDetail.setSummaryId(logSummary.getId());
-                    collect.add(logDetail);
-                }
-                logDetailList.addAll(collect);
-                returnList.addAll(list);
-            }
-            logDetailService.saveBatch(logDetailList);
-            return returnList;
-        }else {
-            //外层的logSummary只能逐个进行插入，logDetail可以批量进行插入
-            for (SummaryLogReq summaryLogReq:logSummaryList) {
-                LogSummary logSummary = new LogSummary();
-                BeanPlusUtil.copyProperties(summaryLogReq,logSummary);
-                logSummary.setOutInState(req.getOutInState());
-                logSummary.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                logSummary.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-                logSummary.setBussinessType(req.getBussinessType());
-                logSummary.setOrgId(req.getOrgId());
-                logSummary.setOrgName(req.getOrgName());
-                logSummaryService.save(logSummary);
-                List<LogDetail> collect = summaryLogReq.getLogDetailList().stream().map(detailLogReq -> {
-                    LogDetail logDetail = new LogDetail();
-                    NormalInOutDto inventorySumDto = new NormalInOutDto();
-                    BeanPlusUtil.copyProperties(detailLogReq,inventorySumDto);
-                    BeanPlusUtil.copyProperties(detailLogReq, logDetail);
-                    logDetail.setSummaryId(logSummary.getId());
-                    return logDetail;
-                }).collect(Collectors.toList());
-                logDetailList.addAll(collect);
-            }
-            logDetailService.saveBatch(logDetailList);
-            return returnList;
-        }
-
-    }
-
 }
 
 

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

@@ -18,6 +18,7 @@ import com.junmp.jyzb.api.bean.vo.InOrderInfo;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
 import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.mapper.OrderMainMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
@@ -111,6 +112,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     @Resource
     protected TaskService taskService;
+
+
+    @Resource
+    private InventorySummaryMapper inventorySummaryMapper;
     @Autowired
     private RabbitMQSendMsg MQ;
 
@@ -118,6 +123,72 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<String> AddOrder(UpdateOrderReq req) {
+        //修改单据使用次数状态，判断数据库是否有该单据，如果有，那么就判断当前单号是否一致，如果不一致，修改单据使用次数
+        Long orgId;
+        if (ObjectUtil.isNotNull(req.getId())){
+            OrderMain one = orderMainExist(req.getId());
+            if (ObjectUtil.isNotNull(one.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())) {
+                if (!one.getBussinessCode().equals(req.getBussinessCode())) {
+                    if (req.getOrderType().equals("in")) {
+                        orgId = req.getEndOrgId();
+                    } else {
+                        orgId = Long.parseLong(req.getStartOrgId());
+
+                    }
+                    //入参
+                    BusForm one1 = setState1(orgId, req.getBussinessCode());
+                    busFormService.updateById(one1);
+
+                    //库存
+                    BusForm one2 = setState2(orgId, one.getBussinessCode());
+                    busFormService.updateById(one2);
+
+                }
+            }
+            //入参不为空，库里为空
+            else if (ObjectUtil.isNotNull(one.getBussinessCode()) && ObjectUtil.isNull(one.getBussinessCode())){
+                //只需要改一条数据
+                if (req.getOrderType().equals("in")){
+                    orgId=req.getEndOrgId();
+
+                }else {
+                    orgId=Long.parseLong(req.getStartOrgId());
+
+                }
+                //入参
+                BusForm one1 = setState1(orgId, req.getBussinessCode());
+                busFormService.updateById(one1);
+            }
+            //入参为空，库里不为空
+            else if (ObjectUtil.isNull(one.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())){
+                //只需要改一条数据
+                if (req.getOrderType().equals("in")){
+                    orgId=req.getEndOrgId();
+
+                }else {
+                    orgId=Long.parseLong(req.getStartOrgId());
+                }
+                //库存
+                BusForm one2 = setState2(orgId, one.getBussinessCode());
+                busFormService.updateById(one2);
+            }
+        }else {
+            if (ObjectUtil.isNotNull(req.getBussinessCode())){
+                //只需要更改一条单据
+                //只需要改一条数据
+                if (req.getOrderType().equals("in")){
+                    orgId=req.getEndOrgId();
+
+                }else {
+                    orgId=Long.parseLong(req.getStartOrgId());
+                }
+                //入参
+                BusForm one1 = setState1(orgId, req.getBussinessCode());
+                busFormService.updateById(one1);
+            }
+        }
+
+
         //判断是否有工作流id，如果有则将状态进行修改
         if (ObjectUtil.isEmpty(req.getProcessDefinitionId())) {
             req.setExamineState("none");
@@ -125,7 +196,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             req.setExamineState("working");
         }
         //判断该单据是否可以进行修改(如果审核中则不允许修改)
-        if (req.getExamineState().equals("working")){
+        if (ObjectUtil.isNotNull(req.getProcessId()) && !req.getProcessId().trim().isEmpty()){
             throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
         }
         OrderMain order = new OrderMain();
@@ -214,9 +285,51 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         for (OrderDetail orderDetail:detailList) {
             list.add(Long.toString(orderDetail.getId()));
         }
+
+
         return list;
     }
 
+    private BusForm setState2(Long orgId,String bussinessCode){
+        BusForm busform = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
+                .eq(BusForm::getOrgId, orgId)
+                .in(BusForm::getBussinessCode, bussinessCode));
+        busform.setOrderCurrentState(busform.getOrderLastState());
+        switch (busform.getOrderCurrentState()){
+
+            case "none":
+                busform.setOrderCurrentState("outgoing");
+                break;
+            case "incoming":
+                busform.setOrderCurrentState("bothuseing");
+                break;
+            case "outgoing":
+                busform.setOrderCurrentState("bothuseing");
+                break;
+        }
+        return busform;
+    }
+
+    private BusForm setState1(Long orgId,String bussinessCode){
+        BusForm busform = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
+                .eq(BusForm::getOrgId, orgId)
+                .in(BusForm::getBussinessCode, bussinessCode));
+        busform.setOrderCurrentState(busform.getOrderLastState());
+        switch (busform.getOrderCurrentState()){
+            case "bothuseing":
+                busform.setOrderCurrentState("outgoing");
+                break;
+            case "incoming":
+                busform.setOrderCurrentState("forbidden");
+                break;
+            case "outgoing":
+                busform.setOrderCurrentState("forbidden");
+                break;
+
+        }
+        return busform;
+    }
+
 
     //设置单据单号（并且对order_num表进行新增或者更新）
     public OrderNum setOrderCode(UpdateOrderReq req){
@@ -289,6 +402,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             req.setDetailList(collect);
 
         }
+
+        //单据类型，分发单据
+        req.setApi("DistributeOrder");
         //将完成的任务单直接推送到消息队列rabbitmq中（需要判断是入库单还是出库单，入库单传发物单位id，出库单传收物单位id）
         //方法2：一个交换机，多个队列。动态创建队列
         String exchangeName="orderExchange";
@@ -369,6 +485,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             req.setOrder(req.getOrder().toLowerCase());
         }
         //根据查询条件得到单据
+        
         IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req);
         page.setRecords(outOrderPage.getRecords());
         page.setTotal(outOrderPage.getTotal());
@@ -413,15 +530,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         List<OrderDetailDto> orderDetailDtoList=new ArrayList<>();
         for (OrderDetail orderDetail:list) {
             OrderDetailDto orderDetailDto = new OrderDetailDto();
+
             BeanPlusUtil.copyProperties(orderDetail,orderDetailDto);
-//            if (orderMain.getOrderType().equals("out")){
-//                InventorySummary one = inventorySummaryService.getOne(new LambdaQueryWrapper<InventorySummary>()
-//                        .eq(InventorySummary::getLocationId, orderDetail.getWarehouseId())
-//                        .eq(InventorySummary::getSizeId, orderDetail.getSizeId())
-//                        .eq(InventorySummary::getTypeId, orderDetail.getTypeId())
-//                        .eq(InventorySummary::getUnitPrice, orderDetail.getPrice()));
-//                orderDetailDto.setStockNumber(one.getStockNumber());
-//            }
             orderDetailDtoList.add(orderDetailDto);
         }
         orderDto.setDetailList(orderDetailDtoList);
@@ -570,6 +680,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 policeEquipment.setTypeName(updateOrderDetailReq.getTypeName());
                 policeEquipment.setNum(updateOrderDetailReq.getModifyQuantity());
                 policeEquipment.setOrgId(orgId);
+                policeEquipment.setLocationId(updateOrderDetailReq.getWarehouseId());
                 policeEquipment.setCreateTime(DateTimeUtil.getCurrentDateTime());
                 return policeEquipment;
             }).collect(Collectors.toList());
@@ -609,7 +720,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             Object[] criteria=new Object[]{orgId,upReq.getWarehouseId(),upReq.getTypeId(),upReq.getSizeId(),upReq.getPrice()};
             searchCriteria.add(criteria);
         }
-        List<InventorySummary> inventorySummaryList = inventorySummaryService.selectSumByItems(searchCriteria);
+        List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchCriteria);
         List<InventorySummary> addList=new ArrayList<>();
         List<InventorySummary> updateList=new ArrayList<>();
         for (UpdateOrderDetailReq upReq: orderDetailReqList) {
@@ -906,9 +1017,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
         //将summary汇总表中数据进行修改(修改该组织机构下的装备汇总信息将库存信息的在库数，库存总数，总价还有其他数据数量进行修改)
         //那么首先将原来的仓库下的装备汇总信息进行查询出来，对其进行修改
-        List<InventorySummary> oldSummaryList = inventorySummaryService.selectSumByItems(searchCriteria);
+        List<InventorySummary> oldSummaryList = inventorySummaryMapper.selectSumByItems(searchCriteria);
         //其次查询出修改后的仓库下面的汇总信息，判断该仓库下是否已经存在该号型、类型、单价相同的装备数据
-        List<InventorySummary> newSummaryList = inventorySummaryService.selectSumByItems(updateCriteria);
+        List<InventorySummary> newSummaryList = inventorySummaryMapper.selectSumByItems(updateCriteria);
         //第一步：判断是否将报废区的数据也同样进行移库(flag=true表示将报废区的数量进行一起移动)
         boolean flag = oldSummaryList.stream()
                 .filter(oldsum -> oldsum.getBrokenNumber() > 0)

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

@@ -31,6 +31,10 @@ 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.dict.entity.SysDict;
+import com.junmp.v2.dict.entity.SysDictItem;
+import com.junmp.v2.dict.service.SysDictItemService;
+import com.junmp.v2.dict.service.SysDictService;
 import com.junmp.v2.file.api.constant.FileConstant;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
@@ -49,6 +53,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -104,6 +109,24 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private CabinetBoxPoliceService cabinetBoxPoliceService;
 
+    @Resource
+    private PolicemanService policemanService;
+
+    @Resource
+    private SysDictService sysDictService;
+
+    @Resource
+    private SysDictItemService sysDictItemService;
+
+    @Resource
+    private InventorySummaryMapper inventorySummaryMapper;
+
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+
+    @Resource
+    private OrderLogService orderLogService;
+
 
 
     private static final String REDIS_POLICE = "Policeman_";
@@ -244,11 +267,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
                 if (boxPolice.getContainType()==1){
                     soloList.add(boxPolice.getCabinetBoxId());
-                    soloName = soloName+ boxPolice.getCabinetName()+",";
+                    soloName = soloName + boxPolice.getCabinetName()+"，";
 
                 }else {
                     publicList.add(boxPolice.getCabinetBoxId());
-                    publicName = publicName+ boxPolice.getCabinetName()+",";
+                    publicName = publicName + boxPolice.getCabinetName()+"，";
                 }
             }
             policemanDto.setPublicBoxList(publicList);
@@ -456,8 +479,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         //查询传入的组织机构id是否存在
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         //查询出组织机构下的所有警员信息
-        Long pageNo = req.getPageNo();
-        Long pageSize = req.getPageSize();
         //排序字段（默认以用户状态进行排序）
         //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
         if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
@@ -470,10 +491,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             req.setOrder("desc");
             req.setColumn("create_time");
         }
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
         long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag());
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
-                        req.getState(),req.getPhone(),req.getFlag(),(pageNo-1),pageSize,req.getColumn(),req.getOrder());
+                        req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1),req.getPageSize(),req.getColumn(),req.getOrder());
        //判断是否需要添加空数据
         if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
             Class<PolicemanDto> policemanDto = PolicemanDto.class;
@@ -601,42 +626,39 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Transactional(rollbackFor = Exception.class)
     public boolean PoliceBindBox(PolicemanReq req) {
         Policeman policeman = PoliceExist(req.getId());
-        //判断箱子是否存在
+
+        Cabinet cabinet=new Cabinet();
+        //判断该警员是否是调入的警员，如果是调入警员，那么查询log表中是否有记录，如果有记录表示他携带装备
+        List<OrderLog> list = orderLogService.list(new LambdaQueryWrapper<OrderLog>()
+                .eq(OrderLog::getOrgId, req.getOrgId())
+                .eq(OrderLog::getOrderType, policeman.getName() + policeman.getPoliceCode())
+                .orderByDesc(OrderLog::getCreateTime));
+        List<PoliceEquipment> policeEqsList = policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>()
+                .eq(PoliceEquipment::getPoliceId, policeman.getId()));
+        String locationId = policeEqsList.get(0).getLocationId();
+        OrderLog orderLog=new OrderLog();
+        if (list.size()>0){
+             orderLog= list.get(0);
+        }
+        List<Object[]> searchItem=new ArrayList<>();
+        //判断调岗警员是否已经绑定了箱门
+        List<CabinetBoxPolice> list1 = cabinetBoxPoliceService.list(new LambdaQueryWrapper<CabinetBoxPolice>()
+                .eq(CabinetBoxPolice::getPoliceId, policeman.getId()));
+
         //判断箱门是否存在
-        boolean a=true;
+        boolean result=true;
+        //判断是否需要添加汇总信息标识
+        boolean flag=false;
         if (req.getBoxList().size()>0){
-//            List<String> cabinetIdList=new ArrayList<>();
-//            for (CabinetBoxReq cabinetBoxReq:req.getBoxList()) {
-//                if (cabinetIdList.size()==0){
-//                    cabinetIdList.add(cabinetBoxReq.getCabinetId());
-//                }
-//                if (!cabinetIdList.contains(cabinetBoxReq.getCabinetId())){
-//                    cabinetIdList.add(cabinetBoxReq.getCabinetId());
-//                }
-//            }
-//            List<Cabinet> list1 = cabinetService.list(new LambdaQueryWrapper<Cabinet>()
-//                    .in(Cabinet::getId, cabinetIdList)
-//                    .eq(Cabinet::getOrgIdInt, req.getOrgId()));
-//
-//
-//            List<String> collect1 = req.getBoxList().stream()
-//                    .map(CabinetBoxReq::getId)
-//                    .collect(Collectors.toList());
-//            List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
-//                    .notIn(CabinetBox::getId, collect1));
-//            if (list.size()>0){
-//                List<String> collect = list.stream()
-//                        .map(CabinetBox::getId)
-//                        .collect(Collectors.toList());
-//                String msg="以下箱门号不存在：" +String.join(",", collect);
-//                throw new JYZBAppException(CabinetBoxExceptionEnum.BOXS_ISNOT_EXISTS, msg);
-//            }
+
             //根据警员id和箱门id绑定公共柜
             List<CabinetBoxPolice> cabinetBoxPoliceList=new ArrayList<>();
             List<CabinetBoxReq> boxList = req.getBoxList();
 
             //将箱门全部清除
             cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getPoliceId, req.getId()));
+
+            //公共柜和单警柜一起批量绑定
             for (CabinetBoxReq boxReq:boxList ) {
                 CabinetBoxPolice cabinetBoxPolice = new CabinetBoxPolice();
                 cabinetBoxPolice.setPoliceId(req.getId());
@@ -647,19 +669,116 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                 cabinetBoxPolice.setNum(boxReq.getNum());
                 cabinetBoxPolice.setContainType(boxReq.getContainType());
                 cabinetBoxPoliceList.add(cabinetBoxPolice);
+
+                //调岗警员绑定第一个单警柜以后，不管之后他是否还有单警柜，我都默认是不绑了。
+                // 判断他下面是否有箱门，如果有则表示他已经帮过单警柜并且调岗携带的装备都已经记录过，那么将不再被记录
+                if (boxReq.getContainType()==1 && ObjectUtil.isNotNull(orderLog) && list1.size()==0 && !flag && ObjectUtil.isNotNull(locationId)){
+                    flag=true;
+                    cabinet = cabinetService.getById(boxReq.getCabinetId());
+                    for (PoliceEquipment equipment:policeEqsList) {
+                        equipment.setLocationId(boxReq.getCabinetId());
+                        equipment.setOrgId(req.getOrgId());
+                        Object[] item=new Object[]{req.getOrgId(),boxReq.getCabinetId(),equipment.getTypeId(),equipment.getSizeId(),equipment.getPrice()};
+                        searchItem.add(item);
+                    }
+                    policeEquipmentService.updateBatchById(policeEqsList);
+                }
             }
             if (cabinetBoxPoliceList.size()>0){
-               a= cabinetBoxPoliceService.saveBatch(cabinetBoxPoliceList);
+                result = cabinetBoxPoliceService.saveBatch(cabinetBoxPoliceList);
             }
         }else {
-           a= cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getPoliceId, req.getId()));
-
+            result = cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getPoliceId, req.getId()));
+
+        }
+
+        //判断summary表中是否有该警员的数据，如果有，summary表直接更新数据，如果summary表没有，那么直接新增一条数据
+        if (flag){
+            boolean b = updateSumDataAndLog(req.getOrgId(), cabinet, policeEqsList, searchItem);
+
+        }
+        return result;
+    }
+
+    //添加调岗第一次调入人员绑定箱门时修改装备汇总表的信息以及记录日志
+    private boolean updateSumDataAndLog(Long orgId,Cabinet cabinet,List<PoliceEquipment> policeEqsList,List<Object[]> searchItem){
+        PubOrg pubOrg = pubOrgService.PubOrgExist(orgId);
+        StringBuilder stringBuilder = new StringBuilder();
+        //将警员调岗携带的装备进行查询出来，并对summary表进行计算
+        List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
+        List<InventorySummary> addSumList=new ArrayList<>();
+        if (inventorySummaryList.size()>0){
+            for (PoliceEquipment equipment:policeEqsList) {
+                boolean a=false;
+                //找到库存汇总
+                for (InventorySummary is:inventorySummaryList) {
+                    if (equipment.getTypeId().equals(is.getTypeId())
+                            && equipment.getSizeId().equals(is.getSizeId())
+                            && equipment.getPrice().compareTo(is.getUnitPrice())==0){
+                        a=true;
+                        Integer totalNum=is.getNumber()+equipment.getNum();
+                        stringBuilder.append("将"+cabinet.getName()+"下的"+equipment.getTypeName()+equipment.getSizeName()+"装备的在库数量数量从"+is.getStockNumber()+"改成"+totalNum+"，并且修改了价格和总数；");
+                        is.setNumber(totalNum);
+                        is.setPrice(is.getPrice().add(equipment.getPrice().multiply(BigDecimal.valueOf(equipment.getNum()))));
+                        is.setStockNumber(is.getStockNumber()+equipment.getNum());
+                        break;
                     }
-
-        return a;
+                }
+                //没找到，直接新增
+                if (!a){
+                    stringBuilder.append("新增装备"+equipment.getTypeName()+equipment.getSizeName()+"，在库数为"+equipment.getNum()+"，并且修改了价格和总数；");
+                    InventorySummary inventorySummary = getInventorySummary(pubOrg, equipment, cabinet);
+                    addSumList.add(inventorySummary);
                 }
 
-
+            }
+        }else {
+            for (PoliceEquipment equipment:policeEqsList) {
+                stringBuilder.append("新增装备"+equipment.getTypeName()+equipment.getSizeName()+"，在库数为"+equipment.getNum()+"，并且修改了价格和总数；");
+                InventorySummary inventorySummary = getInventorySummary(pubOrg, equipment, cabinet);
+                addSumList.add(inventorySummary);
+            }
+        }
+        boolean a=true;
+        if (addSumList.size()>0){
+            a=inventorySummaryService.saveBatch(addSumList);
+        }
+        boolean b=true;
+        if (inventorySummaryList.size()>0){
+            b=inventorySummaryService.updateBatchById(inventorySummaryList);
+        }
+        //记录日志
+        OrderLog orderLog1 = new OrderLog();
+        orderLog1.setBussinessType("调入警员修改库存汇总");
+        orderLog1.setHistoryMsg(stringBuilder.toString());
+        orderLog1.setOrgId(pubOrg.getOrgId());
+        orderLog1.setOrgName(pubOrg.getOrgName());
+        orderLog1.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        boolean c = orderLogService.save(orderLog1);
+        return a && b && c;
+    }
+
+    private InventorySummary getInventorySummary(PubOrg pubOrg, PoliceEquipment equipment, Cabinet cabinet) {
+        InventorySummary inventorySummary = new InventorySummary();
+        inventorySummary.setValuekey(pubOrg.getOrgCode() + equipment.getSizeId());
+        inventorySummary.setOrgId(pubOrg.getOrgId());
+        inventorySummary.setOrgName(pubOrg.getOrgName());
+        inventorySummary.setOrgCode(pubOrg.getOrgCode());
+        inventorySummary.setTypeId(equipment.getTypeName());
+        inventorySummary.setTypeName(equipment.getTypeName());
+        inventorySummary.setSizeId(equipment.getSizeId());
+        inventorySummary.setSizeName(equipment.getSizeName());
+        inventorySummary.setLocationType("0");
+        inventorySummary.setLocationId(cabinet.getId());
+        inventorySummary.setLocationName(cabinet.getName());
+        inventorySummary.setNumber(equipment.getNum());
+        inventorySummary.setPrice(equipment.getPrice().multiply(BigDecimal.valueOf(equipment.getNum())));
+        inventorySummary.setUnitPrice(equipment.getPrice());
+        inventorySummary.setStockNumber(equipment.getNum());
+        inventorySummary.setOutboundNumber(0);
+        inventorySummary.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        return inventorySummary;
+    }
 
     /**
      * 通过警员id判断警员是否存在，不存在则抛出异常
@@ -693,35 +812,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     public boolean changePoliceOrg(UpdateReassignmentReq req) {
         //通过警员id查询出该警员的基本信息
         Policeman policeman = getById(req.getPoliceId());
+        SysDict sysDict = sysDictService.getOne(new LambdaQueryWrapper<SysDict>().eq(SysDict::getDictCode, "reassignment_type"));
+        List<SysDictItem> list = sysDictItemService.list(new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, sysDict.getDictId()));
+        String itemValue = list.get(0).getItemValue();
+        String itemValue1 = list.get(1).getItemValue();
+        StringBuilder stringBuilder = new StringBuilder();
+        Integer inventoryQuantity=0;
+        Integer actualQuantity=0;
+        List<PoliceEquipment> reqEquipments = JSON.parseArray(req.getDetailList(), PoliceEquipment.class);
         //判断是调入单还是调出单
         //0是调入警员，1是调出警员
-        if(req.getReassigmentType()==0){
+        if(req.getReassignmentType().equals(itemValue) && itemValue.equals("assign")){
             //添加账号和组织机构的绑定关系
             SysUserOrg sysUserOrg = new SysUserOrg();
             sysUserOrg.setOrgId(req.getOrgId());
             sysUserOrg.setUserId(policeman.getUserId());
             sysUserOrg.setCreateTime(DateTimeUtil.getCurrentDateTime());
             sysUserOrgService.save(sysUserOrg);
-
             //将警员中的组织机构id设置
             policeman.setOrgId(req.getOrgId());
-            //
-        }else {
+            //如果调入的警员携带装备,那么我应该怎么处理呢
+
+            stringBuilder.append("警员:"+req.getPoliceName()+",警号为："+req.getPoliceCode()+"因调岗携带以下装备:");
+
+            if(ObjectUtil.isNotNull(reqEquipments)){
+                for (PoliceEquipment equipment:reqEquipments) {
+                    stringBuilder.append("装备"+equipment.getTypeName()+","+equipment.getSizeName()+"数量为:"+equipment.getNum()+",");
+                    inventoryQuantity+=equipment.getNum();
+                    actualQuantity+=equipment.getNum();
+                }
+            }
+
+            //（调岗调入时在配置箱门的时候进行添加装备信息）
+
+        }else if (req.getReassignmentType().equals(itemValue1)  && itemValue1.equals("reassign")){
             //将其组织机构号设为空
             policeman.setOrgId(null);
+            //人脸信息删除
+            policeman.setFaceInfo(null);
             //将角色关联表进行删除
             //角色账号信息也进行删除
             sysUserOrgService.remove(new LambdaQueryWrapper<SysUserOrg>().eq(SysUserOrg::getUserId,policeman.getUserId()));
-//        sysUserRoleService.delByUserId(policeman.getUserId());
+
             //修改警员的个人信息(删除指纹信息)
             List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
                     .eq(PoliceFinger::getPoliceId, policeman.getId()));
             if (fingerList.size()!=0){
                 policeFingerService.removeBatchByIds(fingerList);
             }
-            //人脸信息删除
-            policeman.setFaceInfo(null);
-
+            //箱门进行解绑删除
             cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>()
                     .eq(CabinetBoxPolice::getPoliceId,policeman.getId()));
 
@@ -731,19 +870,32 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             //查询该警员是否存在装备信息，如果存在则进行删除
             List<PoliceEquipment> list1 = policeEquipmentService.list(eq);
             //判断前端传递的装备列表字段是否为空，如果为空则表示该警员不拿走任何装备信息
-            if (ObjectUtil.isNull(req.getEqsList()) && req.getEqsList().trim().isEmpty()){
+            if (ObjectUtil.isNull(req.getDetailList()) || req.getDetailList().trim().isEmpty()){
+                if (list1.size()>0){
                     policeEquipmentService.remove(eq);
+                    policemanService.removeBatchByIds(list1);
+                }
 
-            }else {//将该警员拿走的装备的组织机构设置为空，并且其他装备进行删除
+            } else {//将该警员拿走的装备的组织机构设置为空，并且其他装备进行跟警员进行解绑删除
                 List<PoliceEquipment> removeList=new ArrayList<>();
                 List<PoliceEquipment> updateList=new ArrayList<>();
-                List<PoliceEquipment> policeEquipments = JSON.parseArray(req.getEqsList(), PoliceEquipment.class);
+
+                List<Object[]> searchItem=new ArrayList<>();
+                stringBuilder.append("原组织机构为"+req.getOrgId()+"的警员"+req.getPoliceName()+",警号为："+req.getPoliceCode()+"因调岗拿走以下装备:");
                 for (PoliceEquipment policeEquipment:list1) {
                     boolean flag=false;
-                    for (PoliceEquipment one:policeEquipments) {
+                    for (PoliceEquipment one:reqEquipments) {
                         if (policeEquipment.getSizeId().equals(one.getSizeId())
                                 && policeEquipment.getTypeId().equals(one.getTypeId())){
+                            Object[] item=new Object[]{policeEquipment.getOrgId(),policeEquipment.getLocationId(),policeEquipment.getTypeId(),policeEquipment.getSizeId(),policeEquipment.getPrice(),one.getNum()};
+                            searchItem.add(item);
+                            stringBuilder.append("原有装备"+policeEquipment.getTypeName()+","+policeEquipment.getSizeName()+"数量为:"+policeEquipment.getNum()+",现拿走该物资,数量为:"+one.getNum()+",");
+                            inventoryQuantity+=policeEquipment.getNum();
+                            actualQuantity+=one.getNum();
                             policeEquipment.setNum(one.getNum());
+                            policeEquipment.setOrgId(null);
+                            policeEquipment.setLocationId(null);
+                            policeEquipment.setStorageLocation(null);
                             updateList.add(policeEquipment);
                             flag=true;
                             break;
@@ -756,7 +908,43 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                 policeEquipmentService.updateBatchById(updateList);
                 policeEquipmentService.removeBatchByIds(removeList);
 
+                //修改库存数量
+                List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
+                List<InventorySummary> updateSummaryList=new ArrayList<>();
+                for (InventorySummary is:inventorySummaryList) {
+                    for ( Object[] one: searchItem) {
+                        if (is.getLocationId().equals(one[1]) && is.getTypeId().equals(one[2])
+                                && is.getSizeId().equals(one[3]) && is.getUnitPrice().compareTo(new BigDecimal(one[4].toString()))==0){
+                            is.setOutboundNumber(is.getOutboundNumber()-Integer.parseInt(one[5].toString()));
+                            is.setNumber(is.getNumber()-Integer.parseInt(one[5].toString()));
+                            updateSummaryList.add(is);
+                            break;
+                        }
+                    }
+                }
+                if (updateSummaryList.size()>0){
+                    inventorySummaryService.updateBatchById(updateSummaryList);
+                }
+
             }
+            //记录日志(如果警员携带装备,则进行记录 )
+            if (ObjectUtil.isNotNull(reqEquipments)){
+                OrderLog orderLog = new OrderLog();
+                orderLog.setHistoryMsg(stringBuilder.toString());
+                orderLog.setOrgId(req.getOrgId());
+                //特殊记号，警员+警员编号
+                orderLog.setOrderType(req.getPoliceName()+req.getPoliceCode());
+                orderLog.setBussinessType(req.getReassignmentType());
+                orderLog.setOrderCode(req.getOrderCode());
+                orderLog.setOrderId(req.getId());
+                orderLog.setOrgName(req.getOrgName());
+                orderLog.setInventoryQuantity(inventoryQuantity);
+                orderLog.setActualQuantity(actualQuantity);
+                orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                orderLogService.save(orderLog);
+            }
+
+
         }
 
         return updateById(policeman);
@@ -765,10 +953,34 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     //获取警员下面的装备
     @Override
     public List<PoliceEquipment> GetPoliceEqs(QueryReassignmentReq req) {
-        LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>()
-                .eq(PoliceEquipment::getPoliceId, req.getPoliceId());
+        LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>();
+        if (ObjectUtil.isNotNull(req.getPoliceId() )&& ! req.getPoliceId().trim().isEmpty()){
+            Policeman policeman = policemanService.PoliceExist(req.getPoliceId());
+            eq.eq(PoliceEquipment::getPoliceId, policeman.getId());
+            return policeEquipmentService.list(eq);
+        }else {
+            if (ObjectUtil.isNotNull(req.getUserId() )&& ! req.getUserId().trim().isEmpty()){
+                //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
+                if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                        (req.getOrder().equalsIgnoreCase("desc") || req.getOrder().equalsIgnoreCase("asc"))
+                        && ObjectUtil.isNotNull(req.getOrder())&& !req.getOrder().trim().isEmpty()){
+                    req.setColumn(req.getColumn().replaceAll("[A-Z]","_$0").toLowerCase());
+                    req.setOrder(req.getOrder().toLowerCase());
+                }
+                Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>().eq(Policeman::getUserId, req.getUserId()));
+                eq.eq(PoliceEquipment::getPoliceId, one.getId())
+                        .like(ObjectUtil.isNotNull(req.getTypeName()),PoliceEquipment::getTypeName,req.getTypeName())
+                        .like(ObjectUtil.isNotNull(req.getSizeName()),PoliceEquipment::getSizeName,req.getSizeName())
+                        .last("order by "+req.getColumn()+ " "+req.getOrder());
                 return policeEquipmentService.list(eq);
             }
+            else {
+                throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
+            }
+
+        }
+
+    }
 
 
     @Override
@@ -837,7 +1049,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             startProcessInstanceDTO.setOrderType("reassigment");
             startProcessInstanceDTO.setUserId(req.getUserId());
             startProcessInstanceDTO.setBussinessType(req.getBussinessType());
-            startProcessInstanceDTO.setReassigmentType(req.getReassigmentType());
+            startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             reassignment.setProcessId(ProcessInstanceId);
             String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
@@ -861,8 +1073,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
         LambdaQueryWrapper<Reassignment> eq = new LambdaQueryWrapper<Reassignment>()
                 .eq(ObjectUtil.isNotNull(req.getOrgId()), Reassignment::getOrgId, req.getOrgId())
+                .eq(ObjectUtil.isNotNull(req.getReassignmentType()),Reassignment::getReassignmentType,req.getReassignmentType())
                 .eq(ObjectUtil.isNotNull(req.getExamineState()) && !req.getExamineState().trim().isEmpty(), Reassignment::getExamineState, req.getExamineState())
                 .like(ObjectUtil.isNotNull(req.getPoliceName()), Reassignment::getPoliceName, req.getPoliceName())
+                .like(ObjectUtil.isNotNull(req.getTypeName()),Reassignment::getInvList,req.getTypeName())
                 .ge(ObjectUtil.isNotNull(req.getStartTime()), Reassignment::getApplyTime, req.getStartTime())
                 .le(ObjectUtil.isNotNull(req.getEndTime()), Reassignment::getApplyTime, req.getEndTime())
                 .last("order by " + req.getColumn() + " " + req.getOrder());
@@ -931,7 +1145,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     //获取所有没有组织机构的警员信息
     @Override
     public List<Policeman> GetPoliceWithoutOrg() {
-        return list(new LambdaQueryWrapper<Policeman>().isNull(Policeman::getOrgId));
+        List<Policeman> list = list(new LambdaQueryWrapper<Policeman>().isNull(Policeman::getOrgId));
+        List<Policeman> collect = list.stream()
+                .peek(policeman -> {
+                    List<PoliceEquipment> list1 = policeEquipmentService.list(
+                            new LambdaQueryWrapper<PoliceEquipment>().eq(PoliceEquipment::getPoliceId, policeman.getId()));
+                    policeman.setPoliceEquipmentList(list1);
+                }).collect(Collectors.toList());
+        return collect;
     }
 
     //添加人脸和指纹照片或修改

jyzb-biz/src/main/java/com/junmp/jyzb/utils/ElasticsearchUtil.java

 package com.junmp.jyzb.utils;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -25,7 +26,7 @@ public class ElasticsearchUtil<T> {
         this.client = client;
     }
 
-    public List<T> searchEntities(String typeName,String index, Integer pageNum, Integer pageSize, String keyword, Class<T> entityClass) throws IOException {
+    public List<T> searchEntities(String typeName,String index, Integer pageNum, Integer pageSize,Integer type, String keyword, Class<T> entityClass) throws IOException {
         if (pageNum < 0) pageNum = 0;
 
         SearchRequest request = new SearchRequest(typeName);
@@ -44,6 +45,9 @@ public class ElasticsearchUtil<T> {
         {
             builder.postFilter(new TermQueryBuilder("delFlag", 1));
         }
+        if (ObjectUtil.isNotNull(type)){
+            builder.postFilter(new TermQueryBuilder("type",type));
+        }
 
         builder.query(boolQueryBuilder);
         builder.timeout(new TimeValue(60, TimeUnit.SECONDS));

jyzb-biz/src/main/java/com/junmp/jyzb/utils/RabbitMQSendMsg.java

 package com.junmp.jyzb.utils;
 
+import com.alibaba.fastjson.JSON;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.DirectExchange;
 import org.springframework.amqp.core.Exchange;
@@ -22,6 +23,7 @@ public class RabbitMQSendMsg {
         rabbitAdmin.declareQueue(queue);
         rabbitAdmin.declareExchange(exchange);
         rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with(name).noargs());
-            rabbitTemplate.convertAndSend(exchangeName, name, msg);
+        String jsonString = JSON.toJSONString(msg);
+        rabbitTemplate.convertAndSend(exchangeName, name, jsonString);
     }
 }

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

@@ -467,12 +467,14 @@
         </foreach>
     </select>
     <select id="selectEqsByItem" resultType="com.junmp.jyzb.entity.Inventory">
-        select * from base_inventory where
+        select * from base_inventory where (
         <foreach collection="list" item="item" separator="or">
             (
-            location_state = 'in' AND state = 'normal' AND org_id_int = ${item[0]} AND location_id = '${item[1]}' AND type_id = ${item[3]} AND size_id = '${item[2]}' AND unit_price = ${item[4]}
+            location_state = 'in' AND state = 'normal' AND org_id_int = ${item[0]} AND location_id = '${item[1]}' AND
+            type_id = ${item[3]} AND size_id = '${item[2]}' AND unit_price = ${item[4]}
             )
         </foreach>
+        )
     </select>
     <select id="GetInvInfoByEpc" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
         SELECT bi.*, po.org_name, es.name, et.name, bs.name, bw.name

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

@@ -283,9 +283,11 @@
         select * from base_inventory_summary where
         <foreach collection="list" item="item" separator="or">
             (
-            org_id_int = ${item[0]} AND location_id = '${item[1]}' AND type_id = ${item[2]} AND size_id = '${item[3]}' AND unit_price = ${item[4]}
+            org_id_int = ${item[0]} AND location_id = '${item[1]}' AND type_id = ${item[2]} AND size_id = '${item[3]}'
+            AND unit_price = ${item[4]}
             )
         </foreach>
+
     </select>
     <select id="getByOrgId" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto"
             parameterType="java.lang.Long">

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

@@ -72,6 +72,9 @@
         <if test="null !=  req.bussinessType  and '' != req.bussinessType  ">
         and bussiness_type = #{req.bussinessType}
         </if>
+        <if test="null !=  req.typeName  and '' != req.typeName  ">
+            and inv_list like concat('%',#{req.typeName},'%')
+        </if>
         <if test="req.startOrgId != null and req.startOrgId != ''">
         and start_org_id = #{req.startOrgId}
         </if>
@@ -81,7 +84,10 @@
         <if test="req.orderState !=null and req.orderState != ''">
         and order_state = #{req.orderState}
         </if>
-        <if test="req.examineState !=null and req.examineState != ''">
+        <if test=" req.examineState=='unaudited'">
+            and examine_state in('none','working')
+        </if>
+        <if test="req.examineState !=null and req.examineState != '' and req.examineState!='unaudited'">
             and examine_state = #{req.examineState}
         </if>
         <if test="req.startTime != null and req.startTime != ''">

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

@@ -251,7 +251,7 @@ WHERE o.org_id IN
     <select id="selectUserBypoliceIds" resultType="com.junmp.jyzb.api.bean.dto.PolicemanDto">
         select b.* FROM(
         select
-        su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.cabinet_box_id,p.police_code,
+        su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.police_code,
         p.face_info,p.password,p.photo,p.phone,p.id_card,p.identity,su.create_time,p.hk_face_device
         FROM sys_user su
         join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{orgId}
@@ -290,7 +290,7 @@ WHERE o.org_id IN
         select count(*) from(
         select b.* FROM
         (select
-        su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.cabinet_box_id,p.police_code,p.face_info,p.password,p.photo,p.phone,p.id_card,p.identity,p.hk_face_device
+        su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.police_code,p.face_info,p.password,p.photo,p.phone,p.id_card,p.identity,p.hk_face_device
         FROM sys_user su
         join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{orgId}
         left join base_policeman p on p.user_id=su.user_id

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/FlowTaskController.java

@@ -4,23 +4,28 @@ import com.junmp.junmpProcess.common.utils.ResponseResult;
 import com.junmp.junmpProcess.dto.ApplyDTO;
 import com.junmp.junmpProcess.dto.HandleDataDTO;
 import com.junmp.junmpProcess.dto.TaskDTO;
-import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.junmpProcess.service.IFlowTaskService;
+import com.junmp.junmpProcess.service.QuickSuggestionsService;
 import com.junmp.junmpProcess.vo.HistoryProcessInstanceVO;
 import com.junmp.junmpProcess.vo.RecordVO;
-import com.junmp.junmpProcess.vo.TaskDetailVO;
 import com.junmp.junmpProcess.vo.TaskVO;
+import com.junmp.jyzb.api.bean.dto.QuickSuggestionsDto;
+import com.junmp.jyzb.api.bean.query.QueryQuickSuggestionsReq;
+import com.junmp.jyzb.api.bean.req.UpdateQuickSuggestionsReq;
+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.beans.factory.annotation.Autowired;
+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;
 
 @Slf4j
@@ -30,6 +35,10 @@ import java.util.List;
 public class FlowTaskController {
     @Autowired
     private IFlowTaskService FlowTaskService;
+
+    @Resource
+    private QuickSuggestionsService quickSuggestionsService;
+
     @ApiOperation("同意按钮")
     @PostMapping("agree")
     public ResponseResult agree(@RequestBody HandleDataDTO handleDataDTO){
@@ -67,4 +76,23 @@ public class FlowTaskController {
 
         return FlowTaskService.record(handleDataDTO.getProcessInstanceId());
     }
+    //添加快选意见
+    @ApiOperation("添加快选意见")
+    @PostMapping("addQuickSuggestions")
+    public ApiRes<Long> addQuickSuggestions(@RequestBody @Validated(ValidationApi.add.class) UpdateQuickSuggestionsReq req){
+        return ApiRes.success(quickSuggestionsService.addQuickSuggestions(req));
+    }
+
+    //删除快选意见
+    @ApiOperation("删除快选意见")
+    @PostMapping("delQuickSuggestions")
+    public ApiRes<Boolean> delQuickSuggestions(@RequestBody @Validated(ValidationApi.delete.class) UpdateQuickSuggestionsReq req){
+        return ApiRes.success(quickSuggestionsService.delQuickSuggestions(req));
+    }
+    //查询快选意见
+    @ApiOperation("查询快选意见")
+    @PostMapping("showQuickSuggestions")
+    public ApiRes<List<QuickSuggestionsDto>> showQuickSuggestions(@RequestBody @Validated(ValidationApi.detail.class)QueryQuickSuggestionsReq req){
+        return ApiRes.success(quickSuggestionsService.showQuickSuggestions(req));
+    }
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -35,6 +35,6 @@ public class StartProcessInstanceDTO {
     private String outInState;
 
     //调岗类型，调入还是调出
-    private Integer reassigmentType;
+    private String reassignmentType;
 
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/QuickSuggestions.java

+package com.junmp.junmpProcess.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 快选意见表（审核流审批时的意见表）
+ * @TableName flw_quick_suggestions
+ */
+@TableName(value ="flw_quick_suggestions")
+@Data
+public class QuickSuggestions implements Serializable {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private Long userId;
+
+    /**
+     * 审批意见
+     */
+    @TableField(value = "text")
+    private String text;
+
+    /**
+     * 应用场景（1为审批时使用）
+     */
+    @TableField(value = "use_type")
+    private Integer useType;
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/QuickSuggestionsMapper.java

+package com.junmp.junmpProcess.mapper;
+
+import com.junmp.junmpProcess.entity.QuickSuggestions;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【flw_quick_suggestions(快选意见表（审核流审批时的意见表）)】的数据库操作Mapper
+* @createDate 2023-11-27 13:28:59
+* @Entity com.junmp.junmpProcess.entity.QuickSuggestions
+*/
+public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> {
+
+}
+
+
+
+

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

+package com.junmp.junmpProcess.service;
+
+import com.junmp.junmpProcess.entity.QuickSuggestions;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.QuickSuggestionsDto;
+import com.junmp.jyzb.api.bean.query.QueryQuickSuggestionsReq;
+import com.junmp.jyzb.api.bean.req.UpdateQuickSuggestionsReq;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【flw_quick_suggestions(快选意见表（审核流审批时的意见表）)】的数据库操作Service
+* @createDate 2023-11-27 13:28:59
+*/
+public interface QuickSuggestionsService extends IService<QuickSuggestions> {
+
+    Long addQuickSuggestions(UpdateQuickSuggestionsReq req);
+
+    boolean delQuickSuggestions(UpdateQuickSuggestionsReq req);
+
+    List<QuickSuggestionsDto> showQuickSuggestions(QueryQuickSuggestionsReq req);
+}

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

@@ -719,6 +719,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                                     taskDetailVO.setSignImage(comment1.getFullMessage());
                                 }
                             }
+                            String s = new String(comments.get(0).getFullMessage().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+                            System.out.println("s = " + s);
                             taskDetailVO.setComment(new String(comments.get(0).getFullMessage().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);

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

+package com.junmp.junmpProcess.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.junmpProcess.entity.QuickSuggestions;
+import com.junmp.junmpProcess.service.QuickSuggestionsService;
+import com.junmp.junmpProcess.mapper.QuickSuggestionsMapper;
+import com.junmp.junmpProcess.utils.DateTimeUtil;
+import com.junmp.jyzb.api.bean.dto.QuickSuggestionsDto;
+import com.junmp.jyzb.api.bean.query.QueryQuickSuggestionsReq;
+import com.junmp.jyzb.api.bean.req.UpdateQuickSuggestionsReq;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import org.joda.time.DateTimeUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【flw_quick_suggestions(快选意见表（审核流审批时的意见表）)】的数据库操作Service实现
+* @createDate 2023-11-27 13:28:59
+*/
+@Service
+public class QuickSuggestionsServiceImpl extends ServiceImpl<QuickSuggestionsMapper, QuickSuggestions>
+    implements QuickSuggestionsService{
+
+
+
+    //新增
+    @Override
+    public Long addQuickSuggestions(UpdateQuickSuggestionsReq req) {
+        QuickSuggestions quickSuggestions = new QuickSuggestions();
+        BeanPlusUtil.copyProperties(req,quickSuggestions);
+        quickSuggestions.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        save(quickSuggestions);
+        return quickSuggestions.getId();
+    }
+
+    //删除
+    @Override
+    public boolean delQuickSuggestions(UpdateQuickSuggestionsReq req) {
+        return removeById(req.getId());
+    }
+
+    //查询
+    @Override
+    public List<QuickSuggestionsDto> showQuickSuggestions(QueryQuickSuggestionsReq req) {
+        List<QuickSuggestions> list = list(new LambdaQueryWrapper<QuickSuggestions>()
+                .eq(QuickSuggestions::getUserId, req.getUserId()));
+        List<QuickSuggestionsDto> collect = list.stream().map(quickSuggestions -> {
+            QuickSuggestionsDto quickSuggestionsDto = new QuickSuggestionsDto();
+            BeanPlusUtil.copyProperties(quickSuggestions, quickSuggestionsDto);
+            return quickSuggestionsDto;
+        }).collect(Collectors.toList());
+        return collect;
+    }
+}
+
+
+
+

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/DateTimeUtil.java

+package com.junmp.junmpProcess.utils;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class DateTimeUtil {
+    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    public static Date getCurrentDateTime() {
+        Date currentDate = new Date();
+        String dateString = DATE_FORMAT.format(currentDate);
+        try {
+            return DATE_FORMAT.parse(dateString);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static List<Map<String,Object>> timeSort(List<Map<String,Object>> allPoliceman) {
+        Collections.sort(allPoliceman, new Comparator<Map<String, Object>>() {
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Date updateTime1 = (Date) o1.get("updateTime");
+                Date updateTime2 = (Date) o2.get("updateTime");
+                return updateTime2.compareTo(updateTime1);
+            }
+        });
+        return allPoliceman;
+    }
+
+}
\ No newline at end of file

jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.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.junmpProcess.mapper.QuickSuggestionsMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.junmpProcess.entity.QuickSuggestions">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="text" column="text" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,text,
+        create_time,update_time
+    </sql>
+</mapper>