bug修改。

src/main/java/com/neotel/smfcore/common/utils/QueryHelp.java

@@ -81,7 +81,8 @@ public class QueryHelp {
                             case IN:
                                 if (CollUtil.isNotEmpty((Collection<Object>)val)) {
                                     //criteria = criteria.and(attributeName).in((Collection<Object>) val);
-                                    allCriteria.add(Criteria.where(attributeName).in(val));
+                                    Object[] array= ((Collection<Object>)val).toArray();
+                                    allCriteria.add(Criteria.where(attributeName).in(array));
                                 }
                                 break;
                             case NIN:

src/main/java/com/neotel/smfcore/core/order/enums/LITEORDER_STATUS.java

@@ -23,4 +23,15 @@ public class LITEORDER_STATUS {
 
     /**工单已关闭*/
     public static int CLOSED=7;
+    /**
+     * 工单状态
+     * 0=新建
+     * 1=正在出库
+     * 2=套料已完成
+     * 3=正在出库
+     * 4=尾料已完成
+     * 5=正在补料
+     * 6=补料已完成
+     * 7=关闭
+     */
 }

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

@@ -129,7 +129,7 @@ public class OrderController {
 
             LiteOrder liteOrder = new LiteOrder(so, liteOrderItems);
             liteOrder.setType(type);
-            liteOrder.setSource(localFile.getAbsolutePath());
+            liteOrder.setSource(localFile.getName());
             liteOrder.setStatus(LITEORDER_STATUS.NEW);
             LiteOrder dbOrder = liteOrderManager.findByOrderNo(liteOrder.getOrderNo());
             if (dbOrder == null) {
@@ -198,7 +198,8 @@ public class OrderController {
             }
         }
         PageData<LiteOrder> orderList = liteOrderManager.findByPage(query, pageable);
-        return orderMapper.toDto(orderList);
+        PageData<OrderDto> resultList=orderMapper.toDto(orderList);
+        return resultList;
     }
 
 

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java

@@ -48,6 +48,14 @@ public class LiteOrder extends BasePo implements Serializable {
      */
     private boolean closed = false;
 
+    public void setClosed(boolean value){
+        this.closed=value;
+        if(value){
+            setStatus(LITEORDER_STATUS.CLOSED);
+        }
+    }
+
+
     /**
      * 工单来源
      */

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

+package com.neotel.smfcore.core.storage.rest.query;
+
+import com.neotel.smfcore.common.annotation.QueryCondition;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InventoryQueryCriteria {
+
+    @QueryCondition(isDBId =true)
+    private String storageId;
+
+    @QueryCondition(type = QueryCondition.Type.IN, propName = "storageId")
+    private List<String> storageIdList;
+}

src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java

@@ -45,4 +45,6 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
     StoragePos getByFixtureCode(String fixtureBarcode);
 
     StoragePos getByBarcodeId(String barcodeId);
+
+    void clearStoragePosLabel(String id);
 }

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -24,6 +24,7 @@ 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.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -375,4 +376,10 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         return storagePosDao.findOneByCondition(new String[]{"barcode.id"}, new String[]{barcodeId});
     }
 
+    @Override
+    public void clearStoragePosLabel(String labelId) {
+        Query query = new Query(Criteria.where("labelId").is(labelId));
+        storagePosDao.updateMulti(query, Update.update("labelId",""));
+    }
+
 }

src/main/java/com/neotel/smfcore/core/storage/service/po/StoragePos.java

@@ -53,6 +53,11 @@ public class StoragePos extends BasePo implements Serializable {
     private long canCheckOutTime = 0;
 
     /**
+     * 标签ID
+     */
+    private String labelId="";
+
+    /**
      * 并联的其他库位,合并入主库位的库位
      */
     private List<String> mergePosList;