增加日志记录

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -23,6 +23,22 @@ public enum OperateType {
     BREAKAGE_CARD_DETAILS("卡设备报损"),
     REMOVE_OBU_DETAILS("签设备移除"),
     BREAKAGE_OBU_DETAILS("签设备报损"),
+
+    //仓库
+    WAREHOUSE_ADD("新增管理"),
+    UPDATE_WAREHOUSE("修改仓库"),
+    DELETE_WAREHOUSE("删除仓库"),
+
+    //调拨
+    TRANSFER_APPLY("调拨申请"),
+    UPDATE_TRANSFER_APPLY("修改调拨申请"),
+    CONFIRM_TRANSFER_APPLY("确认调拨"),
+    CANCEL_TRANSFER_APPLY("取消调拨"),
+
+    //盘存
+    STOCKTAKING_INFO("库存盘存"),
+    STOCKTAKING_REMOVE("盘存设备移除"),
+
     ;
     private final String value;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManagerImpl.java

@@ -6,6 +6,7 @@ import cn.com.taiji.common.model.dao.ResultConverter;
 import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.invw.InventoryType;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwStocktakingInfo;
 import cn.com.taiji.core.entity.invw.InvwStocktakingResult;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
@@ -14,6 +15,7 @@ import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwStocktakingInfoPageRequest;
 import cn.com.taiji.invw.dto.stocktaking.*;
 import cn.com.taiji.invw.manager.AbstractCommManager;
+import cn.com.taiji.invw.manager.AbstractInvwManager;
 import cn.com.taiji.invw.model.stocktaking.*;
 import cn.com.taiji.invw.tools.ConvertUtils;
 import cn.com.taiji.invw.tools.EasyExcelUtil;
@@ -37,7 +39,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Service
-public class InvwStocktakingInfoManagerImpl extends AbstractCommManager implements InvwStocktakingInfoManager, ResultConverter<InvwStocktakingInfo, InvwStocktakingInfoPageResponseDTO> {
+public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implements InvwStocktakingInfoManager, ResultConverter<InvwStocktakingInfo, InvwStocktakingInfoPageResponseDTO> {
 
     @Autowired
     private InvwStocktakingInfoRepo stocktakingInfoRepo;
@@ -138,6 +140,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractCommManager implemen
             if (file != null && file.exists()) {
                 FileUtil.del(file);
             }
+            persistOperateLog(OperateType.STOCKTAKING_REMOVE, null, req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "设备移除明细，"+response.getResult());
         }
     }
 
@@ -171,6 +174,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractCommManager implemen
         List<InvwStocktakingInfoModel> stockInfoModels = insertStocktakingInfo(stockModels, startTime, req);
         // 执行盘库
         doStocktaking(stockInfoModels, storeCodes);
+        persistOperateLog(OperateType.STOCKTAKING_INFO, null, req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "库存盘存");
     }
 
     @Override

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/transfer/InvwTransferApplyManagerImpl.java

@@ -6,6 +6,7 @@ import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.core.entity.dict.invw.InvApplyStatus;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.invw.InventoryType;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwTransferApply;
 import cn.com.taiji.core.entity.invw.InvwTransferApplyDetails;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
@@ -14,6 +15,7 @@ import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwTransferApplyPageRequest;
 import cn.com.taiji.invw.dto.transfer.*;
 import cn.com.taiji.invw.manager.AbstractCommManager;
+import cn.com.taiji.invw.manager.AbstractInvwManager;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyCommModel;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyDetailsModel;
 import cn.com.taiji.invw.tools.EasyExcelUtil;
@@ -30,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class InvwTransferApplyManagerImpl extends AbstractCommManager implements InvwTransferApplyManager {
+public class InvwTransferApplyManagerImpl extends AbstractInvwManager implements InvwTransferApplyManager {
 
     @Autowired
     private InvwTransferApplyRepo transferApplyRepo;
@@ -62,6 +64,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
         handlerTransferApply(req, null, transferApply, transferApplyDetails);
         // 保存调拨申请信息
         save(transferApply, transferApplyDetails);
+        persistOperateLog(OperateType.TRANSFER_APPLY, transferApply.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "调拨申请");
     }
 
     //修改
@@ -87,6 +90,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
         handlerTransferApply(null, req, transferApply, transferApplyDetails);
         // 保存调拨申请信息
         save(transferApply, transferApplyDetails);
+        persistOperateLog(OperateType.UPDATE_TRANSFER_APPLY, transferApply.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "调拨修改");
     }
 
     //详情
