扫码料架

日历框中文乱码问题

myproject/src/main/java/com/myproject/bean/update/Storage.java

@@ -179,6 +179,13 @@ public class Storage extends BaseMongoBean {
         return StorageConstants.TYPE.ACCSHELF.name().equals(type);
     }
 
+    /**
+     * 是否是扫码料架
+     */
+    public boolean isCodeShelf() {
+        return StorageConstants.TYPE.CODESHELF.name().equals(type);
+    }
+
 
     /**
      * 是否是料柜

myproject/src/main/java/com/myproject/util/StorageConstants.java

@@ -218,6 +218,11 @@ public class StorageConstants {
          */
         NEWSHELF("storage.type.newShelf"),
 
+        /**
+         * 9 扫码料架
+         */
+        CODESHELF("storage.type.codeShelf"),
+
         ;
 
         private String key;

myproject/src/main/java/com/myproject/webapp/controller/webService/DataCache.java

@@ -557,9 +557,10 @@ public class DataCache{
         return null;
     }
 
-    public Storage reloadStorage(Storage storage){
+    public Storage reloadStorage(Storage storage) throws ValidateException {
         List<PlateSizeBean> plateSizeBeanList = storagePosManager.getStoragePosUsage(storage.getId());
         storage.initUsage(plateSizeBeanList);
+        storage = storageManager.save(storage);
         allStorage.put(storage.getCid(), storage);
         return storage;
     }
@@ -601,14 +602,20 @@ public class DataCache{
      * 获取库存信息,key 为 PN
      */
     public Map<String,InventoryItem> getAllInventory(){
-        Map<String,InventoryItem> allInventory = Maps.newHashMap();
-
         Map<String, Storage> allStorages = getAllStorage();
-        for (String cid : allStorages.keySet()) {
-            Map<String, InventoryItem> storageInventory = getStorageInventory(cid);
+        return getInventory(allStorages.values());
+    }
+
+    /**
+     * 获取某些料仓的库存信息
+     */
+    public Map<String,InventoryItem> getInventory(Collection<Storage> storageList){
+        Map<String,InventoryItem> resultMap = Maps.newHashMap();
+        for (Storage storage : storageList) {
+            Map<String, InventoryItem> storageInventory = getStorageInventory(storage.getCid());
             for(InventoryItem storageInventoryItem : storageInventory.values()){
                 String partNumber = storageInventoryItem.getPartNumber();
-                InventoryItem pnInventoryItem = allInventory.get(storageInventoryItem.getPartNumber());
+                InventoryItem pnInventoryItem = resultMap.get(storageInventoryItem.getPartNumber());
                 if(pnInventoryItem == null){
                     pnInventoryItem = new InventoryItem();
                 }
@@ -617,12 +624,15 @@ public class DataCache{
                 pnInventoryItem.setLockCount(pnInventoryItem.getLockCount() + storageInventoryItem.getLockCount());
                 pnInventoryItem.setStockReel(pnInventoryItem.getStockReel() + storageInventoryItem.getStockReel());
                 pnInventoryItem.setLockReel(pnInventoryItem.getLockReel() + storageInventoryItem.getLockReel());
-                allInventory.put(partNumber,pnInventoryItem);
+                resultMap.put(partNumber,pnInventoryItem);
             }
         }
-        return allInventory;
+        return resultMap;
     }
 
+    /**
+     * 获取料仓的库存信息
+     */
     public Map<String, InventoryItem> getStorageInventory(String cid){
         Map<String, InventoryItem> storageInventory = inventoryMap.get(cid);
         if(storageInventory == null){

myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp

@@ -349,13 +349,6 @@
     <c:set var="scripts" scope="request">
         <script>
 
-            $('.date-picker').datepicker({
-                rtl: Metronic.isRTL(),
-                orientation: "left",
-                autoclose: true,
-                language:'${locale}'
-            });
-
             var limitCodes = "${limitCodes}".split(",");
             for (i=0;i<limitCodes.length ;i++ ) {
                 var limitClass = ".limit"+limitCodes[i];

myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp

@@ -174,12 +174,16 @@
                 <c:set var="detailUrl" value="${ctx}/storage/accShelf/${storage.cid}"/>
             </c:if>
 
+            <c:if test="${storage.codeShelf}">
+                <c:set var="detailUrl" value="${ctx}/storage/codeShelf"/>
+            </c:if>
+
             <c:if test="${storage.virtual}">
                 <c:set var="detailUrl" value="${ctx}/storage/virtual/${storage.cid}"/>
             </c:if>
             <div class="portlet box green-haze tasks-widget">
                 <c:choose>
-                    <c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual}">
+                    <c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual || storage.codeShelf}">
                         <%--智能料架--%>
                         <div class="portlet-title">
                             <div style="text-align:center;font-size: 28px;"><a style="color:#FFFFFF;" href="${detailUrl}">${storage.name}</a></div>
@@ -805,12 +809,14 @@
 
                     var allContent = $(".task-content");
                     allContent.each(function(index){
+                        var itemCount = $(this).children(".itembox").size();
+                        $(this).attr("style","height:"+itemCount*34+"px;");
                         if(index % 2 == 1){
                             var height = $(this).attr("style");
                             if(height){
                                 return;
                             }
-                            var itemCount = $(this).children(".itembox").size();
+
                             var lastContent = allContent.eq(index -1);
                             var lastItemCount = lastContent.children(".itembox").size();
                             if(itemCount < lastItemCount){

myproject/src/main/webapp/assets/global/plugins/bootstrap-datepicker/js/locales/bootstrap-datepicker.zh-CN.js

@@ -4,12 +4,12 @@
  */
 ;(function($){
 	$.fn.datepicker.dates['zh-CN'] = {
-		days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
-		daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-		daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
-		months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-		monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-		today: "今日",
+		days: ["\u661F\u671F\u65E5", "\u661F\u671F\u4E00", "\u661F\u671F\u4E8C", "\u661F\u671F\u4E09", "\u661F\u671F\u56DB", "\u661F\u671F\u4E94", "\u661F\u671F\u516D", "\u661F\u671F\u65E5"],
+		daysShort: ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"],
+		daysMin:  ["\u65E5", "\u4E00", "\u4E8C", "\u4E09", "\u56DB", "\u4E94", "\u516D", "\u65E5"],
+		months: ["\u4E00\u6708", "\u4E8C\u6708", "\u4E09\u6708", "\u56DB\u6708", "\u4E94\u6708", "\u516D\u6708", "\u4E03\u6708", "\u516B\u6708", "\u4E5D\u6708", "\u5341\u6708", "\u5341\u4E00\u6708", "\u5341\u4E8C\u6708"],
+		monthsShort: ["\u4E00\u6708", "\u4E8C\u6708", "\u4E09\u6708", "\u56DB\u6708", "\u4E94\u6708", "\u516D\u6708", "\u4E03\u6708", "\u516B\u6708", "\u4E5D\u6708", "\u5341\u6708", "\u5341\u4E00\u6708", "\u5341\u4E8C\u6708"],
+		today: "\u4ECA\u65E5",
 		weekStart: 1
 	};
 	$.fn.datepicker.dates['en'] = {