计算工具类

hx-common/common-tool/src/main/java/com/fjhx/utils/DateUtil.java

@@ -36,20 +36,18 @@ public class DateUtil {
 
     /**
      * 判断日期距离现在多少天
+     *
      * @param date
      * @return
      * @throws ParseException
      */
     public static String differenceDate(String date) throws ParseException {
-        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");//指定格式时间转换
-        Date d=simpleDateFormat.parse(date);//转换成日期
-        long datetime=d.getTime();//时间转换成毫秒值
-        long todaytime=new Date().getTime();//获取当前日期毫秒值
-        long Difference=todaytime-datetime;//差值
-        return String.valueOf(Difference/1000/60/60/24);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//指定格式时间转换
+        Date d = simpleDateFormat.parse(date);//转换成日期
+        long datetime = d.getTime();//时间转换成毫秒值
+        long todaytime = new Date().getTime();//获取当前日期毫秒值
+        long Difference = todaytime - datetime;//差值
+        return String.valueOf(Difference / 1000 / 60 / 60 / 24);
     }
 
-    public static void main(String[] args) throws ParseException {
-
-    }
 }

hx-common/common-tool/src/main/java/com/fjhx/utils/ListUtil.java

@@ -1,6 +1,5 @@
 package com.fjhx.utils;
 
-import io.swagger.models.auth.In;
 import org.springblade.core.tool.utils.StringUtil;
 
 import java.util.HashMap;
@@ -13,22 +12,22 @@ import java.util.Map;
  */
 public class ListUtil {
 
-    public static Map<String, Integer> duplicateCheckingCount(List<String> list){
-        Map<String,Integer> map = new HashMap<>();
+    public static Map<String, Integer> duplicateCheckingCount(List<String> list) {
+        Map<String, Integer> map = new HashMap<>();
         for (String string : list) {
-            if(map.containsKey(string)) {
-                map.put(string, map.get(string).intValue()+1);
-            }else {
+            if (map.containsKey(string)) {
+                map.put(string, map.get(string).intValue() + 1);
+            } else {
                 map.put(string, new Integer(1));
             }
         }
         return map;
     }
 
-    public static Boolean checkList(List<String> list,String eq){
-        for(String i:list){
-            if(!StringUtil.equals(i,eq)){
-               return false;
+    public static Boolean checkList(List<String> list, String eq) {
+        for (String i : list) {
+            if (!StringUtil.equals(i, eq)) {
+                return false;
             }
         }
         return true;

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -335,6 +335,8 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
                 String code = map.get("code").toString();
                 List<Map<String, Object>> listByCode = listGroupCode.get(code);
 
+                map.put("name", map.get("name").toString().replace(key + "-", ""));
+
                 PickingTrackingNumStatisticsResult temp = new PickingTrackingNumStatisticsResult();
 
                 // 赋值排班领料