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/LogDetailDto.java

@@ -18,6 +18,8 @@ public class LogDetailDto implements Serializable {
      */
     private String inventoryId;
 
+    private String bussinessType;
+
     /**
      * 出入库汇总ID
      */

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

@@ -19,9 +19,7 @@ public class OrderMainReq extends BaseRequest {
 
     @NotBlank(message = "业务类型不能为空",groups = {edit.class})
     private String orderType;
-
-    private String processInstanceId;
-    private String receiveUserId;
+    //实例流程id
     private String processId;
 
     private String bussinessType;
@@ -126,4 +124,8 @@ public class OrderMainReq extends BaseRequest {
 
     private List<OrderDetailReq> detailList;
 
+    private String receiveUserId;
+
 }
+
+

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

@@ -24,9 +24,11 @@ public class QueryReassignmentReq extends BaseRequest {
     private String agent;
 
     /**
-     * 工作流id
+     * 工作流定义id
      */
     private String processDefinitionId;
+    //实例id
+    private String processId;
 
     private String orderCode;
 

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

@@ -32,6 +32,8 @@ public class UpdateReassignmentReq extends BaseRequest {
      */
     private String processDefinitionId;
 
+    private String processId;
+
     /**
      * 业务类型
      */

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

@@ -33,20 +33,6 @@ public class CabinetBoxPolice implements Serializable {
     @TableField(value = "police_id")
     private String policeId;
 
-    /**
-     * 主柜号
-     */
-    @TableField(value = "cabinet_id")
-    private String cabinetId;
-
-    /**
-     * 主柜号名称+箱门名称
-     */
-    @TableField(value = "cabinet_name")
-    private String cabinetName;
-
-    @TableField(value = "num")
-    private Integer num;
 
     /**
      * 
@@ -60,11 +46,6 @@ public class CabinetBoxPolice implements Serializable {
     @TableField(value = "update_time")
     private Date updateTime;
 
-    /**
-     * 箱门类型（1单警柜，2公共柜）
-     */
-    @TableField(value = "contain_type")
-    private Integer containType;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -472,7 +472,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>()
                 //组织机构
                 .eq(ObjectUtil.isNotNull(req.getOrgId()) && !req.getBussinessType().equals("allocate"),BusForm::getOrgId,req.getOrgId())
-
+                .eq(ObjectUtil.isNotNull(req.getProcessId()),BusForm::getProcessId,req.getProcessId())
                 //装备名称模糊查询
                 .like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getInvList,req.getTypeName())
                 //单号

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

@@ -160,7 +160,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
 //
             }
             //批量修改绑定箱门的警员信息，将其解绑
-            cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getCabinetId,cabinetIdList));
+//            cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getCabinetId,cabinetIdList));
             //批量删除箱门数
             cabinetBoxService.removeBatchByIds(cabinetBoxList);
             //批量删除单警柜id

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogDetailServiceImpl.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;
@@ -58,12 +59,14 @@ public class LogDetailServiceImpl extends ServiceImpl<LogDetailMapper, LogDetail
     }
 
 
-    //获取装备的出入库信息（根据装备id获取该装备的出入库记录）
+    //获取装备的出入库信息（根据装备id或者epc获取该装备的出入库记录）
     @Override
     public PageResult<LogDetail> getInOutRecords(InventoryReq req) {
         //通过装备id获取出入库记录(判断id是否存在)
         inventoryService.InventoryExist(req.getId());
-        LambdaQueryWrapper<LogDetail> eq = new LambdaQueryWrapper<LogDetail>().eq(LogDetail::getInventoryId,req.getId());
+        LambdaQueryWrapper<LogDetail> eq = new LambdaQueryWrapper<LogDetail>()
+                .eq(ObjectUtil.isNotNull(req.getId()),LogDetail::getInventoryId,req.getId())
+                .eq(ObjectUtil.isNotNull(req.getEpc()),LogDetail::getEpc,req.getEpc());
         Page<LogDetail> page = logDetailService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
         return PageResultFactory.createPageResult(page);
     }

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

@@ -73,6 +73,9 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             //修改字段，和数据库字段进行统一
             req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
             req.setOrder(req.getOrder().toLowerCase());
+        }else {
+            req.setColumn("create_time");
+            req.setOrder("desc");
         }
         LambdaQueryWrapper<LogSummary> eq = new LambdaQueryWrapper<LogSummary>()
                 .eq(LogSummary::getOrgId,req.getOrgId())

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

@@ -300,12 +300,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             list.add(Long.toString(orderDetail.getId()));
         }
         //判断orderId在orderLog表中是否存在，如果存在，则直接替换
-        boolean b = addOrderLog(req);
+        //判断是否有流程id，如果有，则进行添加
+        if (order.getProcessId()!=null){
+            boolean b = addOrderLog(req,order.getId(),order.getOrderCode());
+        }
         return list;
     }
 
     //纪录日志
