单据添加供应商名称属性字段

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

@@ -35,6 +35,10 @@ public class OrderDto implements Serializable {
      */
     private String  startOrgName;
     /**
+     * 供应商名称
+     */
+    private String supplierName;
+    /**
      * 收物单位
      */
     private String  endOrgId;

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

@@ -36,6 +36,9 @@ public class OrderMainDto implements Serializable {
     //收物单位
     private String endOrgName;
 
+    //供应商名称
+    private String supplierName;
+
     private String startOrgUserId;
 
     private String startOrgUserName;

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

@@ -33,6 +33,10 @@ public class OrderMainReq extends BaseRequest {
     private Long endOrgId;
 
     private String endOrgName;
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
 
     private String startOrgUserId;
 

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

@@ -60,6 +60,12 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      * 收物单位名称
      */
     private String  endOrgName;
+
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+
     /**
      * 发物单位负责人id
      */

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

@@ -185,12 +185,6 @@ public class InventoryController {
         inventoryService.ExportInventoryExcel(req);
     }
 
-    //装备出入库记录（通过装备id）
-    @PostMapping("/GetInOutRecords")
-    @ApiOperation("装备出入库记录")
-    public ApiRes<List<InOutRecordsDto>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
-        return ApiRes.success(inventoryService.getInOutRecords(req));
-    }
 
     //根据条件（组织机构，装备类型id，装备型号id，装备型号名称）查询装备总数，在库数，出库数，单警柜在库数，单警柜出库数，报废数
     //查询装备数量报表
@@ -226,4 +220,11 @@ public class InventoryController {
     public ApiRes<Boolean> BatchEditingInvsInfo(@RequestBody BatchEditingInvsReq req){
         return ApiRes.success(inventoryService.BatchEditingInvsInfo(req));
     }
+
+    //装备出入库记录（通过装备id）-----------------------需要修改成page
+    @PostMapping("/GetInOutRecords")
+    @ApiOperation("装备出入库记录查询展示")
+    public ApiRes<List<InOutRecordsDto>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
+        return ApiRes.success(inventoryService.getInOutRecords(req));
+    }
 }

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

@@ -44,6 +44,9 @@ public class OrderMain implements Serializable {
     @TableField("end_org_name")
     private String endOrgName;
 
+    @TableField("supplier_name")
+    private String supplierName;
+
     @TableField("start_org_user_id")
     private String startOrgUserId;
 

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

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

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,4 +17,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
 
     //根据条件查询装备汇总信息，用于出库单的选择装备
     List<InventorySumDto> GetInventorySumInfo(InventorySumReq req);
+
+    //处理本地主机返回单据结果
+    Boolean processInventoryRecords(RabbitMqOrderReq req);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.entity.Inventory;
@@ -80,6 +81,13 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         return inventorySummaryMapper.GetInventorySumInfo(req);
     }
 
+    //处理本地主机返回单据结果
+    @Override
+    public Boolean processInventoryRecords(RabbitMqOrderReq req) {
+
+        return null;
+    }
+
     private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
         LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isEmpty(req)) {

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

@@ -43,7 +43,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
     private RedisUtils redisUtils;
 
 
-    //例：传入abc,a ==>bc 删掉开头的字符串，不是就不删除
+    //例：传入abc,OrderMQReceiver ==>bc 删掉开头的字符串，不是就不删除
     public static String removePrefix(String name, String deleteName) {
         if (name.startsWith(deleteName)) {
             return name.substring(deleteName.length());