工单出库修改。

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -23,6 +23,7 @@ import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderDto;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderDto;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderItemDto;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderItemDto;
+import com.neotel.smfcore.core.order.rest.bean.dto.OrderKanbanDto;
 import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderItemMapper;
 import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderItemMapper;
 import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderMapper;
 import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderMapper;
 import com.neotel.smfcore.core.order.rest.bean.query.OrderQueryCondition;
 import com.neotel.smfcore.core.order.rest.bean.query.OrderQueryCondition;
@@ -769,4 +770,28 @@ public class OrderController {
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
+
+
+    @ApiOperation("获取工单看板信息")
+    @GetMapping("/kanban")
+    @PreAuthorize("@el.check('workOrder')")
+    public OrderKanbanDto orderKanban() {
+        int allCount = liteOrderManager.countByQuery(new Query(Criteria.where("orderNo").exists(true)));
+        int endCount = liteOrderManager.countByQuery(new Query(Criteria.where("status").is(LITEORDER_STATUS.CLOSED)));
+        Criteria c = new Criteria();
+        c.and("status").nin(LITEORDER_STATUS.CLOSED,LITEORDER_STATUS.NEW);
+        Query query = new Query(c);
+        int exeCount = liteOrderManager.countByQuery(query);
+        int abCount = 0;
+        OrderKanbanDto dto = new OrderKanbanDto(allCount, endCount, exeCount, abCount);
+        return dto;
+    }
+
+    @ApiOperation("返回全部线别")
+    @GetMapping(value = "/getAllLines")
+    @PreAuthorize("@el.check('workOrder')")
+    public List<String> getAllLines() {
+        List<String> allLineList = liteOrderManager.findAllLines();
+        return allLineList;
+    }
 }
 }

src/main/java/com/neotel/smfcore/core/order/rest/bean/dto/OrderKanbanDto.java

+package com.neotel.smfcore.core.order.rest.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderKanbanDto {
+    @ApiModelProperty("全部工单数")
+    private int orderCount;
+    @ApiModelProperty("已完成工单数")
+    private int endOrderCount;
+    @ApiModelProperty("执行中工单")
+    private int executingOrderCount;
+    @ApiModelProperty("异常工单")
+    private int abnormalOrderCount;
+}

src/main/java/com/neotel/smfcore/core/order/rest/bean/query/OrderQueryCondition.java

@@ -24,6 +24,10 @@ public class OrderQueryCondition {
 
 
     //状态，0=所有，1=已关闭，2=未关闭
     //状态，0=所有，1=已关闭，2=未关闭
     private Integer status;
     private Integer status;
+
+
+    @QueryCondition(blurry = "line")
+    private String line;
 //
 //
 //    @QueryCondition(type=QueryCondition.Type.IN,propName = "status")
 //    @QueryCondition(type=QueryCondition.Type.IN,propName = "status")
 //    private List<Integer> statusList ;
 //    private List<Integer> statusList ;

src/main/java/com/neotel/smfcore/core/order/service/dao/ILiteOrderDao.java

@@ -2,5 +2,8 @@ package com.neotel.smfcore.core.order.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 
+import java.util.List;
+
 public interface ILiteOrderDao extends IBaseDao {
 public interface ILiteOrderDao extends IBaseDao {
+    List<String> findAllLines();
 }
 }

src/main/java/com/neotel/smfcore/core/order/service/dao/impl/LiteOrderDaoImpl.java

@@ -3,12 +3,29 @@ package com.neotel.smfcore.core.order.service.dao.impl;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.core.order.service.dao.ILiteOrderDao;
 import com.neotel.smfcore.core.order.service.dao.ILiteOrderDao;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 @Service
 @Service
 public class LiteOrderDaoImpl extends AbstractBaseDao implements ILiteOrderDao {
 public class LiteOrderDaoImpl extends AbstractBaseDao implements ILiteOrderDao {
     @Override
     @Override
     public Class getEntityClass() {
     public Class getEntityClass() {
         return LiteOrder.class;
         return LiteOrder.class;
     }
     }
+
+    @Override
+    public List<String> findAllLines() {
+        Criteria criteria = Criteria.where("line").exists(true).ne(null);
+        Aggregation agg = Aggregation.newAggregation(
+                Aggregation.match(criteria),
+                Aggregation.group("line")
+        );
+        AggregationResults<String> results = getMongoTemplate().aggregate(agg, getEntityClass(), String.class);
+
+        return results.getMappedResults();
+    }
 }
 }

src/main/java/com/neotel/smfcore/core/order/service/manager/ILiteOrderManager.java

@@ -4,6 +4,7 @@ import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
+import org.springframework.data.mongodb.core.query.Query;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -12,9 +13,13 @@ public interface ILiteOrderManager extends IBaseManager<LiteOrder> {
 
 
     int countByCondition(String field, String value);
     int countByCondition(String field, String value);
 
 
+    int countByQuery(Query query);
+
     LiteOrder createWithItems(LiteOrder liteOrder) throws ValidateException;
     LiteOrder createWithItems(LiteOrder liteOrder) throws ValidateException;
 
 
     List<LiteOrder> findUnEndOrdersList();
     List<LiteOrder> findUnEndOrdersList();
 
 
     LiteOrder findBySource(String source);
     LiteOrder findBySource(String source);
+
+    List<String> findAllLines();
 }
 }

src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderManagerImpl.java

@@ -51,6 +51,13 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
     }
     }
 
 
     @Override
     @Override
+    public int countByQuery(Query query) {
+        if(query==null){
+            return (int)liteOrderDao.count();
+        }
+        return liteOrderDao.countByQuery(query);
+    }
+    @Override
     public LiteOrder get(String id) {
     public LiteOrder get(String id) {
         LiteOrder order= liteOrderDao.findOneById(id);
         LiteOrder order= liteOrderDao.findOneById(id);
         if(order!=null&& order.getOrderItems()==null){
         if(order!=null&& order.getOrderItems()==null){
@@ -111,6 +118,11 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
     }
     }
 
 
     @Override
     @Override
+    public List<String> findAllLines() {
+       return liteOrderDao.findAllLines();
+    }
+
+    @Override
     public PageData<LiteOrder> findByPage(Query query, Pageable pageable) {
     public PageData<LiteOrder> findByPage(Query query, Pageable pageable) {
         int totalCount = liteOrderDao.countByQuery(query);
         int totalCount = liteOrderDao.countByQuery(query);
         List<LiteOrder> list = liteOrderDao.findByQuery(query, pageable);
         List<LiteOrder> list = liteOrderDao.findByQuery(query, pageable);