更新内容:

1 先进先出根据批次进行挑料
2 工单料盘出库页面任务颜色与灯颜色保持一致(之前首件和截料互换了)
3 界面可点击链接颜色修改为比较明显的颜色
4 工单合单页面调整展示顺序, 并显示工单位置(首件,截料,备件). 总箱子数原来就是显示的工单绑定的所有箱子数

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

@@ -37,6 +37,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 import java.util.Set;
@@ -85,15 +86,13 @@ public class OrderSheetController {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"boxInfos"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"boxInfos"});
         }
         }
 
 
-        for (String boxName :
-                boxNames) {
+        for (String boxName : boxNames) {
             if (liteOrder.hasBox(boxName)) {
             if (liteOrder.hasBox(boxName)) {
                 throw new ValidateException("smfcore.orderSheet.box.exists", "工单{0}已存在箱子{0}", new String[]{liteOrder.getOrderNo(), boxName});
                 throw new ValidateException("smfcore.orderSheet.box.exists", "工单{0}已存在箱子{0}", new String[]{liteOrder.getOrderNo(), boxName});
             }
             }
         }
         }
 
 
-        for (String boxName :
-                boxNames) {
+        for (String boxName : boxNames) {
             OrderBoxInfo boxInfo = new OrderBoxInfo(SecurityUtils.getCurrentUsername(), boxName);
             OrderBoxInfo boxInfo = new OrderBoxInfo(SecurityUtils.getCurrentUsername(), boxName);
             liteOrder.addBox(boxInfo);
             liteOrder.addBox(boxInfo);
         }
         }
@@ -178,7 +177,11 @@ public class OrderSheetController {
             liteOrderManager.save(liteOrder);
             liteOrderManager.save(liteOrder);
             liteOrderCache.addOrderToMap(liteOrder);
             liteOrderCache.addOrderToMap(liteOrder);
         }
         }
-        OrderRIPostDto dto=new OrderRIPostDto(barcodeInfo.getBarcode(),liteOrder.getOrderNo(),type,liteOrder.getBoxNum(),liteOrder.getCurrBoxNum(),position);
+        List<String> positionList = Lists.newArrayList();
+        positionList.add(liteOrder.getPosition(1));
+        positionList.add(liteOrder.getPosition(2));
+        positionList.add(liteOrder.getPosition(3));
+        OrderRIPostDto dto=new OrderRIPostDto(barcodeInfo.getBarcode(),liteOrder.getOrderNo(),type,liteOrder.getBoxNum(),liteOrder.getCurrBoxNum(),position,positionList);
         return dto;
         return dto;
 
 
     }
     }

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

@@ -207,7 +207,7 @@ public class OrderShortageController {
         }
         }
         //欠料位置直接获取
         //欠料位置直接获取
         int type = 4;
         int type = 4;
-        OrderRIPostDto dto = new OrderRIPostDto(barcodeInfo.getBarcode(), liteOrder.getOrderNo(), type, liteOrder.getBoxNum(), liteOrder.getCurrBoxNum(), liteOrder.getPosition(type));
+        OrderRIPostDto dto = new OrderRIPostDto(barcodeInfo.getBarcode(), liteOrder.getOrderNo(), type, liteOrder.getBoxNum(), liteOrder.getCurrBoxNum(), liteOrder.getPosition(type), Lists.newArrayList());
         return dto;
         return dto;
     }
     }
 
 

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

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
+import java.util.List;
+
 /**
 /**
  * 工单合单页面，扫码获取料盘的工单信息及位置
  * 工单合单页面，扫码获取料盘的工单信息及位置
  */
  */
@@ -29,4 +31,7 @@ public class OrderRIPostDto {
 
 
     @ApiModelProperty(value = "位置")
     @ApiModelProperty(value = "位置")
     private String position;
     private String position;
+
+    @ApiModelProperty(value = "工单位置")
+    private List<String> positionList;
 }
 }

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

@@ -601,6 +601,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         Query q = new Query(c);
         Query q = new Query(c);
         //数量从大到小，出库先进先出
         //数量从大到小，出库先进先出
         Sort sort = Sort.by(Sort.Direction.ASC, "barcode.amount");
         Sort sort = Sort.by(Sort.Direction.ASC, "barcode.amount");
+        sort.and(Sort.by(Sort.Direction.ASC, "barcode.batch"));
         sort.and(Sort.by(Sort.Direction.ASC, "canCheckOutTime"));
         sort.and(Sort.by(Sort.Direction.ASC, "canCheckOutTime"));
         q.with(sort);
         q.with(sort);
         List<StoragePos> posList = storagePosDao.findByQuery(q);
         List<StoragePos> posList = storagePosDao.findByQuery(q);