-    private boolean addOrderLog(UpdateOrderReq req){
+    private boolean addOrderLog(UpdateOrderReq req,String orderId,String orderCode){
         //判断日志中是否存在，如果存在直接替换
         OrderLog createOrder = orderLogService.getOne(new LambdaQueryWrapper<OrderLog>()
                 .eq(OrderLog::getOrderId, req.getId())
@@ -313,22 +316,23 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //我要的是detail的明细存入到history—msg中
         boolean a=true;
         if (createOrder==null){
-            createOrder.setId(UUID.randomUUID().toString());
-            createOrder.setHistoryMsg(JSON.toJSONString(req.getDetailList()));
-            createOrder.setOrderCode(req.getOrderCode());
-            createOrder.setBussinessType(req.getBussinessType());
-            createOrder.setOrderType(req.getOrderType());
-            createOrder.setProcessType("careteOrder");
+            OrderLog orderLog = new OrderLog();
+            orderLog.setId(UUID.randomUUID().toString());
+            orderLog.setHistoryMsg(JSON.toJSONString(req.getDetailList()));
+            orderLog.setOrderCode(orderCode);
+            orderLog.setBussinessType(req.getBussinessType());
+            orderLog.setOrderType(req.getOrderType());
+            orderLog.setProcessType("careteOrder");
             if (req.getOrderType().equals("in")){
-                createOrder.setOrgId(req.getEndOrgId());
-                createOrder.setOrgName(req.getEndOrgName());
+                orderLog.setOrgId(req.getEndOrgId());
+                orderLog.setOrgName(req.getEndOrgName());
             }else {
-                createOrder.setOrgId(Long.parseLong(req.getStartOrgId()));
-                createOrder.setOrgName(req.getStartOrgName());
+                orderLog.setOrgId(Long.parseLong(req.getStartOrgId()));
+                orderLog.setOrgName(req.getStartOrgName());
             }
-            createOrder.setOrderId(req.getId());
-            createOrder.setCreateTime(DateTimeUtil.getCurrentDateTime());
-            a=orderLogService.save(createOrder);
+            orderLog.setOrderId(orderId);
+            orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            a=orderLogService.save(orderLog);
         }else{//直接替换
             createOrder.setHistoryMsg(JSON.toJSONString(req.getDetailList()));
             createOrder.setUpdateTime(DateTimeUtil.getCurrentDateTime());
@@ -1091,7 +1095,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (req.getOrderType().equals("workOrder")){
             OrderDto orderDto = new OrderDto();
             OrderMain one = getOne(new LambdaQueryWrapper<OrderMain>()
-                    .eq(OrderMain::getProcessId, req.getProcessInstanceId()));
+                    .eq(OrderMain::getProcessId, req.getProcessId()));
             if (ObjectUtil.isNull(one)){
                 return processOrderDto;
             }
@@ -1108,19 +1112,19 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         } else if (req.getOrderType().equals("bussinessOrder")) {
             BusFormDto busFormDto = new BusFormDto();
             BusForm one = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
-                    .eq(BusForm::getProcessId, req.getProcessInstanceId()));
+                    .eq(BusForm::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,busFormDto);
             processOrderDto.setBusFormDto(busFormDto);
         } else if (req.getOrderType().equals("stacktakeOrder")) {
             StocktakeDto stocktakeDto = new StocktakeDto();
             Stocktake one = stocktakeService.getOne(new LambdaQueryWrapper<Stocktake>()
-                    .eq(Stocktake::getProcessId, req.getProcessInstanceId()));
+                    .eq(Stocktake::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,stocktakeDto);
             processOrderDto.setStocktakeDto(stocktakeDto);
         } else if (req.getOrderType().equals("reassigment")) {
             ReassignmentDto reassignmentDto = new ReassignmentDto();
             Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()
-                    .eq(Reassignment::getProcessId, req.getProcessInstanceId()));
+                    .eq(Reassignment::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,reassignmentDto);
             processOrderDto.setReassignmentDto(reassignmentDto);
         }

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

@@ -1099,6 +1099,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         LambdaQueryWrapper<Reassignment> eq = new LambdaQueryWrapper<Reassignment>()
                 .eq(ObjectUtil.isNotNull(req.getOrgId()), Reassignment::getOrgId, req.getOrgId())
                 .eq(ObjectUtil.isNotNull(req.getReassignmentType()),Reassignment::getReassignmentType,req.getReassignmentType())
+                .eq(ObjectUtil.isNotNull(req.getProcessId()),Reassignment::getProcessId,req.getProcessId())
                 .eq(ObjectUtil.isNotNull(req.getExamineState()) && !req.getExamineState().trim().isEmpty(), Reassignment::getExamineState, req.getExamineState())
                 .like(ObjectUtil.isNotNull(req.getPoliceName()), Reassignment::getPoliceName, req.getPoliceName())
                 .like(ObjectUtil.isNotNull(req.getTypeName()),Reassignment::getInvList,req.getTypeName())

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

@@ -72,6 +72,9 @@
         <if test="null !=  req.bussinessType  and '' != req.bussinessType  ">
         and bussiness_type = #{req.bussinessType}
         </if>
+        <if test="null !=  req.processId  and '' != req.processId  ">
+            and process_id=#{req.processId}
+        </if>
         <if test="null !=  req.typeName  and '' != req.typeName  ">
             and inv_list like concat('%',#{req.typeName},'%')
         </if>