新增删除待提交单据接口

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

 package com.junmp.jyzb.api.bean.req;
 import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,7 +16,7 @@ public class UpdateBusFormReq extends BaseRequest {
     /**
      * id
      */
-
+    @NotBlank(message = "单据id不能为空",groups = {ValidationApi.delete.class})
     private String id;
 
 //    private String userId;

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

@@ -15,7 +15,7 @@ public class UpdateInventoryReq   {
     /**
      * id
      */
-    @NotBlank(message = "id不能为空", groups = {ValidationApi.edit.class})
+    @NotBlank(message = "id不能为空", groups = {ValidationApi.add.class,ValidationApi.edit.class})
     private String id;
 
     private String applyTime;

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

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class UpdateOrderReq extends BaseRequest implements Serializable {
-    @NotBlank(message = "id不能为空",groups = {edit.class})
+    @NotBlank(message = "id不能为空",groups = {edit.class,delete.class})
     private String id;
     private String userId;
     private String examineState;

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

@@ -2,9 +2,11 @@ package com.junmp.jyzb.api.bean.req;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -14,6 +16,7 @@ public class UpdateReassignmentReq extends BaseRequest {
     /**
      * id
      */
+    @NotBlank(message = "单据id不能为空",groups = {ValidationApi.delete.class})
     private String id;
 
     /**

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

@@ -15,6 +15,7 @@ public enum OrderExceptionEnum implements IExceptionEnum {
     ROLE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"审核组织机构用户配置异常！请检查日志"),
     ORDER_CREATE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"单子创建失败"),
     ORDER_NUM_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE,"记账数量为空或0，请确认记账数量"),
+    ORDER_DEL_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"单子删除失败，只能删除待提交的单据")
     ;
 
     /**

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

@@ -10,6 +10,7 @@ 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 liquibase.pro.packaged.A;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,12 +55,14 @@ public class BussinessController {
     public ApiRes<Object> showOrderByBusOrderId(@RequestBody QueryBusFormReq req){
         return ApiRes.success(busFormService.showOrderByBusOrderId(req));
     }
-    //根据调拨单，一键生成采购单
-//    @PostMapping("/GeneratePurchaseQuickly")
-//    @ApiOperation("快速生成采购单")
-//    public ApiRes<List<GeneratePurchaseQuicklyDto>> GeneratePurchaseQuickly(@RequestBody GeneratePurchaseQuicklyReq req){
-//        return ApiRes.success(busFormService.GeneratePurchaseQuickly(req));
-//    }
+
+
+    //删除待提交的业务单据
+    @PostMapping(path = "/delToSubmitOrder",name="删除待提交的业务单据#logType=30")
+    @ApiOperation("删除待提交的业务单据")
+    public ApiRes<Boolean> delToSubmitOrder(@RequestBody @Validated(ValidationApi.delete.class) UpdateBusFormReq req){
+        return ApiRes.success(busFormService.delToSubmitOrder(req));
+    }
 
 
 }

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

@@ -67,6 +67,13 @@ public class DeviceConfigController {
         return ApiRes.success(deviceConfigService.showDeviceConfigList(req));
     }
 
+    //查询一个配置（通道和本地主机配置）
+    @PostMapping(path="/showOneDeviceConfig",name="查询单个配置#enable")
+    @ApiOperation("查询单个配置")
+    public ApiRes<String> showOneDeviceConfig(@RequestBody QueryDeviceConfigReq req){
+        return ApiRes.success(deviceConfigService.showOneDeviceConfig(req));
+    }
+
     //新增除湿机配置
     @PostMapping(path="/addWarehouseDev",name="新增除湿机配置#logType=30")
     @ApiOperation("新增除湿机配置")

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

@@ -43,6 +43,11 @@ public class OrderController {
         return ApiRes.success(orderMainService.AddOrder(req));
     }
 
+    @PostMapping(path = "/delToSubmitOrder",name = "删除待提交的出入库单据#logType=30")
+    @ApiOperation("删除待提交的出入库单据")
+    public ApiRes<Boolean> delToSubmitOrder(@RequestBody @Validated(ValidationApi.delete.class) UpdateOrderReq req){
+        return ApiRes.success(orderMainService.delToSubmitOrder(req));
+    }
 
 
 

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

@@ -270,6 +270,13 @@ public class PoliceController {
         return ApiRes.success(policemanService.PoliceReassignment(req));
     }
 
+    //删除待提交的调岗单据
+    @PostMapping(path = "/delToSubmitReassignment",name = "删除待提交的调岗单据#logType=30")
+    @ApiOperation("删除待提交的调岗单据")
+    public ApiRes<Boolean> delToSubmitReassignment(@RequestBody @Validated(ValidationApi.delete.class) UpdateReassignmentReq req){
+        return ApiRes.success(policemanService.delToSubmitReassignment(req));
+    }
+
 
     @PostMapping(path="/ShowReassignmentPage",name="查看警员调岗申请单#enable")
     @ApiOperation("查看警员调岗申请单")

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

@@ -44,4 +44,5 @@ public interface BusFormService extends IService<BusForm> {
 
     Object showOrderByBusOrderId(QueryBusFormReq req);
 
+    boolean delToSubmitOrder(UpdateBusFormReq req);
 }

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

@@ -31,4 +31,6 @@ public interface DeviceConfigService extends IService<DeviceConfig> {
     List<String> alignDeviceConfigInfo(UpdateDeivceConfigReq req);
 
     boolean delDeviceConfig(UpdateDeivceConfigReq req);
+
+    String showOneDeviceConfig(QueryDeviceConfigReq req);
 }

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

@@ -17,6 +17,9 @@ import java.util.List;
 
 public interface OrderMainService extends IService<OrderMain> {
     List<String> AddOrder(UpdateOrderReq req);
+
+    boolean delToSubmitOrder(UpdateOrderReq req);
+
     String AddFinishOrder(UpdateOrderReq req);
 
     //更新任务单
@@ -52,6 +55,7 @@ public interface OrderMainService extends IService<OrderMain> {
 
      OrderNum setOrderCode(UpdateOrderReq req);
 
-     //快速创建入库单（快速移库内容）
+
+    //快速创建入库单（快速移库内容）
 //    boolean addQuickOrder(OrderMain existOrder);
 }

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

@@ -99,6 +99,9 @@ public interface PolicemanService extends IService<Policeman> {
     //警员调岗申请单
     String PoliceReassignment(UpdateReassignmentReq req);
 
+    //删除待提交的调岗单据
+    boolean delToSubmitReassignment(UpdateReassignmentReq req);
+
     //查看警员调岗申请单
     PageResult<Reassignment> ShowReassignmentPage(QueryReassignmentReq req);
 
@@ -130,4 +133,6 @@ public interface PolicemanService extends IService<Policeman> {
     boolean CreateSystemAccount() throws InterruptedException, IOException;
     //获取组织机构下所有的审核员的userId，用字符串拼接
     String searchUserByRoleId(Long orgId);
+
+
 }

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

@@ -359,6 +359,20 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         return map.get("busForm");
     }
 
+    //删除待提交的业务单据
+    @Override
+    public boolean delToSubmitOrder(UpdateBusFormReq req) {
+        //根据传递的id进行删除
+        BusForm one = getById(req.getId());
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(OrderExceptionEnum.ORDER_NOT_EXIST);
+        }
+        if (!one.getExamineState().equals("none")){
+            throw new ServiceException(OrderExceptionEnum.ORDER_DEL_ERROR);
+        }
+        return removeById(req.getId());
+    }
+
 
     /**
      * 查询业务单，（可以根据业务单进行修改）

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

@@ -134,6 +134,17 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
         return this.removeById(req.getId());
     }
 
+    @Override
+    public String showOneDeviceConfig(QueryDeviceConfigReq req) {
+        DeviceConfig one = getOne(new LambdaQueryWrapper<DeviceConfig>().eq(DeviceConfig::getOrgId, req.getOrgId())
+                .eq(DeviceConfig::getDeviceType, req.getDeviceType()).eq(DeviceConfig::getLocationId, req.getLocationId()));
+        if (ObjectUtil.isNull(one)){
+            return "null";
+        }else {
+            return one.getDeviceConfig();
+        }
+    }
+
 
 }
 

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

@@ -137,6 +137,8 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                 .le(ObjectUtil.isNotNull(req.getEndTime()),LogSummary::getUseTime,req.getEndTime())
                 .like(ObjectUtil.isNotNull(req.getTypeName()),LogSummary::getEquipmentList,req.getTypeName())
                 .last("order by " + req.getColumn() + " " + req.getOrder());
+        List<LogSummary> list = list(eq);
+
         return list(eq).size();
     }
 

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

@@ -358,6 +358,24 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         return list;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delToSubmitOrder(UpdateOrderReq req) {
+        OrderMain one = getById(req.getId());
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(OrderExceptionEnum.ORDER_NOT_EXIST);
+        }
+        if (!one.getExamineState().equals("none")){
+            throw new ServiceException(OrderExceptionEnum.ORDER_DEL_ERROR);
+        }
+        //如果关联业务单据，那么需要将业务单据状态重新设置回来
+        Long orgId = one.getOrderType().equals("in")?one.getEndOrgId():one.getStartOrgId();
+        if (ObjectUtil.isNotNull(one.getBussinessCode())){
+            setState2(orgId,one.getBussinessCode());
+        }
+        return removeById(one.getId());
+    }
+
     //销毁装备申请之后将库存信息删除
     public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req){
         List<UpdateOrderDetailReq> list = req.getDetailList();

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

@@ -193,6 +193,12 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (one!=null){
             throw new ServiceException(UserExceptionEnum.USER_IS_EXIST);
         }
+        //判断警员编号是否已经存在
+        List<Policeman> list = list(new LambdaQueryWrapper<Policeman>().eq(Policeman::getPoliceCode, req.getPoliceCode())
+                .eq(Policeman::getIdentity, req.getIdentity()));
+        if (CollectionUtil.isNotEmpty(list)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICECODE_IS_EXISTS);
+        }
         //查询传入的组织机构id是否存在
         pubOrgService.PubOrgExist(req.getOrgId());
         //绑定账号
@@ -1753,6 +1759,18 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return reassignment.getId();
     }
 
+    @Override
+    public boolean delToSubmitReassignment(UpdateReassignmentReq req) {
+        Reassignment one = reassignmentService.getById(req.getId());
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(OrderExceptionEnum.ORDER_NOT_EXIST);
+        }
+        if (!one.getExamineState().equals("none")){
+            throw new ServiceException(OrderExceptionEnum.ORDER_DEL_ERROR);
+        }
+        return reassignmentService.removeById(one.getId());
+    }
+
     private StartProcessInstanceDTO setParams(UpdateReassignmentReq req,Reassignment reassignment){
         StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
         startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());