修改日志操作人员保存

廖井涛

2024-10-22 178f3650c79a862af82642a152a861d686b2baaa

修改日志操作人员保存

 north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue

@@ -10,11 +10,13 @@
import GlassType from "@/components/sd/product/GlassType.vue"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {useI18n} from "vue-i18n";
import useUserInfoStore from "@/stores/userInfo";

const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const value = ref('')
const userStore = useUserInfoStore()
const options = [
  {
    value: t('ingredients.originalFilm'),
@@ -107,13 +109,17 @@
      type:value.value,
      json:productName,
      width:BasicData.value[0].Type,
      height:BasicData.value[1].Type
      height:BasicData.value[1].Type,
       userName:userStore.user.userName,
       userId:userStore.user.userId
    }
  }else if(value.value===t('ingredients.accessories')){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
      json:productName,
       userName:userStore.user.userName,
       userId:userStore.user.userId
    }
  }


 north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue

@@ -23,7 +23,9 @@
    }
    case 'delete':{
      let flowData = ref({
        id: row.id
        id: row.id,
        userName:userStore.user.userName,
        userId:userStore.user.userId
      })
      request.post("/materialStore/deleteMaterialStore",flowData.value).then((res) => {
        if(res.code==200 && res.data==="true"){

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue

@@ -313,7 +313,9 @@
          let flowData = ref({
            materialOutboundDetail: selectRecords,
            title: titleUploadData.value,
            materialOutboundId: route.query.materialOutboundId
            materialOutboundId: route.query.materialOutboundId,
            userName:userStore.user.userName,
            userId:userStore.user.userId

          })
          request.post("/materialInventory/saveMaterialOutbound", flowData.value).then((res) => {
@@ -354,6 +356,7 @@
        case 'CounterExamination': {
          let flowData = ref({
            materialOutboundId: route.query.materialOutboundId,
            reviewed:userStore.user.userName,
            type: 0

          })

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue

@@ -35,7 +35,9 @@
    }
    case 'delete':{
      let flowData = ref({
        materialOutboundId:row.materialOutboundId
        materialOutboundId:row.materialOutboundId,
        userName:userStore.user.userName,
        userId:userStore.user.userId
      })
      request.post("/materialInventory/deleteMaterialOutbound",flowData.value).then((res) => {
        if(res.code==200 && res.data===true){

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue

@@ -338,7 +338,9 @@
          let flowData = ref({
            returningWarehouseDetail: selectRecords,
            title: titleUploadData.value,
            returningId: route.query.returningId
            returningId: route.query.returningId,
            userName:userStore.user.userName,
            userId:userStore.user.userId

          })
          request.post("/materialInventory/saveReturningWarehouse", flowData.value).then((res) => {
@@ -377,6 +379,7 @@
        case 'CounterExamination': {
          let flowData = ref({
            returningId: route.query.returningId,
            reviewed:userStore.user.userName,
            type: 0

          })

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -588,7 +588,9 @@
            totalArea: selectRecords.height*selectRecords.width/100000*titleUploadData.value.inventoryQuantity,
            singlePieceArea: selectRecords.height*selectRecords.width/100000,
            title: titleUploadData.value,
            materialCode: selectRecords.id
            materialCode: selectRecords.id,
            userName:userStore.user.userName,
            userId:userStore.user.userId

          })


 north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue

@@ -5,12 +5,14 @@
import {ElMessage} from "element-plus";
import deepClone from "@/utils/deepClone"
import { useI18n } from 'vue-i18n'
import useUserInfoStore from "@/stores/userInfo";

//语言获取
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
let produceList = ref([])
const userStore = useUserInfoStore()



@@ -86,7 +88,9 @@
  }*/

  let flowData = ref({
    customer: ruleForm
    customer: ruleForm,
    userName:userStore.user.userName,
    userId:userStore.user.userId
  })
  request.post("/customer/insertCustomer", flowData.value).then((res) => {
    if(res.code==200 && res.data===true){

 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue

@@ -43,7 +43,9 @@
      })
      ruleForm.value.id=row.id
      let flowData = ref({
        customer: ruleForm.value
        customer: ruleForm.value,
        userName:userStore.user.userName,
        userId:userStore.user.userId
      })

      request.post("/customer/deleteCustomer", flowData.value).then((res) => {

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -450,7 +450,9 @@
        case 'toExamine': {
          let flowData = ref({
            deliveryId: route.query.deliveryID,
            type: 2
            type: 2,
            userName:userStore.user.userName,
            userId:userStore.user.userId

          })
          request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
@@ -472,7 +474,9 @@
        case 'CounterExamination': {
          let flowData = ref({
            deliveryId: route.query.deliveryID,
            type: 0
            type: 0,
            userName:userStore.user.userName,
            userId:userStore.user.userId

          })
          request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -39,7 +39,9 @@
    }
    case 'delete':{
      let flowData = ref({
        deliveryId:row.deliveryId
        deliveryId:row.deliveryId,
        userName:userStore.user.userName,
        userId:userStore.user.userId
      })
      request.post("/delivery/deleteDelivery",flowData.value).then((res) => {
        if(res.code==200 && res.data===true){

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -679,6 +679,8 @@
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            //获取对象集合循环进行新增修改
            List<FinishedOperateLog> finishedOperateLogslist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), FinishedOperateLog.class);

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -55,6 +55,8 @@
            materialOutboundId = object.get("materialOutboundId").toString();
        }
        Log log = new Log();
        log.setOperatorId(object.get("userId").toString());
        log.setOperator(object.get("userName").toString());
        log.setContent(object.toString());
        try {
            MaterialOutbound materialOutbound = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialOutbound.class);
@@ -154,6 +156,8 @@
                materialCode = Long.valueOf(object.get("materialCode").toString());
            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class);
@@ -269,6 +273,8 @@
            }
            Log log = new Log();
            log.setContent(object.toString());
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setFunction("deleteMaterialOutbound删除:"+materialOutboundId);
            logService.saveLog(log);

@@ -405,6 +411,8 @@
                returningId = object.get("returningId").toString();
            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            ReturningWarehouse returningWarehouse = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), ReturningWarehouse.class);

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java

@@ -60,6 +60,8 @@
            }

            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
@@ -123,6 +125,8 @@

            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("deleteMaterialStore删除："+id);
            logService.saveLog(log);

 north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java

@@ -47,6 +47,8 @@
    public Boolean insertCustomer(Map<String,Object> object) {
        boolean saveState = true;
        Log log = new Log();
        log.setOperatorId(object.get("userId").toString());
        log.setOperator(object.get("userName").toString());
        log.setContent(object.toString());
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -89,6 +91,8 @@
                    customerMapper.deleteCustomer(customer);
                }
                Log log = new Log();
                log.setOperatorId(object.get("userId").toString());
                log.setOperator(object.get("userName").toString());
                log.setContent(object.toString());
                log.setFunction("deleteCustomer删除");
                logService.saveLog(log);

 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -411,6 +411,8 @@
        deliveryMapper.updateDeliveryToExamine(deliveryId,type);

        Log log = new Log();
        log.setOperatorId(object.get("userId").toString());
        log.setOperator(object.get("userName").toString());
        log.setContent(object.toString());
        log.setFunction("updateDeliveryToExamine修改:"+deliveryId);
        logService.saveLog(log);
@@ -443,6 +445,8 @@
            deliveryMapper.deleteDelivery(deliveryId);

            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("deleteDelivery删除:"+deliveryId);
            logService.saveLog(log);