元器件增加PN类型。设备管理界面增加下载库位模板功能。

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -81,6 +81,9 @@ public class DataInitManager {
                 Role role = new Role(menuIdSet, "admin", "管理员");
                 role = roleManager.save(role);
                 log.info("创建默认角色：" + role.toString());
+                Role operator = new Role(menuIdSet, "operator", "操作员");
+                operator = roleManager.save(operator);
+                log.info("创建默认角色：" + operator.toString());
 
                 admin = new User(userName, "admin@qq.com", "zh-CN", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "");
                 userManager.save(admin);

src/main/java/com/neotel/smfcore/core/barcode/enums/PN_TYPE.java

+package com.neotel.smfcore.core.barcode.enums;
+
+public enum  PN_TYPE {
+    REEL,
+    TRAY,
+    MSD
+}

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -238,4 +238,7 @@ public class BarcodeDto implements Serializable {
     private Date createDate ;
     @ApiModelProperty("更新时间")
     private Date updateDate;
+
+    @ApiModelProperty("第一次入库时间")
+    private Date firstPutInDate;
 }

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -143,4 +143,7 @@ public class ComponentDto implements Serializable {
     public boolean isSolder(){
         return type == COMPONENT_TYPE.SOLDERPASTE;
     }
+
+    @ApiModelProperty("PN类型")
+    private String pnType= "";
 }

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -247,6 +247,10 @@ public class Barcode extends BasePo implements Serializable {
         return putInTime;
     }
 
+    public Date getFirstPutInDate(){
+        return new Date(putInTime);
+    }
+
     public void setPutInTime(long putInTime) {
         if (this.putInTime == -1) {
             this.putInTime = putInTime;

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

 package com.neotel.smfcore.core.barcode.service.po;
 
 import com.neotel.smfcore.common.base.BasePo;
-import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,6 +18,11 @@ public class Component extends BasePo implements Serializable {
     private int type = COMPONENT_TYPE.COMPONENT;
 
     /**
+     * PN类型
+     */
+    private String pnType= "";
+
+    /**
      * 产品型号
      */
     private String model;

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

@@ -2,15 +2,11 @@
 package com.neotel.smfcore.core.order.rest;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.db.sql.Order;
 import com.google.common.collect.Lists;
-import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
-import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.*;
-import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderDto;
@@ -330,7 +326,7 @@ public class OrderController {
 
         String result=liteOrderCache.closeOrder(orderNo);
         if(ObjectUtil.isEmpty(result)){
-            return ResultBean.newOkResult(result);
+            return ResultBean.newOkResult(result, result,result);
         }else{
             return ResultBean.newErrorResult(-1,result,result);
         }

src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java

@@ -22,6 +22,7 @@ import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.bean.OrderSetting;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.bean.FileProperties;
@@ -48,11 +49,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.io.IOException;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -276,7 +274,46 @@ public class StorageController {
         return ResultBean.newOkResult(resultMsg);
     }
 
- 
+
+    @ApiOperation("下载库位模板")
+    @GetMapping(value = "/downloadPosModel")
+    @PreAuthorize("@el.check('storage:list')")
+    public void download(HttpServletResponse response) throws IOException {
+        downloadPosModel(response);
+    }
+
+    public void downloadPosModel(  HttpServletResponse response) throws IOException {
+        try {
+            List<Map<String, Object>> maps = new ArrayList<>();
+            List<String> titles = new ArrayList<>();
+//            int posIndex =csvRead.getCsvIndex( "位置","pos");
+//            int priIndex = csvRead.getCsvIndex("优先级","pri");
+//            int hIndex = csvRead.getCsvIndex("高度","h");
+//            int wIndex = csvRead.getCsvIndex("宽度","w");
+
+            titles.add("pos" );
+            titles.add("pri");
+            titles.add(("h"));
+            titles.add("w");
+            for(int i=1;i<=10;i++) {
+
+                Map<String, Object> map = new LinkedHashMap<>();
+
+                map.put("pos", "PosName" + i);
+                map.put("pri",  i);
+                map.put("h", 8);
+                map.put("w", 7);
+                maps.add(map);
+            }
+
+            FileUtil.downloadCSV(maps, titles, response);
+        } catch (Exception e) {
+            log.error("导出失败" + e.getMessage(), e);
+        }
+    }
+
+
+
     protected String handleStoragePos(String fileURL, String storageId) throws Exception
     {
         log.info("开始更新料仓【"+storageId+"】的位置信息");

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -189,18 +189,18 @@ public class SettingsController {
 
                 Map<String, Object> map = new LinkedHashMap<>();
                 if(i<=4){
-                    map.put(orderSetting.getPn(),"物料编号"+i);
-                    map.put(orderSetting.getFeeder(),"站位号"+i);
+                    map.put(orderSetting.getPn(),"PN"+i);
+                    map.put(orderSetting.getFeeder(),"Feeder1"+i);
                     map.put(orderSetting.getQty(),"100"+i);
                     map.put(orderSetting.getRi(),"");
-                    map.put(orderSetting.getSo(),"需求单1001" );
+                    map.put(orderSetting.getSo(),"SO1001" );
                 }
                 else{
-                    map.put(orderSetting.getPn(),"物料编号2"+i);
-                    map.put(orderSetting.getFeeder(),"站位号2"+i);
+                    map.put(orderSetting.getPn(),"PN2"+i);
+                    map.put(orderSetting.getFeeder(),"Feeder2"+i);
                     map.put(orderSetting.getQty(),"200"+i);
                     map.put(orderSetting.getRi(),"");
-                    map.put(orderSetting.getSo(),"需求单1002" );
+                    map.put(orderSetting.getSo(),"SO1002" );
                 }
                 maps.add(map);
             }

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -71,14 +71,20 @@ public class TaskController {
     public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) {
         String un_End = "UN_END";
         boolean unEnd = false;
+        boolean finished=false;
         if (criteria.getStatus()!=null&& criteria.getStatus().equals(un_End)) {
             criteria.setStatus(null);
             unEnd = true;
+        }else if(criteria.getStatus()!=null&&criteria.getStatus().equals(OP_STATUS.FINISHED.name())){
+            criteria.setStatus(null);
+            finished=true;
         }
 
         Query query = QueryHelp.getQuery(criteria);
         if (unEnd) {
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.END.name(), OP_STATUS.FINISHED.name()));
+        }else if(finished){
+            query.addCriteria(Criteria.where("status").in(OP_STATUS.END.name(), OP_STATUS.FINISHED.name()));
         }
 //        query.with(Sort.by(Sort.Direction.DESC,"updateDate","createDate"));
         PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable);