更新库存导入功能

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@@ -49,7 +49,13 @@ public class DepositoryController {
         Map<String, Object> source = new HashMap<>();
         List<Object> sourceList = new ArrayList<>();
         int month = instance.get(Calendar.MONTH) + 1;
+        // 获取下个月
+        instance.add(Calendar.MONTH,1);
+        Long nextMonth = DateUtil.DateTimeByMonthToTimeStamp(formatter.format(instance.getTime()));
         ArrayList<Object> months = new ArrayList<>();
+        months.add(nextMonth);
+        instance.add(Calendar.MONTH,-1);
+
         while (month > 0) {
             instance.set(Calendar.MONTH, month);
             instance.set(Calendar.DAY_OF_MONTH, -1);
@@ -59,8 +65,7 @@ public class DepositoryController {
             sourceList.add(((HashMap<String, Object>) source).clone());
         }
         instance.set(Calendar.MONTH, month);
-        instance.set(Calendar.DAY_OF_MONTH, 1);
+        instance.add(Calendar.MONTH, 1);
-        months.add(DateUtil.DateTimeByMonthToTimeStamp(formatter.format(instance.getTime())));
         Map<String, Object> map = new HashMap<>();
         map.put("months", months);
         map.put("sourceList", sourceList);

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -762,8 +762,8 @@ public class MaterialServiceImpl implements MaterialService {
         else {
             // 用于标志是新插入的物料
             map.put("isNew", true);
-            Object producedDate = map.get("producedDate");
+           if(!map.containsKey("producedDate")){
-            if(producedDate == null){
+               // 如果不包含生产日期
                map.put("producedDate",0);
            }
             return materialMapper.insertInventory(map);

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -462,9 +462,9 @@ public class StockTakingServiceImpl implements StockTakingService {
                     public void run() {
                         // 获取盘点人员
                         UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken);
-                        String workwechat = originator.getWorkwechat();
+//                        String workwechat = originator.getWorkwechat();
                         JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent);
-//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId,normalMinId);
+//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent);
                         // 将当前返回结果保存到redis中
                         if (jsonObject != null) {
                             Map<String, Object> QyWxMessageMap = new HashMap<>();
@@ -1312,9 +1312,9 @@ public class StockTakingServiceImpl implements StockTakingService {
                         public void run() {
                             // 获取盘点人员
                             UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
-                            String workwechat = originator.getWorkwechat();
+//                            String workwechat = originator.getWorkwechat();
                             JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent);
-//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId,normalMinId);
+//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat,  ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent);
                             // 将当前返回结果保存到redis中
                             if (jsonObject != null) {
                                 Map<String, Object> QyWxMessageMap = new HashMap<>();
@@ -1755,7 +1755,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                         UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
 //                        String workwechat = originator.getWorkwechat();
                         JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent);
-//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds);
+//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent);
                         if (jsonObject != null) {
                             // 将当前返回结果保存到redis中
                             Map<String, Object> QyWxMessageMap = new HashMap<>();
@@ -1779,7 +1779,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                         UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
 //                        String workwechat = originator.getWorkwechat();
                         qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent);
-//                        qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord,null);
+//                        qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent);
                     }
                 }).start();
             }

src/main/resources/application-test.yml

@@ -79,9 +79,9 @@ mybatis:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     log-prefix: mapper.
 
-mybatis-plus:
+#mybatis-plus:
-  configuration:
+#  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 file:
   uploadPath: D:/upLoad

src/test/java/com/dreamchaser/depository_manage/TestForgetSourceList.java

@@ -36,7 +36,9 @@ public class TestForgetSourceList {
 
     @Test
     public void Test(){
-
+        List<Object> sourceList = getSourceList("1");
+        System.out.println(sourceList);
+//        getPreviousMonth();
     }
 
     // 根据id获取子类
@@ -92,7 +94,6 @@ public class TestForgetSourceList {
         }
         List<String> barSource = new ArrayList<>();
         barSource.add("month");
-
         for (int i = 0; i < materialTypeAll.size(); i++) {
             barSource.add(materialTypeAll.get(i).getTname());
         }
@@ -187,19 +188,23 @@ public class TestForgetSourceList {
         Map<String, Object> source = new HashMap<>();
         List<Object> sourceList = new ArrayList<>();
         int month = instance.get(Calendar.MONTH) + 1;
+        // 获取下个月
+        instance.add(Calendar.MONTH,1);
+        Long nextMonth = DateUtil.DateTimeByMonthToTimeStamp(formatter.format(instance.getTime()));
         ArrayList<Object> months = new ArrayList<>();
+        months.add(nextMonth);
+        instance.add(Calendar.MONTH,-1);
+
         while (month > 0) {
             instance.set(Calendar.MONTH, month);
             instance.set(Calendar.DAY_OF_MONTH, -1);
             source.put("month", month + "月");
-            System.out.println(formatter.format(instance.getTime()));;
             months.add(DateUtil.DateTimeByMonthToTimeStamp(formatter.format(instance.getTime())));
             month--;
             sourceList.add(((HashMap<String, Object>) source).clone());
         }
         instance.set(Calendar.MONTH, month);
-        instance.set(Calendar.DAY_OF_MONTH, 1);
+        instance.add(Calendar.MONTH, 1);
-        months.add(DateUtil.DateTimeByMonthToTimeStamp(formatter.format(instance.getTime())));
         Map<String, Object> map = new HashMap<>();
         map.put("months", months);
         map.put("sourceList", sourceList);

target/classes/application-test.yml

@@ -79,9 +79,9 @@ mybatis:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     log-prefix: mapper.
 
-mybatis-plus:
+#mybatis-plus:
-  configuration:
+#  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 file:
   uploadPath: D:/upLoad