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/TjDto/FinalTjOrgPoliceDto.java

@@ -7,7 +7,7 @@ public class FinalTjOrgPoliceDto {
     private String policeId;
     private String policeName;
     private String policeCode;
-    private Integer number;
-    private Integer inStockNum;
-    private Integer outStockNum;
+    private Integer num;
+    private Integer inNum;
+    private Integer outNum;
 }

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

@@ -12,4 +12,7 @@ public class TjOrgPoliceDto {
     private String typeName;
     private String locationId;
     private String locationName;
+    private Integer num;
+    private Integer inNum;
+    private Integer outNum;
 }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CabinetLogsRecordReq {
@@ -15,6 +16,8 @@ public class CabinetLogsRecordReq {
     private String picUrl;
     private Date createTime;
     private String equipmentList;
+    private List<SummaryLogReq> outInLogList;
+    private List<EquipmentSumreq> equipmentSum;
 
 
 }

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

+package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
+
+import lombok.Data;
+
+@Data
+public class EquipmentSumreq {
+    private Integer outNum;
+    private Integer inNum;
+    private String sizeId;
+    private String sizeName;
+    private String typpeId;
+    private String typeName;
+}

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

@@ -20,7 +20,10 @@ public class SummaryLogReq {
     private Date useTime;
     private String picture;
     private String equipmentList;
+    //本地主机使用：汇总数量
     private Integer number;
+    //单警柜使用：汇总数量
+    private Integer num;
     //业务类型
     private String bussinessType;
     //设备标识
@@ -34,4 +37,6 @@ public class SummaryLogReq {
     private Integer locationType;
     private List<DetailLogReq> logDetailList;
     private List<LogSummarySecondReq> sumInfoList;
+
+    private List<String> epcList;
 }

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

@@ -70,5 +70,7 @@ public class PolicemanReq extends BaseRequest {
 
     private List<String> roleCodeList;
 
+    private Long userId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

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

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

@@ -16,7 +16,7 @@ public class UpdateEquipmentSizeReq {
     private String id;
     @NotBlank(message = "装备类型id不能为空", groups = {ValidationApi.edit.class,  ValidationApi.add.class})
     private String typeId;
-    @NotBlank(message = "编码不能为空", groups = {ValidationApi.edit.class,  ValidationApi.add.class})
+
     private String code;
     @NotBlank(message = "名称不能为空", groups = {ValidationApi.edit.class,  ValidationApi.add.class})
     private String name;

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

@@ -82,5 +82,6 @@ public class UpdateOrderDetailReq implements Serializable {
     private Integer maintenancePeriod;
 
     private String remark;
+    private Long orgId;
 
 }

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

@@ -4,6 +4,7 @@ import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
@@ -144,28 +145,28 @@ public class TjController {
     /**
      * --------------------------------------人员统计报表-------------------------------------------
      */
-//    @PostMapping("/TjOrgPolice")
-//    @ApiOperation("/人员统计报表")
-//    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPolice(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPolice(req));
-//    }
-//    @PostMapping("/TjOrgPoliceSum")
-//    @ApiOperation("/人员统计报表汇总")
-//    public ApiRes<FinalTjOrgPoliceDto> TjOrgPoliceSum(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceSum(req));
-//    }
-//
-//    //财务统计报表（点击+后里面的数据）
-//    @PostMapping("/TjOrgPoliceDetailPage")
-//    @ApiOperation("/查询组织机构下的人员统计明细")
-//    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
-//    }
-//    @PostMapping("/TjOrgPoliceDetailList")
-//    @ApiOperation("/查询组织机构下的人员统计明细")
-//    public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceDetailList(req));
-//    }
+    @PostMapping("/TjOrgPolice")
+    @ApiOperation("/人员统计报表")
+    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPolice(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPolice(req));
+    }
+    @PostMapping("/TjOrgPoliceSum")
+    @ApiOperation("/人员统计报表汇总")
+    public ApiRes<FinalTjOrgPoliceDto> TjOrgPoliceSum(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceSum(req));
+    }
+
+    //人员统计报表（点击+后里面的数据）
+    @PostMapping("/TjOrgPoliceDetailPage")
+    @ApiOperation("/查询组织机构下的人员统计明细")
+    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
+    }
+    @PostMapping("/TjOrgPoliceDetailList")
+    @ApiOperation("/查询组织机构下的人员统计明细")
+    public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceDetailList(req));
+    }
 
 
 

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

