数量大于50000不允许入库

欠料出库任务按料架排序
欠料出库任务按工单过滤
工单出库任务完成后清除展示
设备管理页面增加是否启用搜索选项,同时列表中展示

src/main/java/com/neotel/smfcore/common/annotation/QueryCondition.java

@@ -5,6 +5,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * @author sunke
+ */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QueryCondition {

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -353,6 +353,10 @@ public class SingleInController {
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{code});
         }
+        int qty = barcode.getLabelAmount();
+        if(qty > 50000){
+            throw new ValidateException("smfcore.error.qty.invalid", "条码数量超过50000不允许入库");
+        }
         Date expireDate = barcode.getExpireDate();
         if (expireDate != null) {
             if (System.currentTimeMillis() > expireDate.getTime()) {

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -224,6 +224,7 @@ public class LiteOrderCache implements ITaskListener {
                     order.setTaskReelCount(order.getTaskReelCount() - 1);
                     order.setTotalTaskReelCount(order.getTotalTaskReelCount() - 1);
                     log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]已取消,任务数-1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
+                    taskService.removeFinishedTask(task);
                 } else if (task.isFinished()) {
                     order.setFinishedReelCount(order.getFinishedReelCount() + 1);
                     order.setTotalFinishedReelCount(order.getTotalFinishedReelCount() + 1);
@@ -251,6 +252,7 @@ public class LiteOrderCache implements ITaskListener {
                             boolean result = HikApi.orderEndApi(order.getOperateUser(), order.getJobNo());
                         }
                     }
+                    taskService.removeFinishedTask(task);
                 } else {
                     log.error("工单[" + orderNo + "]的任务[" + task.getBarcode() + "]完成时,状态为:" + task.getStatus());
                 }
@@ -490,6 +492,8 @@ public class LiteOrderCache implements ITaskListener {
                 }
             }
 
+            log.info("开始挑选["+orderItem.getStation()+"]物料["+pn+"] 可用库存数量:" + posList.size());
+
             int targetNum = needNum;
             List<StoragePos> outPosList = new ArrayList<>();
             if(cacheOrder.isRepleOrder()){

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

@@ -37,6 +37,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -55,9 +56,6 @@ public class OrderShortageController {
     private IDataLogManager dataLogManager;
 
     @Autowired
-    private IGroupManager groupManager;
-
-    @Autowired
     private TaskMapper taskMapper;
 
     @Autowired
@@ -157,23 +155,12 @@ public class OrderShortageController {
                 }
             }
         }
-        //判断是否已有在出库中的工单
-//        Integer[] status = new Integer[]{LITEORDER_STATUS.ADDOUTBOUND};
-//        Query query = getQuery(new OrderQueryCondition(), status);
-//        List<LiteOrder> liteOrders = liteOrderManager.findByQuery(query);
-
-//        if (liteOrders.size() > 0) {
-//            LiteOrder liteOrder = liteOrders.get(0);
-//            List<DataLog> allTasks = taskService.getAllTasks();
-//            for (DataLog datalog : allTasks) {
-//                if (datalog.isOrderTask() && datalog.getSourceId().equals(liteOrder.getId())) {
-//                    //判断是否是缺料出库
-//                    if (datalog.isAddOutbound()) {
-//                        taskList.add(datalog);
-//                    }
-//                }
-//            }
-//        }
+        taskList.sort(new Comparator<DataLog>() {
+            @Override
+            public int compare(DataLog o1, DataLog o2) {
+                return o1.getCid().compareTo(o2.getCid());
+            }
+        });
         return taskMapper.toDto(taskList);
     }
 

src/main/java/com/neotel/smfcore/core/storage/rest/query/StorageQueryCriteria.java

@@ -15,11 +15,13 @@ public class StorageQueryCriteria {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BetweenData<Date> createDate;
 
-
     @QueryCondition
     private String name;
     @QueryCondition
     private String cid;
     @QueryCondition
     private String type;
+
+    @QueryCondition
+    private Boolean available;
 }

src/main/resources/config/application-prod.yml

 #配置数据源
-data:
-  mongodb:
-    host: 10.1.129.59  # 主机地址
-    port: 27017           # 端口
-    database: hikvision        # 数据库
+spring:
+  data:
+    mongodb:
+      host: 10.1.129.59  # 主机地址
+      port: 27017           # 端口
+      database: hikvision        # 数据库
+
 
 # 登录相关配置
 login:

src/main/resources/config/application.yml

@@ -86,7 +86,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: 'prod'
+    active: '@package.environment@'
   jackson:
     time-zone: GMT+8
   data:
@@ -94,6 +94,8 @@ spring:
         host: localhost  # 主机地址
         port: 27017           # 端口
         database: hikvision       # 数据库
+        minConSize: 10
+        maxConSize: 20
 
   messages:
     encoding: utf-8