From fea188972674c312025095710d10658ed91329b6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 08:09:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue | 4 +
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 8 +++-
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 4 +
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue | 5 ++
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 4 ++
north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue | 8 +++
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue | 5 ++
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 2 +
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue | 4 +
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue | 6 ++
north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue | 4 +
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 8 ++++
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 4 +
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 4 ++
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 4 ++
15 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue
index e0e7e70..3903ae2 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue
+++ b/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
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue
index f92032f..ca99afc 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue
+++ b/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"){
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
index 79c48b5..1fc4def 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
+++ b/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
})
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue
index 8fb2f43..c2b2298 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue
+++ b/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){
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue
index e9507bc..b4dfa21 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue
+++ b/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
})
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
index add65bc..c281202 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
+++ b/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
})
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
index 7a2af7b..d072897 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
+++ b/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){
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
index 1401b77..4763dc1 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
+++ b/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) => {
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 8bc84bc..5cd38b6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/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) => {
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 97125bc..867f3b9 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/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){
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index e415ab2..edf883a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/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);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 3d4c4e8..09719d5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/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);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
index 31d79e7..4877ddd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
+++ b/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);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index 6863176..59f2b87 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/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);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 361fe0d..9ef6fd6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/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);
--
Gitblit v1.8.0