@@ -78,8 +78,8 @@ public class PoliceEquipment implements Serializable {
     /**
      * 装备存放位置
      */
-    @TableField(value = "storage_location",updateStrategy = FieldStrategy.IGNORED)
-    private String storageLocation;
+    @TableField(value = "location_name",updateStrategy = FieldStrategy.IGNORED)
+    private String locationName;
 
     //装备单价
     @TableField("price")

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

@@ -43,6 +43,10 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
     void deleteAll(@Param("orgId") Long orgId);
 
     List<TjOrgCountDto> TjOrgCountByType(@Param("req") TjOrgCountReq req);
+
+    void setSizeName(@Param("sizeId") String id,@Param("sizeName") String name);
+
+    void setTypeName(@Param("typeId") String id,@Param("typeName") String name);
 }
 
 

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

 package com.junmp.jyzb.mapper;
 
+import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPoliceDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPoliceDto;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author lxh专属坐骑
@@ -11,6 +17,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface PoliceEquipmentMapper extends BaseMapper<PoliceEquipment> {
 
+    int getCount(@Param("req") TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPolice(@Param("req") TjOrgPoliceReq req,@Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
+
+    FinalTjOrgPoliceDto TjOrgPoliceSum(@Param("req") TjOrgPoliceReq req);
+
+    int TjOrgPoliceDetailSum(@Param("req") TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPoliceDetail(@Param("req") TjOrgPoliceReq req,@Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
 }
 
 

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

@@ -49,7 +49,7 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
 
     List<PolicemanDto> selectUserBypoliceIds(@Param("orgId") Long orgId, @Param("account")String account,
                                              @Param("name") String name, @Param("policeCode")String policeCode,
-                                             @Param("state")Integer state,
+                                             @Param("state")Integer state,@Param("userId") Long userId,
                                              @Param("phone")String phone,@Param("flag") String flag,
                                              @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize,
                                              @Param("column") String column,@Param("order") String order,
@@ -57,7 +57,7 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
 
     long count(@Param("orgId") Long orgId, @Param("account")String account,
                @Param("name") String name, @Param("policeCode")String policeCode,
-               @Param("state")Integer state,
+               @Param("state")Integer state,@Param("userId") Long userId,
                @Param("phone")String phone,@Param("flag") String flag,
                @Param("roleCodeList") List<String> roleCodeList);
 

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

@@ -47,4 +47,8 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
     FinalTjOrgPriceDto TjOrgPriceSum(@Param("orgId") Long orgId,@Param("year") Integer year,
                                      @Param("typeIdsList") List<String> typeIdsList,
                                      @Param("sizeNameList") List<String> sizeNameList);
+
+    void setSizeName(@Param("sizeId") String id, @Param("sizeName") String name);
+
+    void setTypeName(@Param("typeId") String id, @Param("typeName") String name);
 }

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

 package com.junmp.jyzb.rabbitmq;
 
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
+import com.alibaba.fastjson.JSON;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.service.InventorySummaryService;
 import com.rabbitmq.client.Channel;
@@ -21,21 +22,19 @@ public class CabinetLogReceiver {
     @Resource
     private InventorySummaryService inventorySummaryService;
 
-    @RabbitListener(queues = "11111")//监听队列名
-    private void a(CabinetInOutRecordsReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
+    @RabbitListener(queues = "CabinetLogsRecord")//监听队列名
+    private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {
-            System.out.println("req = " + req);
-            //将消息进行消费
-            Boolean result = inventorySummaryService.cabinetInOutRecords(req);
-            if (result){
+            System.out.println("msg = " + msg);
             // 手动确认消息
             channel.basicAck(deliveryTag, false);
-            }else {
-                channel.basicNack(deliveryTag, false, true);
-            }
+            CabinetLogsRecordReq req = JSON.parseObject(msg, CabinetLogsRecordReq.class);
+            //将消息进行消费
+            Boolean result = inventorySummaryService.cabinetInOutRecords(req);
+
         } catch (Exception e) {
-            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
+            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列ms
             try {
                 channel.basicNack(deliveryTag, false, true);
             } catch (IOException ex) {

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

 package com.junmp.jyzb.rabbitmq;
 
 import com.alibaba.fastjson.JSON;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
+import com.junmp.jyzb.service.LogSummaryService;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -16,6 +19,9 @@ import java.io.IOException;
 @Component
 public class OutInLogsByCabinetReceiver {
 
+    @Resource
+    private LogSummaryService logSummaryService;
+
     @RabbitListener(queues = "CabinetLogsRecord")//监听队列名
     private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
@@ -23,9 +29,9 @@ public class OutInLogsByCabinetReceiver {
             System.out.println("msg = " + msg);
             // 手动确认消息
             channel.basicAck(deliveryTag, false);
-            OutInLogsReq req = JSON.parseObject(msg, OutInLogsReq.class);
+            CabinetLogsRecordReq req = JSON.parseObject(msg, CabinetLogsRecordReq.class);
             //将消息进行消费
-//            Boolean result = logSummaryService.processInventoryRecords(req);
+            Boolean result = logSummaryService.processOutInRecords(req);
 
         } catch (Exception e) {
             // 处理消息过程中发生异常，拒绝消息并将其重新放回队列ms

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
-import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
-import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
-import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.v2.db.api.page.PageResult;
-import liquibase.pro.packaged.L;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -35,7 +28,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     Boolean updateSummaryInsByOrder(Long orgId);
 
     //处理单警柜返回单据结果
-    Boolean cabinetInOutRecords(CabinetInOutRecordsReq req);
+    Boolean cabinetInOutRecords(CabinetLogsRecordReq req);
 
     //根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额
     List<InventorySummary> getTotalNumberAndPrice(InventorySumReq req);

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

 package com.junmp.jyzb.service;
 
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.api.bean.query.LogSummaryReq;
 import com.junmp.jyzb.entity.LogSummary;
@@ -18,4 +19,6 @@ public interface LogSummaryService extends IService<LogSummary> {
     //本地主机返回出入库结果
     Boolean processInventoryRecords(OutInLogsReq req);
 
+    //单警柜返回出入库结果
+    Boolean processOutInRecords(CabinetLogsRecordReq req);
 }

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

@@ -5,6 +5,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.v2.db.api.page.PageResult;
 
@@ -14,7 +15,6 @@ public interface TjService {
 
     List<TjOrgEqsDto> showOrgEqsList(InventoryReq req);
 
-//    List<TjOrgEqsDto> test(InventoryReq req);
     FinalTjOrgEqsDto test(TjOrgEqsReq req);
 
     //装备统计报表
@@ -46,4 +46,12 @@ public interface TjService {
     List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
 
     List<TjOutAndInDto> TjOutAndInCount(TjOrgCountReq req);
+
+    PageResult<TjOrgPoliceDto> TjOrgPolice(TjOrgPoliceReq req);
+
+    FinalTjOrgPoliceDto TjOrgPoliceSum(TjOrgPoliceReq req);
+
+    PageResult<TjOrgPoliceDto> TjOrgPoliceDetailPage(TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req);
 }

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

@@ -2,6 +2,7 @@ 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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.SizeRepository;
@@ -14,10 +15,15 @@ import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.EquipmentType;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
+import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
 import com.junmp.jyzb.service.EquipmentSizeService;
 import com.junmp.jyzb.service.EquipmentTypeService;
+import com.junmp.jyzb.service.InventorySummaryService;
 import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.jyzb.utils.RabbitMQSendMsg;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -27,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.EquipmentSizeMapper;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -46,6 +53,18 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     @Autowired
     private SizeRepository sizeRepository;
 
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+
+    @Resource
+    private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
+
+    @Resource
+    private PriceSumSummaryMapper priceSumSummaryMapper;
+
+    @Autowired
+    private RabbitMQSendMsg MQ;
+
     @Override
     public Object addEs() {
         QueryEquipmentTypeReq req =new QueryEquipmentTypeReq();
@@ -62,15 +81,24 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         }
         //判断同一个typeId下面是否有相同的name，如果有则添加失败
         List<EquipmentSize> list = list(new LambdaQueryWrapper<EquipmentSize>()
-                .eq(EquipmentSize::getName, req.getName())
-                .eq(EquipmentSize::getTypeId,req.getTypeId()));
+                .eq(EquipmentSize::getTypeId,req.getTypeId())
+                .orderByDesc(EquipmentSize::getCode));
+        String code="0";
         if (list.size()>0){
+            int i = Integer.parseInt(list.get(0).getCode());
+            code=String.valueOf(i+1);
+            for (EquipmentSize size: list) {
+                if (size.getName().equals(req.getName())){
                     throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_NAME_CODE_EXIST);
                 }
+            }
+        }
+        
         EquipmentSize size = new EquipmentSize();
         String sizeID=UUID.randomUUID().toString();
         BeanPlusUtil.copyProperties(req, size);
         size.setId(sizeID);
+        size.setCode(code);
         size.setCreateTime(DateTimeUtil.getCurrentDateTime());
         size.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         this.save(size);
@@ -91,6 +119,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateSize(UpdateEquipmentSizeReq req) {
         //判断输入的typeId是否存在，如果不存在抛出异常
         EquipmentType one = equipmentTypeService.getById(req.getTypeId());
@@ -98,9 +127,21 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
             throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
         }
         EquipmentSize size = this.querySize(req);
+        //判断两者的名称是否一致，如果一致，则直接改动summary表中的数据以及所有涉及到名称的装备数据表
+        if (!size.getName().equals(req.getName())){
+            inventorySummaryService.update(new LambdaUpdateWrapper<InventorySummary>()
+                    .set(InventorySummary::getSizeName,req.getName())
+                    .eq(InventorySummary::getSizeId,req.getId()));
+            priceSumSummaryMapper.setSizeName(req.getId(),req.getName());
+            equipmentCountSummaryMapper.setSizeName(req.getId(),req.getName());
+        }
+
         BeanPlusUtil.copyProperties(req, size);
         size.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         sizeRepository.save(size);
+        //推送消息通知
+//        MQ.SendMsg();
+
         return this.updateById(size);
     }
 

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

@@ -2,6 +2,7 @@ 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.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.TypeRepository;
 import com.junmp.jyzb.api.bean.dto.ESTypeDto;
@@ -13,7 +14,10 @@ import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.api.exception.JYZBAppException;
 import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
+import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
 import com.junmp.jyzb.service.EquipmentTypeService;
+import com.junmp.jyzb.service.InventorySummaryService;
 import com.junmp.jyzb.service.SupplierService;
 import com.junmp.jyzb.service.SupplierTypeService;
 import com.junmp.jyzb.utils.*;
@@ -45,6 +49,12 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     private SupplierService supplierService;
     @Resource
     private SupplierTypeService supplierTypeService;
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+    @Resource
+    private PriceSumSummaryMapper priceSumSummaryMapper;
+    @Resource
+    private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
     private static final String REDIS_TYPE = "Type_";
     private List<EquipmentTypeDto> typeDto;
     private ArrayList<String> ids;
@@ -144,6 +154,14 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         List<String> chekResult = supplierService.CheckSupplierList(req.getSupplierList());
         if (chekResult.size() == 0) {
             // 先增加code码
+            //判断两者的名称是否一致，如果一致，则直接改动summary表中的数据
+            if (!type.getName().equals(req.getName())){
+                inventorySummaryService.update(new LambdaUpdateWrapper<InventorySummary>()
+                        .set(InventorySummary::getTypeName,req.getName())
+                        .eq(InventorySummary::getTypeId,req.getId()));
+                priceSumSummaryMapper.setTypeName(req.getId(),req.getName());
+                equipmentCountSummaryMapper.setTypeName(req.getId(),req.getName());
+            }
             BeanPlusUtil.copyProperties(req, type);
 
             // 获取当前type对应的所有关联的供应商

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

@@ -9,10 +9,10 @@ import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.entity.*;
@@ -203,26 +203,26 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     //单警柜返回数据
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean cabinetInOutRecords(CabinetInOutRecordsReq req) {
+    public Boolean cabinetInOutRecords(CabinetLogsRecordReq req) {
         //批量修改装备信息
-        List<InventoryReq> inventoryList = req.getInventoryList();
+//        List<InventoryReq> inventoryList = req.getInventoryList();
         boolean a=true;
-        List<Inventory> inventoryLogsList=new ArrayList<>();
-        for (InventoryReq inventoryReq:inventoryList) {
-            Inventory inventory = new Inventory();
-            BeanPlusUtil.copyProperties(inventoryReq,inventory);
-            boolean result = inventoryService.saveOrUpdate(inventory);
-            inventoryLogsList.add(inventory);
-            if (!result){
-                a=false;
-                break;
-            }
-        }
+//        List<Inventory> inventoryLogsList=new ArrayList<>();
+//        for (InventoryReq inventoryReq:inventoryList) {
+//            Inventory inventory = new Inventory();
+//            BeanPlusUtil.copyProperties(inventoryReq,inventory);
+//            boolean result = inventoryService.saveOrUpdate(inventory);
+//            inventoryLogsList.add(inventory);
+//            if (!result){
+//                a=false;
+//                break;
+//            }
+//        }
         //修改summary表中数据
 //        boolean b = updateSummaryInsByCabinet(req.getLocationId());
         //添加日志记录、
-        Boolean c = insertCabinetLog(req,inventoryLogsList);
-        return (a  && c);
+//        Boolean c = insertCabinetLog(req,inventoryLogsList);
+        return (a  );
     }
 
 
@@ -247,7 +247,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     }
 
     //添加单警柜出入库记录日志
-    public Boolean insertCabinetLog(CabinetInOutRecordsReq req,List<Inventory> inventoryLogsList){
+    public Boolean insertCabinetLog(CabinetLogsRecordReq req,List<Inventory> inventoryLogsList){
 
         LogSummary logSummary = new LogSummary();
         BeanPlusUtil.copyProperties(req,logSummary);
@@ -258,7 +258,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
             LogDetail logDetail = new LogDetail();
             BeanPlusUtil.copyProperties(inventory,logDetail);
             logDetail.setInventoryId(inventory.getId());
-            logDetail.setCabinetboxId(req.getLocationId());
+//            logDetail.setCabinetboxId(req.getLocationId());
             logDetail.setOutInState(inventory.getLocationState());
             logDetail.setSummaryId(logSummary.getId());
             logDetailList.add(logDetail);

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

@@ -215,7 +215,12 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         return a && b && c && c1 && d;
     }
 
-//    对出入库记录进行分类汇总存储()
+    @Override
+    public Boolean processOutInRecords(CabinetLogsRecordReq req) {
+        return null;
+    }
+
+    //    对出入库记录进行分类汇总存储()
     public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
         //返回结果，用于日常出入库时计算更新库存汇总表
         List<SummaryLogReq> logSummaryList = req.getLogList();

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

@@ -144,7 +144,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public List<String> AddOrder(UpdateOrderReq req) {
         //判断该单子是否是销毁出库单，如果是，则直接查询然后相应的库存进行修改，如果库存不足的情况下直接抛出异常提示
         if (req.getBussinessType().equals("destruction") && ObjectUtil.isNotEmpty(req.getProcessDefinitionId())){
-            Boolean aBoolean= addOrRevokeAgentDestructionNum(req,true);
+            Boolean aBoolean= addOrRevokeAgentDestructionNum(req);
         }
         //修改单据使用次数状态，判断数据库是否有该单据，如果有，那么就判断当前单号是否一致，如果不一致，修改单据使用次数
         Long orgId=0L;
@@ -321,7 +321,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         return list;
     }
 
-    public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req, boolean flag){
+    public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req){
         List<UpdateOrderDetailReq> list = req.getDetailList();
         List<Object[]> searchItem=new ArrayList<>();
         for (UpdateOrderDetailReq detialReq:list) {
@@ -347,12 +347,14 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     }else {
                         is.setDestructionNumber(is.getDestructionNumber()+detialReq.getPlanNum());
                         is.setNumber(is.getNumber() - detialReq.getPlanNum());
-                    }
-
+                        is.setStockNumber(is.getStockNumber() - detialReq.getPlanNum());
+                        is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
+                        is.setDestructionPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getDestructionNumber())));
 
                     }
                     break;
                 }
+            }
 
         }
         if (!msg.trim().isEmpty()){
@@ -372,7 +374,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         startProcessInstanceDTO.setInvList(req.getInvList());
         startProcessInstanceDTO.setOutInState(req.getOrderType());
         startProcessInstanceDTO.setType("orderDto");
-
+        startProcessInstanceDTO.setBussinessType(req.getBussinessType());
         if (req.getOrderType().equals("in")){
             //发物单位和收物单位
             switch (req.getBussinessType()){
@@ -924,15 +926,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         }
         //如果是领用，警员绑定装备
         boolean e=true;
-        if (req.getBussinessType().equals("use")){
-
-            e = policeBindEqs(req, reqList, orgId);
-        }
-        //如果是归还入库，将警员下面的装备进行处理
+//        if (req.getBussinessType().equals("use")){
+//
+//            e = policeBindEqs(req, reqList, orgId);
+//        }
+//        //如果是归还入库，将警员下面的装备进行处理
         boolean f=true;
-        if (req.getBussinessType().equals("return")){
-            f = policeUnBindEqs(req, reqList, orgId);
-        }
+//        if (req.getBussinessType().equals("return")){
+//            f = policeUnBindEqs(req, reqList, orgId);
+//        }
 
         //记账结束之后往消息队列中推送一条消息
         String exchangeName="orderExchange";
@@ -1109,10 +1111,16 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     }else {
                         switch (req.getBussinessType()){
                             case "destruction":
-                                is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())));
+                                //我先把库存数量加回来，然后根据实际出库数量进行删减
+                                is.setDestructionNumber(is.getDestructionNumber() - upReq.getPlanNum());
+                                is.setNumber(is.getNumber() + upReq.getPlanNum());
+                                is.setStockNumber(is.getStockNumber() + upReq.getPlanNum());
+
                                 is.setNumber(is.getNumber()-upReq.getModifyQuantity());
+                                is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
                                 is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());
                                 is.setDestructionNumber(is.getDestructionNumber()+upReq.getModifyQuantity());
+                                is.setDestructionNumberPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getDestructionNumber())));
                                 break;
                             case "allocate":
                                 is.setNumber(is.getNumber()-upReq.getModifyQuantity());
