Merge remote-tracking branch 'origin/master'

myproject/src/main/java/com/myproject/bean/excel/CNCsvView.java

@@ -12,12 +12,13 @@ import java.io.Writer;
 public class CNCsvView extends CsvView{
 public class CNCsvView extends CsvView{
     @Override
     @Override
     public String getMimeType() {
     public String getMimeType() {
-        return "text/csv";
+        return "text/csv;charset=GB2312";
+//        return "text/csv";
     }
     }
 
 
-    @Override
-    public void doExport(Writer out) throws IOException, JspException {
-        out.write(new String(new byte[] { (byte) 0xEF, (byte) 0xBB,(byte) 0xBF }));
-        super.doExport(out);
-    }
+//    @Override
+//    public void doExport(Writer out) throws IOException, JspException {
+//        out.write(new String(new byte[] { (byte) 0xEF, (byte) 0xBB,(byte) 0xBF }));
+//        super.doExport(out);
+//    }
 }
 }

myproject/src/main/java/com/myproject/bean/qisda/InquiryShelfBean.java

@@ -361,7 +361,7 @@ public class InquiryShelfBean {
         }else if(appendInfo.isTailAction()){
         }else if(appendInfo.isTailAction()){
 
 
             //补料盘,解除最后一个料架上的位置
             //补料盘,解除最后一个料架上的位置
-            ShelfInfo maxShelf = null;
+            ShelfInfo minShelf = null;
             String taskShelfType = appendInfo.getShelfType();
             String taskShelfType = appendInfo.getShelfType();
             String targetShelfType = taskShelfType;
             String targetShelfType = taskShelfType;
             for (ShelfInfo shelfInfo : shelfMap.values()) {
             for (ShelfInfo shelfInfo : shelfMap.values()) {
@@ -383,17 +383,17 @@ public class InquiryShelfBean {
                         targetShelfType = StorageConstants.SHEFL_TYPE.C;
                         targetShelfType = StorageConstants.SHEFL_TYPE.C;
                     }
                     }
                     if(shelfInfo.getShelfType().equals(targetShelfType) && !shelfInfo.isFull()){
                     if(shelfInfo.getShelfType().equals(targetShelfType) && !shelfInfo.isFull()){
-                        if(maxShelf == null || shelfInfo.getRfidIndex() > maxShelf.getRfidIndex()){
-                            maxShelf = shelfInfo;
+                        if(minShelf == null || shelfInfo.getRfidIndex() < minShelf.getRfidIndex()){
+                            minShelf = shelfInfo;
                         }
                         }
                     }
                     }
                 }
                 }
             }
             }
-            if(maxShelf != null){
-                boolean result =maxShelf.cancelLoc(targetShelfType, task);
+            if(minShelf != null){
+                boolean result =minShelf.cancelLoc(targetShelfType, task);
                 if(result){
                 if(result){
-                    log.info("补料盘["+task.getBarcode()+"]任务取消,同类型最大料架" + maxShelf.tempRfid() +"架位置空");
-                    updateShelfInfo(maxShelf);
+                    log.info("补料盘["+task.getBarcode()+"]任务取消,同类型最小料架" + minShelf.tempRfid() +"架位置空");
+                    updateShelfInfo(minShelf);
                 }
                 }
             }
             }
         }
         }