Session超时时间改为30分钟,避免总是提示登陆

上传文件时增加取消按钮
产品编辑增加供应商名称

myproject/src/main/java/com/myproject/webapp/controller/FileUploadController.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import org.springframework.web.servlet.ModelAndView;
@@ -96,7 +97,11 @@ public class FileUploadController extends BaseFormController {
 //        }*/
 
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        CommonsMultipartFile file = (CommonsMultipartFile) multipartRequest.getFile("file");
+        MultipartFile uploadFile = multipartRequest.getFile("file");
+        if(uploadFile == null){
+            return getCancelView();
+        }
+        CommonsMultipartFile file = (CommonsMultipartFile) uploadFile;
 
         // the directory to upload to
         String uploadDir = getServletContext().getRealPath("/resources");

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

@@ -275,19 +275,19 @@ public class DataCache{
                         barcode.setLabelAmount(currentLabelAmount);
                         needUpdate = true;
                     }
-                    Date produceDate = barcodeFromRule.getProduceDate();
-                    if(produceDate != null){
-                        //抓取到了生产日期,未抓取到过期日期,重新设置过期日期
-                        if(barcode.getExpireDate() == null){
-                            if(validDay > 0){
-                                log.info("重新设置"+codeBeanFromRule.getCodeStr()+"生产日期和过期日期");
-                                Date expireDate = DateUtil.addDays(produceDate, validDay);
-                                barcode.setExpireDate(expireDate);
-                                barcode.setProduceDate(produceDate);
-                                needUpdate = true;
-                            }
-                        }
-                    }
+//                    Date produceDate = barcodeFromRule.getProduceDate();
+//                    if(produceDate != null){
+//                        //抓取到了生产日期,未抓取到过期日期,重新设置过期日期
+//                        if(barcode.getExpireDate() == null){
+//                            if(validDay > 0){
+//                                log.info("重新设置"+codeBeanFromRule.getCodeStr()+"生产日期和过期日期");
+//                                Date expireDate = DateUtil.addDays(produceDate, validDay);
+//                                barcode.setExpireDate(expireDate);
+//                                barcode.setProduceDate(produceDate);
+//                                needUpdate = true;
+//                            }
+//                        }
+//                    }
 
                     if(needUpdate){
                         try {

myproject/src/main/resources/StorageResources.properties

@@ -460,4 +460,5 @@ solder.status.6=Outting
 solder.status.7=Retreat storage
 order.out.executing=The order is executing.
 order.out.maxOrder=The maximum number of executable orders has been reached
-order.out.noTask=The order has no reel to out.
\ No newline at end of file
+order.out.noTask=The order has no reel to out.
+barcode.supplierName=Supplier Name
\ No newline at end of file

myproject/src/main/resources/StorageResources_en.properties

@@ -391,7 +391,7 @@ dataLog.date=Date
 menu.batch.feeder=Feeder Station Sequence
 shelf.msg.fastop=Barcode operation is too frequent, please try again later
 order.num.modify=Order Qty Modify
-barcode.supplierPn=Supplier PN
+barcode.supplierName=Supplier Name
 op.status.executing=In process
 cabinet.error.posError=Illegal operation\: door not found
 user.email=Email

myproject/src/main/resources/StorageResources_jp.properties

@@ -390,7 +390,7 @@ dataLog.date=\u65E5\u4ED8
 menu.batch.feeder=\u30D5\u30A3\u30FC\u30C0\u30FC\u30EA\u30B9\u30C8
 shelf.msg.fastop=\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u64CD\u4F5C\u304C\u983B\u7E41\u3067\u3059\u306E\u3067\u3001\u5F8C\u3067\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 order.num.modify=\u30AA\u30FC\u30C0\u30FC\u6570\u91CF\u3092\u5909\u66F4
-barcode.supplierPn=\u30B5\u30D7\u30E9\u30A4\u30E4\u30FCPN
+barcode.supplierName=\u30B5\u30D7\u30E9\u30A4\u30E4\u30FC
 op.status.executing=\u5B9F\u884C\u4E2D
 cabinet.error.posError=\u4E0D\u6B63\u64CD\u4F5C\uFF1A\u30C9\u30A2\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 user.email=\u30E1\u30FC\u30EB

myproject/src/main/resources/StorageResources_zh_CN.properties

@@ -392,7 +392,7 @@ error.storage.noPos=\u65E0\u53EF\u7528\u7684\u6599\u683C[{0}]\uFF0C\u65E0\u6CD5\
 dataLog.date=\u65E5\u671F
 menu.batch.feeder=\u7AD9\u4F4D\u5217\u8868
 shelf.msg.fastop=\u6761\u7801\u64CD\u4F5C\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5
-barcode.supplierPn=\u4F9B\u5E94\u5546 PN
+barcode.supplierName=\u4F9B\u5E94\u5546\u540D\u79F0
 order.num.modify=\u5DE5\u5355\u6570\u91CF\u4FEE\u6539
 op.status.executing=\u6B63\u5728\u6267\u884C
 user.email=\u90AE\u7BB1

myproject/src/main/resources/mongo.xml

@@ -14,7 +14,7 @@
 
        <!--<mongo:mongo id="mongo" replica-set="${mongo.replica-set}">-->
 
-       <mongo:mongo id="mongo" host="192.168.1.34" port="27017">
+       <mongo:mongo id="mongo" host="${mongo.host}" port="27017">
               <mongo:options connections-per-host="${mongo.connectionsPerHost}"
                              threads-allowed-to-block-for-connection-multiplier="${mongo.threadsAllowedToBlockForConnectionMultiplier}"
                              connect-timeout="${mongo.connectTimeout}" max-wait-time="${mongo.maxWaitTime}"

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

@@ -452,14 +452,14 @@
                                     <form:input type="text" id="provider" path="provider" class="form-control"/>
                                 </div>
                             </div>
-                                <%--&lt;%&ndash;供应商PN&ndash;%&gt;--%>
-                            <%--<label class="control-label col-md-2"><fmt:message key="barcode.supplierPn"/> </label>--%>
+                                <%--供应商PN--%>
+                            <label class="control-label col-md-2"><fmt:message key="barcode.supplierName"/> </label>
 
-                            <%--<div class="col-md-3">--%>
-                                <%--<div style="text-align:left" class="input-group">--%>
-                                    <%--<form:input type="text" id="supplierPn" path="supplierPn" class="form-control"/>--%>
-                                <%--</div>--%>
-                            <%--</div>--%>
+                            <div class="col-md-3">
+                                <div style="text-align:left" class="input-group">
+                                    <form:input type="text" id="supplierPn" path="producer" class="form-control"/>
+                                </div>
+                            </div>
                                 <%--&lt;%&ndash;贵重物料&ndash;%&gt;--%>
                                 <%--<label class="control-label col-md-2"><fmt:message key="otherComponent.expensive"/> </label>--%>
 

myproject/src/main/webapp/WEB-INF/web.xml

@@ -234,7 +234,7 @@
     </jsp-config>
 
     <session-config>
-        <session-timeout>10</session-timeout>
+        <session-timeout>30</session-timeout>
         <cookie-config>
             <http-only>true</http-only>
             <!--<secure>true</secure>-->

myproject/src/main/webapp/common/fileUpload.jsp

@@ -40,9 +40,9 @@
                 <button type="submit" name="upload" class="btn btn-primary" onclick="bCancel=false">
                     <i class="icon-upload icon-white"></i> <fmt:message key="button.upload"/>
                 </button>
-                <%--<button type="submit" name="cancel" class="btn btn-default" onclick="bCancel=true">--%>
-                <%--<i class="icon-remove"></i> <fmt:message key="button.cancel"/>--%>
-                <%--</button>--%>
+                <button type="submit" name="cancel" class="btn btn-default " data-dismiss="modal" aria-hidden="true" onclick="bCancel=true">
+                <i class="icon-remove"></i> <fmt:message key="button.cancel"/>
+                </button>
             </div>
             </form>
         </div>

myproject/src/main/webapp/decorators/metro.jsp

@@ -241,7 +241,7 @@
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: 1.5.1318</span>
+  <span class="right" style="color: #a3a3a3;">Version: 1.5.2010</span>
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
   </div>