@@ -1146,9 +1154,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                 is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());
                                 is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())) );
                                 break;
-                            case "quick":
-
-                                break;
+//                            case "quick":
+//
+//                                break;
                         }
                     }
                     updateList.add(is);

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

@@ -506,7 +506,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
-                        req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
+                        req.getState(),req.getUserId(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
                         ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleCodeList());
         return policemanDtos;
     }
@@ -533,10 +533,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             req.setPageNo(1L);
             req.setPageSize(10L);
         }
-        long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag(),req.getRoleCodeList());
+        long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getUserId(),req.getPhone(),req.getFlag(),req.getRoleCodeList());
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
-                        req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
+                        req.getState(),req.getUserId(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
                         ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleCodeList());
        //判断是否需要添加空数据
         if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
@@ -932,7 +932,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                             policeEquipment.setNum(one.getNum());
                             policeEquipment.setOrgId(null);
                             policeEquipment.setLocationId(null);
-                            policeEquipment.setStorageLocation(null);
+//                            policeEquipment.setStorageLocation(null);
                             updateList.add(policeEquipment);
                             flag=true;
                             break;

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

@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.EquipmentSizeService;
@@ -38,6 +39,9 @@ public class TjServiceImpl implements TjService {
     @Resource
     private LogSummaryMapper logSummaryMapper;
 
+    @Resource
+    private PoliceEquipmentMapper policeEquipmentMapper;
+
 
     //装备统计报表
     @Override
@@ -414,4 +418,50 @@ public class TjServiceImpl implements TjService {
         List<TjOutAndInDto> returnList=logSummaryMapper.TjOutAndInCount(req);
         return returnList;
     }
+
+
+
+    @Override
+    public PageResult<TjOrgPoliceDto> TjOrgPolice(TjOrgPoliceReq req) {
+        int size=policeEquipmentMapper.getCount(req);
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        List<TjOrgPoliceDto> list= policeEquipmentMapper.TjOrgPolice(req,(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
+        Page<TjOrgPoliceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(list);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public FinalTjOrgPoliceDto TjOrgPoliceSum(TjOrgPoliceReq req) {
+        FinalTjOrgPoliceDto finalTjOrgPoliceDto=policeEquipmentMapper.TjOrgPoliceSum(req);
+        if (ObjectUtil.isNotNull(finalTjOrgPoliceDto)){
+            return finalTjOrgPoliceDto;
+        }else {
+            return new FinalTjOrgPoliceDto();
+        }
+    }
+
+    @Override
+    public PageResult<TjOrgPoliceDto> TjOrgPoliceDetailPage(TjOrgPoliceReq req) {
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        int size = policeEquipmentMapper.TjOrgPoliceDetailSum(req);
+        List<TjOrgPoliceDto> returnList=policeEquipmentMapper.TjOrgPoliceDetail(req,(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
+        Page<TjOrgPoliceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(returnList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req) {
+        List<TjOrgPoliceDto> returnList=policeEquipmentMapper.TjOrgPoliceDetail(req,null,null);
+        return returnList;
+    }
 }

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

@@ -35,6 +35,16 @@
         type_id,type_name,number,
         update_time
     </sql>
+    <update id="setSizeName">
+        update vie_price_sum_summary
+        set size_name=#{sizeName}
+        where size_id ={sizeId}
+    </update>
+    <update id="setTypeName">
+        update vie_price_sum_summary
+        set type_name=#{typeName}
+        where type_id ={typeId}
+    </update>
     <delete id="deleteAll">
         delete from vie_equipment_count_summary where
         <if test="orgId!=null and orgId != ''">

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

@@ -20,4 +20,7 @@
         num,org_id,equipment_name,
         update_time,create_time
     </sql>
+    <select id="TjOrgPolice" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPoliceDto">
+
+    </select>
 </mapper>

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

@@ -272,19 +272,22 @@ WHERE o.org_id IN
             </if>
             where 1=1
             <if test="account!=null and account!=''">
-                and su.account like CONCAT('%', #{account}, '%')
+                and a.account like CONCAT('%', #{account}, '%')
             </if>
             <if test="policeCode!=null and policeCode!=''">
-                and p.police_code like CONCAT('%', #{policeCode}, '%')
+                and a.police_code like CONCAT('%', #{policeCode}, '%')
             </if>
             <if test="name!=null and name!=''">
-                and p.name like CONCAT('%', #{name}, '%')
+                and a.name like CONCAT('%', #{name}, '%')
             </if>
             <if test="phone!=null and phone!=''">
-                and p.phone like CONCAT('%', #{phone}, '%')
+                and a.phone like CONCAT('%', #{phone}, '%')
             </if>
             <if test="state!=null and state!=''">
-                and su.status_flag=#{state}
+                and a.state=#{state}
+            </if>
+            <if test="userId != null and userId!= ''">
+                and a.user_id =#{userId}
             </if>
             GROUP BY a.user_id, a.account, a.org_id, a.nick_name
         ) as b
@@ -323,19 +326,22 @@ WHERE o.org_id IN
                 </if>
                 where 1=1
                 <if test="account!=null and account!=''">
-                    and su.account like CONCAT('%', #{account}, '%')
+                    and a.account like CONCAT('%', #{account}, '%')
                 </if>
                 <if test="policeCode!=null and policeCode!=''">
-                    and p.police_code like CONCAT('%', #{policeCode}, '%')
+                    and a.police_code like CONCAT('%', #{policeCode}, '%')
                 </if>
                 <if test="name!=null and name!=''">
-                    and p.name like CONCAT('%', #{name}, '%')
+                    and a.name like CONCAT('%', #{name}, '%')
                 </if>
                 <if test="phone!=null and phone!=''">
-                    and p.phone like CONCAT('%', #{phone}, '%')
+                    and a.phone like CONCAT('%', #{phone}, '%')
                 </if>
                 <if test="state!=null and state!=''">
-                    and su.status_flag=#{state}
+                    and a.state=#{state}
+                </if>
+                <if test="userId != null and userId!= ''">
+                    and a.user_id =#{userId}
                 </if>
                 GROUP BY a.user_id, a.account, a.org_id, a.nick_name
             ) as b

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.PriceSumSummaryMapper">
+    <update id="setSizeName">
+        update vie_equipment_count_summary
+        set size_name=#{sizeName}
+        where size_id ={sizeId}
+    </update>
+    <update id="setTypeName">
+        update vie_equipment_count_summary
+        set type_name=#{typeName}
+        where type_id ={typeId}
+    </update>
 
 
-<!--    <update  parameterType="java.lang.String" id="PriceNumCacu">-->
+    <!--    <update  parameterType="java.lang.String" id="PriceNumCacu">-->
 <!--        UPDATE vie_price_sum_summary-->
 <!--        SET-->
 <!--            add_price = CASE-->

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

@@ -4,6 +4,7 @@ import com.junmp.junmpProcess.entity.QuickSuggestions;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
 import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
+import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,6 +28,10 @@ public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> {
     List<InventorySummaryReq> selectSumByItems(@Param("list") List<Object[]> searchItem);
 
     void updateInventorySum(@Param("list") List<InventorySummaryReq> inventorySummaryList);
+
+    List<UpdateOrderDetailReq> getOrderMainDetail(@Param("processId")String processInstanceId);
+
+    boolean updateDesNum(@Param("list") List<InventorySummaryReq> inventorySummaryList);
 }
 
 

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

@@ -35,6 +35,10 @@ import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
 import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
 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.exception.JYZBAppException;
+import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -80,6 +84,7 @@ import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -312,6 +317,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 case "workOrder":
                 case "quickOrder":
                     //更新出入库单
+                    //将销毁数加回来
+                    if (bussinessType.equals("destruction")){
+                        List<UpdateOrderDetailReq> list=quickSuggestionsMapper.getOrderMainDetail(task.getProcessInstanceId());
+                        boolean b = addOrRevokeAgentDestructionNum(list);
+                    }
                     quickSuggestionsMapper.updateOrderMain(task.getProcessInstanceId());
                     break;
                 case "bussinessOrder":
@@ -1070,4 +1080,45 @@ return  null;
 //        }
 
     }
+
+    public boolean addOrRevokeAgentDestructionNum(List<UpdateOrderDetailReq> list){
+        List<Object[]> searchItem=new ArrayList<>();
+        for (UpdateOrderDetailReq detialReq:list) {
+            //我先去数据库查询summary表中的数据
+            Object[] item=new Object[]{detialReq.getOrgId(),detialReq.getWarehouseId(),detialReq.getTypeId(),detialReq.getSizeId(),detialReq.getPrice()};
+            searchItem.add(item);
+        }
+        List<InventorySummaryReq> inventorySummaryList = quickSuggestionsMapper.selectSumByItems(searchItem);
+        String msg="";
+        for (UpdateOrderDetailReq detialReq:list) {
+            for (InventorySummaryReq is:inventorySummaryList) {
+
+                if (detialReq.getWarehouseId().equals(is.getLocationId()) && detialReq.getTypeId().equals(is.getTypeId())
+                        && detialReq.getSizeId().equals(is.getSizeId()) && detialReq.getPrice().compareTo(is.getUnitPrice())==0){
+
+                    if (ObjectUtil.isNull(is.getDestructionNumber())){
+                        is.setDestructionNumber(0);
+                    }
+                    if (is.getNumber()-detialReq.getPlanNum()<0){
+//                        is.setDestructionNumber(is.getDestructionNumber()+is.getNumber());
+//                        is.setNumber(0);
+                        msg=msg+"装备：" +detialReq.getTypeName()+"号型："+detialReq.getSizeName()+"装备销毁数小于库存数,库存数为："+is.getNumber()+"\n";
+                    }else {
+                        is.setDestructionNumber(is.getDestructionNumber() - detialReq.getPlanNum());
+                        is.setNumber(is.getNumber() + detialReq.getPlanNum());
+                        is.setStockNumber(is.getStockNumber() + detialReq.getPlanNum());
+                        is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
+                        is.setDestructionNumberPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getDestructionNumber())));
+                    }
+                    break;
+                }
+            }
+
+        }
+        if (!msg.trim().isEmpty()){
+            throw new JYZBAppException(InventoryExceptionEnum.EQUIPMENT_NOT_EXIST, msg);
+        }
+
+        return quickSuggestionsMapper.updateDesNum(inventorySummaryList);
+    }
 }

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

@@ -49,7 +49,7 @@ public class QuickSuggestionsServiceImpl extends ServiceImpl<QuickSuggestionsMap
     @Override
     public List<QuickSuggestionsDto> showQuickSuggestions(QueryQuickSuggestionsReq req) {
         List<QuickSuggestions> list = list(new LambdaQueryWrapper<QuickSuggestions>()
-                .eq(QuickSuggestions::getUserId, req.getUserId()));
+                .eq(QuickSuggestions::getUserId, req.getUserId()).eq(QuickSuggestions::getUseType,req.getUseType()));
         List<QuickSuggestionsDto> collect = list.stream().map(quickSuggestions -> {
             QuickSuggestionsDto quickSuggestionsDto = new QuickSuggestionsDto();
             BeanPlusUtil.copyProperties(quickSuggestions, quickSuggestionsDto);

jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.xml

@@ -30,10 +30,17 @@
     </update>
     <update id="updateInventorySum">
         <foreach collection="list" item="item" open="(" separator="," close=")">
-            update base_inventory_summary is set agent_broken_num={item.agentBrokenNum} where id=#{item.id}
+            update base_inventory_summary `is` set agent_broken_num={item.agentBrokenNum} where id=#{item.id}
         </foreach>
 
     </update>
+    <update id="updateDesNum">
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            update base_inventory_summary `is` set destruction_number={item.destructionNumber},
+            set number=#{item.number},set price=#{item.price}
+            where id=#{item.id}
+        </foreach>
+    </update>
     <select id="getBusForm" resultType="com.junmp.jyzb.api.bean.req.UpdateBusFormReq"
             parameterType="java.lang.String">
         select * from bussiness_bus_form om where om.process_id =#{processId}
@@ -50,6 +57,13 @@
             )
         </foreach>
     </select>
+    <select id="getOrderMainDetail" resultType="com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq"
+            parameterType="java.lang.String">
+        select om.start_org_id  as org_id,od.*
+        FROM bussiness_order_main om
+            JOIN bussiness_order_detail od on om.id=od.order_id
+            where om.process_id=#{processId}
+    </select>
 
 
 </mapper>