一些注释

src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java

@@ -26,9 +26,10 @@ public class PublicConfig {
     // 部署数据库 depository NhE47edekBHxhjYk
 
 
-    // 接口地址
+    // 接口地址(本地使用)
     public static String external_url = "http://172.20.2.87:39168";
-    //    public static String external_url = "http://127.0.0.1:39168";
+    // 部署后，内网使用
+//        public static String external_url = "http://127.0.0.1:39168";
     public static String external_url_6666 = "http://kpi.hxgk.group/kpiapi";
 
     // 外网地址，用于接收验证

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

@@ -28,6 +28,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 
+/**
+ * 用于智慧化工平台的一键登录
+ */
 @Slf4j
 @RestController
 public class IdentityVerifyController {

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

@@ -85,9 +85,9 @@ public class StockTakingController {
             if (workwechat == null || "".equals(workwechat)) {
                 workwechat = departmentManager.getWechat();
             }
-            QyWxDepartmentManager.append(workwechat+",");
+//            QyWxDepartmentManager.append(workwechat+",");
         }
-//        QyWxDepartmentManager.append("PangFuZhen").append(",");
+        QyWxDepartmentManager.append("PangFuZhen").append(",");
         map.put("state", 3);
         map.put("departmentManagerState", 3);
         map.remove("departmentManagerId");
@@ -461,9 +461,9 @@ public class StockTakingController {
                 if (workwechat == null || "".equals(workwechat)) {
                     workwechat = departmentManager.getWechat();
                 }
-            QyWxDepartmentManager.append(workwechat+",");
+//            QyWxDepartmentManager.append(workwechat+",");
             }
-//            QyWxDepartmentManager.append("PangFuZhen");
+            QyWxDepartmentManager.append("PangFuZhen");
             if (map.containsKey("mainIdList")) {
                 List<Object> mainIdList = ObjectFormatUtil.objToList(map.get("mainIdList"),Object.class);
                 for (Object main : mainIdList

src/main/java/com/dreamchaser/depository_manage/service/ExcelService.java

@@ -8,6 +8,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
+/**
+ * excel导入service
+ */
 public interface ExcelService {
 
     /**

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

@@ -1285,7 +1285,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 restResponse.setData("");
                 restResponse.setStatusInfo(new StatusInfo("出库失败", "出库失败，库存不足"));
             }
-        } else {
+        }
+        else {
             // 如果是拆单后的出库
 
             // 用于获取对应的拆单记录
@@ -1573,7 +1574,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     }
                 }
 
-            } else {
+            }
+            else {
                 // 如果拆单库存处理记录不存在
 
                 int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L);
@@ -1843,7 +1845,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 materialAndPlace.setQuantity(materialAndPlace.getQuantity() - inventory_quantity);
                                 inventory.setQuantity(inventory.getQuantity() - inventory_quantity);
 
-
                                 // 修改库存数量
                                 materialMapper.updateInventory(inventory);
                                 placeMapper.updateMaterialAndPlace(materialAndPlace);
@@ -2473,9 +2474,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             if (workwechat == null || "".equals(workwechat)) {
                 workwechat = depositoryManager.getWechat();
             }
-                    depositoryManagerByQyWx.append(workwechat+",");
+//                    depositoryManagerByQyWx.append(workwechat+",");
         }
-//        depositoryManagerByQyWx.append("PangFuZhen,");
+        depositoryManagerByQyWx.append("PangFuZhen,");
         JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent, userKey, token);
 
         // 删除redis中本订单
@@ -2669,9 +2670,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 if (workwechat == null || "".equals(workwechat)) {
                                     workwechat = manager.getWechat();
                                 }
-                        QyWxUid.append(workwechat+",");
+//                        QyWxUid.append(workwechat+",");
                             }
-//                            QyWxUid.append("PangFuZhen,");
+                            QyWxUid.append("PangFuZhen,");
                             // 将当前子单的管理员插入到子单记录中
                             minRecord.put("manager", minRecordManage.toString());
                             // 添加子订单到redis中
@@ -2753,9 +2754,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 if (workwechat == null || "".equals(workwechat)) {
                                     workwechat = manager.getWechat();
                                 }
-                        QyWxUid.append(workwechat+",");
+//                        QyWxUid.append(workwechat+",");
                             }
-//                            QyWxUid.append("PangFuZhen,");
+                            QyWxUid.append("PangFuZhen,");
                             minRecord.put("manager", minRecordManage.toString());
                             // 添加子订单到redis中
                             redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@@ -3379,7 +3380,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             if (workwechat == null || "".equals(workwechat)) {
                                 workwechat = departmentHead.getWechat();
                             }
-                            QyWxUid.append(workwechat).append(",");
+//                            QyWxUid.append(workwechat).append(",");
                         }
                     } else {
                         // 如果是正常仓库
@@ -3394,7 +3395,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             if (workwechat == null || "".equals(workwechat)) {
                                 workwechat = userByPort.getWechat();
                             }
-                        QyWxUid.append(workwechat).append(",");
+//                        QyWxUid.append(workwechat).append(",");
                         }
                     }
                 } else {
@@ -3425,7 +3426,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 }
 
 
-//                QyWxUid.append("PangFuZhen,");
+                QyWxUid.append("PangFuZhen,");
                 if (record.getDepositoryManager() == null) {
                     map.put("depositoryManager", depositoryManager.toString());
                 } else {
@@ -3507,7 +3508,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         QyWxUid.append(workwechat).append(",");
                 }
                 String s = QyWxUid.toString();
-//                s = "PangFuZhen,";
+                s = "PangFuZhen,";
                 qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
             });
         } else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) {

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

@@ -109,6 +109,8 @@ public class ExcelServiceImpl implements ExcelService {
         if (totalVal > 0) {
             // 初始化
             ExcelFileInfoPool.addUserExcelMaterialInfo(userByPort.getNumber(), Collections.synchronizedList(new ArrayList<>()));
+
+
             // 定义分页数量
             double size = 100.0;
 

src/main/java/com/dreamchaser/depository_manage/utils/excelUtil.java

@@ -1,12 +1,9 @@
 package com.dreamchaser.depository_manage.utils;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-import com.alibaba.excel.read.builder.ExcelReaderSheetBuilder;
 import com.dreamchaser.depository_manage.exception.MyException;
 import com.dreamchaser.depository_manage.listener.ExcelListener;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import org.apache.commons.lang.StringUtils;
@@ -21,7 +18,7 @@ import java.util.Map;
 public class excelUtil<T> {
 
     // excel文件后缀
-    private final static String EXCE_L2003 = "xls";
+    private final static String EXCEL_2003 = "xls";
     private final static String EXCEL_2007 = "xlsx";
 
     // 校验文件后缀是否为 xls、xlsx
@@ -37,7 +34,7 @@ public class excelUtil<T> {
             return false;
         }
         String extension = filename.substring(index + 1);
-        return Arrays.asList(EXCE_L2003, EXCEL_2007).contains(extension);
+        return Arrays.asList(EXCEL_2003, EXCEL_2007).contains(extension);
     }
 
     // 读取excel文件