@@ -116,6 +120,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
         transferApply.setReason(req.getReason());
         transferApply.setApplyStatus(InvApplyStatus.CANCEL);
         transferApplyRepo.saveAndFlush(transferApply);
+        persistOperateLog(OperateType.CANCEL_TRANSFER_APPLY, transferApply.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "调拨取消入库");
     }
 
     // 确认入库
@@ -167,6 +172,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
         transferApply.setReceiveTime(LocalDateTime.now());
         transferApply.setApplyStatus(InvApplyStatus.COMFIRE);
         transferApplyRepo.saveAndFlush(transferApply);
+        persistOperateLog(OperateType.CONFIRM_TRANSFER_APPLY, transferApply.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "调拨确认入库");
     }
 
     //  检查库存

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.model.dao.ResultConverter;
 import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwObuDetailsRepo;
@@ -11,6 +12,7 @@ import cn.com.taiji.core.repo.jpa.invw.InvwWarehouseRepo;
 import cn.com.taiji.core.repo.request.invw.InvwWarehousePageRequest;
 import cn.com.taiji.invw.dto.warehouse.*;
 import cn.com.taiji.invw.manager.AbstractCommManager;
+import cn.com.taiji.invw.manager.AbstractInvwManager;
 import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
 import lombok.val;
 import org.springframework.beans.BeanUtils;
@@ -22,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class InvwWarehouseManagerImpl extends AbstractCommManager implements InvwWarehouseManager, ResultConverter<InvwWarehouse, InvwWarehousePageResponseDTO> {
+public class InvwWarehouseManagerImpl extends AbstractInvwManager implements InvwWarehouseManager, ResultConverter<InvwWarehouse, InvwWarehousePageResponseDTO> {
 
     @Autowired
     private InvwWarehouseRepo warehouseRepo;
@@ -61,7 +63,7 @@ public class InvwWarehouseManagerImpl extends AbstractCommManager implements Inv
             warehouse.setChannelId(req.getWarehouseChannelId());
         }
         warehouseRepo.save(warehouse);
-
+        persistOperateLog(OperateType.WAREHOUSE_ADD, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库新增");
     }
 
     public String generateCode(InvwWarehouse parentWarehouse, int level) throws ManagerException {
@@ -193,6 +195,7 @@ public class InvwWarehouseManagerImpl extends AbstractCommManager implements Inv
             warehouse.setUpdateTime(LocalDateTime.now());
             warehouseRepo.saveAndFlush(warehouse);
         }
+        persistOperateLog(OperateType.UPDATE_WAREHOUSE, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库修改");
     }
 
     @Override
@@ -219,6 +222,7 @@ public class InvwWarehouseManagerImpl extends AbstractCommManager implements Inv
         warehouse.setStatus(0);
         warehouse.setUpdateTime(LocalDateTime.now());
         warehouseRepo.saveAndFlush(warehouse);
+        persistOperateLog(OperateType.DELETE_WAREHOUSE, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库删除");
     }
 
     @Override

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/model/HtlRequestMethod.java

@@ -1,62 +0,0 @@
-package cn.com.taiji.ias.manager.bill.model;
-
-public enum HtlRequestMethod {
-    BILLRAISEINSERT("发票抬头添加","/qtzlinvoice/addInvoiceTitle",1),
-    BILLRAISEDELETE("发票抬头删除","/qtzlinvoice/deleteInvoiceTitle",2),
-    BILLRAISEUPDATE("发票抬头修改","/qtzlinvoice/editInvoiceTitle",3),
-    BILLRECORD("发票开票记录","/qtzlinvoice/queryInvoice",4),
-    BILLREVERSAL("发票红冲","/qtzlinvoice/invocieReversal",5),
-    BILLMERGEINVOICING("ETC产品合并开票","/qtzlinvoice/batchOpenEtcProductInvoice",6),
-    BILLORDERPUSH("发票订单补推","",7),
-    ;
-
-    private String value;
-    private String uri;
-    private int code;
-
-    HtlRequestMethod(String value, String uri, int code) {
-        this.value = value;
-        this.uri = uri;
-        this.code = code;
-    }
-    public static HtlRequestMethod getByCode(int code) {
-        for (HtlRequestMethod method : HtlRequestMethod.values()) {
-            if (method.getCode() == code) {
-                return method;
-            }
-        }
-        return null;
-    }
-    public static HtlRequestMethod getByValue(String value) {
-        for (HtlRequestMethod method : HtlRequestMethod.values()) {
-            if (method.getValue().equals(value)) {
-                return method;
-            }
-        }
-        return null;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-}