工单修改

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

@@ -73,7 +73,16 @@ public class DateUtil {
     public static Date toDate(final String strDate) throws ParseException {
         return toDate(strDate, getDatePattern());
     }
-
+    public static Date toDate(String strDate, String[] aMasks) throws ParseException {
+        for (String aMask :
+                aMasks) {
+            Date date=toDate(strDate, aMask);
+            if(date!=null){
+                return date;
+            }
+        }
+        return toDate(strDate, getDatePattern());
+    }
     public static Date toDate(String strDate,String aMask){
         SimpleDateFormat df;
         Date date;

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

@@ -317,7 +317,6 @@ public class OrderController {
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.outReelCount",locale,"已出盘数")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.needNum",locale,"需求数量")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.outNum",locale,"已出数量")));
-            header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.exception",locale,"异常")));
 
             //附加字段
             OrderSetting orderSetting=dataCache.getOrderSetting();
@@ -329,6 +328,7 @@ public class OrderController {
                 }
             }
 
+            header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.exception",locale,"异常")));
             List<List<Object>> dataList = new ArrayList<>();
 
             for (LiteOrderItem orderItem : liteOrder.getOrderItems()) {
@@ -344,8 +344,6 @@ public class OrderController {
                 data.add(orderItem.getOutReelCount());
                 data.add(orderItem.getNeedNum());
                 data.add(orderItem.getOutNum());
-                String exception=orderItem.getOutNum()<orderItem.getNeedNum()?MessageUtils.getText("smfcore.order.yes",locale,"是"):"";
-                data.add(exception);
                 //附加字段
                 if(orderSetting.getAppendData()!=null&&orderSetting.getAppendData().size()>0){
                     for (String key :
@@ -355,6 +353,8 @@ public class OrderController {
                         data.add(v);
                     }
                 }
+                String exception=orderItem.getOutNum()<orderItem.getNeedNum()?MessageUtils.getText("smfcore.order.yes",locale,"是"):"";
+                data.add(exception);
                 dataList.add(data);
             }
             FileUtil.downloadExcel(liteOrder.getOrderNo(), header,dataList,response);

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

@@ -718,11 +718,15 @@ public class StoragePosManagerImpl implements IStoragePosManager {
                         //如果是过期日期
                         if (key.equals("barcode.expireDate") || key.equals("barcode.produceDate")) {  //如果是生产日期
                             //把value转换为时间
-//                        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                             try {
                                 Date date = DateUtil.toDate(value);
+                                String[] patternArray=new String[]{"yyyy-MM-dd","MM-dd-yyyy","yyyyMMdd"};
+                                date= DateUtil.toDate(value,patternArray);
+
                                 if(date!=null) {
-                                    c.and(key).is(date);
+                                    //时间判断为当天
+                                    Date endDate=new Date(date.getTime()+24*60*60*1000);
+                                    c.and(key).gte(date).lt(endDate);
                                 }
                             } catch (ParseException e) {
                                 e.printStackTrace();