增加运维接口，调试出入单据接口

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.junmp.jyzb.service.DestoryUnitService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@Api(tags = "报废/销毁单位模块")
+@RequestMapping("/DestoryUnit")
+public class DestoryUnitController {
+    @Resource
+    private DestoryUnitService destoryUnitService;
+
+    //创建报废/销毁单位
+    @PostMapping("/AddDestoryUnit")
+    @ApiOperation("创建报废/销毁单位")
+    public ApiRes<String> addDestoryUnit(@RequestBody @Validated(ValidationApi.add.class) DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.addDestoryUnit(req));
+    }
+
+    //修改报废/销毁单位
+    @PostMapping("/UpdateDestoryUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> updateDestoryUnit(@RequestBody @Validated(ValidationApi.edit.class) DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.updateDestoryUnit(req));
+    }
+
+    //查询报废/销毁单位(list)
+    @PostMapping("/ShowDestoryUnitList")
+    @ApiOperation("查询报废/销毁单位(list)")
+    public ApiRes<List<DestoryUnit>> showDestoryUnitList(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.showDestoryUnitList(req));
+    }
+
+    //查询报废/销毁单位(page)
+    @PostMapping("/ShowDestoryUnitPage")
+    @ApiOperation("修改报废/销毁单位(page)")
+    public ApiRes<PageResult<DestoryUnit>> showDestoryUnitPage(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.showDestoryUnitPage(req));
+    }
+    //删除报废/销毁单位
+    @PostMapping("/DelDestoryUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> delDestoryUnit(@RequestBody DestoryUnitReq req){
+        return ApiRes.success(destoryUnitService.delDestoryUnit(req));
+    }
+}

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.DestoryUnitReq;
+import com.junmp.jyzb.api.bean.req.RepairUnitReq;
+import com.junmp.jyzb.entity.DestoryUnit;
+import com.junmp.jyzb.entity.RepairUnit;
+import com.junmp.jyzb.service.RepairUnitService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@Api(tags = "维修单位模块")
+@RequestMapping("/RepairUnit")
+public class RepairUnitController {
+    @Resource
+    private RepairUnitService repairUnitService;
+
+    //创建报废/销毁单位
+    @PostMapping("/AddRepairUnit")
+    @ApiOperation("创建报废/销毁单位")
+    public ApiRes<String> addRepairUnit(@RequestBody @Validated(ValidationApi.add.class) RepairUnitReq req){
+        return ApiRes.success(repairUnitService.addRepairUnit(req));
+    }
+
+    //修改报废/销毁单位
+    @PostMapping("/UpdateRepairUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> updateRepairUnit(@RequestBody @Validated(ValidationApi.edit.class) RepairUnitReq req){
+        return ApiRes.success(repairUnitService.updateRepairUnit(req));
+    }
+
+    //查询报废/销毁单位(list)
+    @PostMapping("/ShowRepairUnitList")
+    @ApiOperation("查询报废/销毁单位(list)")
+    public ApiRes<List<RepairUnit>> showRepairUnitList(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.showRepairUnitList(req));
+    }
+
+    //查询报废/销毁单位(page)
+    @PostMapping("/ShowRepairUnitPage")
+    @ApiOperation("修改报废/销毁单位(page)")
+    public ApiRes<PageResult<RepairUnit>> showRepairUnitPage(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.showRepairUnitPage(req));
+    }
+    //删除报废/销毁单位
+    @PostMapping("/DelRepairUnit")
+    @ApiOperation("修改报废/销毁单位")
+    public ApiRes<Boolean> delRepairUnit(@RequestBody RepairUnitReq req){
+        return ApiRes.success(repairUnitService.delRepairUnit(req));
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -28,12 +28,15 @@ public class OrderMQReceiver {
             System.out.println("req = " + req);
             //将消息进行消费
             Boolean result = inventorySummaryService.processInventoryRecords(req);
+            System.out.println("result = " + result);
             if (result){
                 // 手动确认消息
                 channel.basicAck(deliveryTag, false);
             }else {
                 channel.basicNack(deliveryTag, false, true);
             }
+            // 手动确认消息
+//            channel.basicAck(deliveryTag, false);
         } catch (Exception e) {
             // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
             try {

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

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

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

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

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

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

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

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

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

@@ -122,10 +122,10 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         //更新列表
         List<Inventory> updateList = new ArrayList<>();
         //出库out，入库in
-        String bussinessState=orderMain.getOrderState();
+        String orderType=orderMain.getOrderType();
         //组织机构
         Long orgId;
-        if (bussinessState.equals("in")){
+        if (orderType.equals("in")){
             orgId=orderMain.getEndOrgId();
         }else {
             orgId=orderMain.getStartOrgId();
@@ -136,7 +136,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
             BeanPlusUtil.copyProperties(inventoryReq,inventory);
             inventory.setOrgId(orgId);
             //新增装备
-            if (ObjectUtil.isNotNull(inventoryReq.getId())){
+            if (ObjectUtil.isNull(inventory.getId())){
                 //修改状态
                 inventory.setId(UUID.randomUUID().toString());
                 inventory.setLocationState(orderMain.getOrderType());
@@ -146,7 +146,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
                 //修改状态
                 inventory.setLocationState(orderMain.getOrderType());
                 //修改业务状态
-                if (bussinessState.equals("in")){
+                if (orderType.equals("in")){
                     inventory.setBussinessState("normal");
                 }else {
                     inventory.setBussinessState(orderMain.getBussinessType());
@@ -155,7 +155,8 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
             }
         });
         if (ObjectUtil.isNotNull(addList) && addList.size()>0){
-            inventoryService.saveBatch(addList);
+            boolean b = inventoryService.saveBatch(addList);
+            System.out.println("b = " + b);
         }
         if (ObjectUtil.isNotNull(updateList) && updateList.size()>0){
             inventoryService.updateBatchById(updateList);

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

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

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

@@ -205,7 +205,14 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public String AddFinishOrder(UpdateOrderReq req) {
         //添加到数据库中
 
-        String orderId = AddOrder(req).get(0);
+        List<String> strings = AddOrder(req);
+        System.out.println("strings = " + strings);
+        req.setId(strings.get(0));
+        List<UpdateOrderDetailReq> detailList = req.getDetailList();
+        //将子单据id传递
+        for (int i=1;i<strings.size();i++){
+            detailList.get(i-1).setId(Long.parseLong(strings.get(i)));
+        }
         //将完成的任务单直接推送到消息队列rabbitmq中（需要判断是入库单还是出库单，入库单传发物单位id，出库单传收物单位id）
         //方法1：一个交换机，一个队列。通过中间对象，object存储对象，type表标识
 //        if(req.getOrderType().equals("in")){
@@ -231,7 +238,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with(req.getStartOrgId().toString()).noargs());
             rabbitTemplate.convertAndSend(exchangeName, req.getStartOrgId().toString(), req);
         }
-        return orderId;
+        return strings.get(0);
     }
 
 

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

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

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

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

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

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

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

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