From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 2
north-glass-erp/northglass-erp/src/lang/zh.js | 3
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue | 2
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 15 ++
north-glass-erp/northglass-erp/src/lang/ru.js | 1
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 59 +++++++--
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 34 +++--
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 52 ++++++++
north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml | 2
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 107 ++++++++++++-----
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 7 +
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 9 +
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 13 ++
15 files changed, 237 insertions(+), 72 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index a0d10f3..29b8374 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -335,6 +335,7 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
+ msg:'Please select all data'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index de6a7b9..8ac9c1d 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -331,6 +331,7 @@
transferOrder:'孝褉邪薪褋褎械褉薪褘泄 芯褉写械褉',
perimeter:'袙薪械褕薪懈泄 泻褉邪泄',
deleteNo:'校写邪谢械薪懈械 薪械褍写邪褔薪褘褏 锌褉芯胁械褉芯泻, 褔褌芯斜褘 锌褉芯胁械褉懈褌褜, 褉邪蟹写械谢械薪褘 谢懈 芯薪懈',
+ msg:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 胁褋械 写邪薪薪褘械'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index d193466..9130aed 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -335,7 +335,8 @@
deleteOk:'鍒犻櫎鎴愬姛',
transferOrder:'杞伐鍗�',
perimeter:'鍛ㄩ暱',
- deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦'
+ deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦',
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
},
processCard:{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
index 6e9bde8..8357450 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -161,7 +161,7 @@
height: 35px;
}
.row1 span {
- font-size: 14pt;
+ font-size: 15pt;
}
.row2 {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index af129c0..04e8503 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -163,7 +163,7 @@
height: 35px;
}
.row1 span {
- font-size: 14pt;
+ font-size: 15pt;
}
.row2 {
font-size: 12pt;
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 628e4d1..143dfd5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -193,7 +193,7 @@
height: 20px;
}
.row1 span {
- font-size: 8pt;
+ font-size: 10pt;
font-weight: bold;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index 566f718..b4e1514 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -26,10 +26,6 @@
router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
break
}
- case 'delete': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
}
}
@@ -71,19 +67,23 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-let id = route.query.orderId
+onMounted(() => {
+ let id = route.query.orderId
-request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
+ request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
})
+
+
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -216,6 +216,10 @@
const $table = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
+ if(selectRecords.length!=$table.getTableData().fullData.length){
+ ElMessage.warning(t('workOrder.msg'))
+ return;
+ }
let workOrderData = ref({
orderdetail: selectRecords,
@@ -225,7 +229,7 @@
request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
if (res.code == 200 && res.data===true) {
ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:id,random:Math.random()}})
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index e1eadfa..e4c3edd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -26,7 +26,6 @@
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/workOrder/addWorkOrder', query: {orderId: row.orderId}})
break
}
@@ -152,7 +151,7 @@
//鐐瑰嚮鏌ヨ
-const getWorkOrder = (isButtonDisabled) => {
+const getWorkOrder = () => {
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
@@ -247,8 +246,15 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
+ checkboxConfig: {
+ labelField: 'name',
+ checkMethod: ({ row }) => {
+ return optionVal.value === '1'
+ }
+ },
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -272,9 +278,9 @@
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
- // buttons: [{
- //
- // }],
+ buttons: [
+ {'code': 'transferOrder', 'name': t('workOrder.transferOrder'),status: 'primary'}
+ ],
// import: false,
// export: true,
// print: true,
@@ -298,6 +304,23 @@
}
})
+const gridEvents = {
+ async toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'transferOrder': {
+ const idList = []
+ $grid.getCheckboxRecords().forEach(item => {
+ idList.push(item.orderId)
+ })
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:idList.join(',')}})
+ break
+ }
+ }
+ }
+ }
+}
onMounted(() => {
getFirst()
@@ -319,7 +342,12 @@
/>
- <el-select :default-first-option="true" ref="getSelect" style="width: 130px" v-model="optionVal" class="m-2"
+ <el-select
+ :default-first-option="true"
+ ref="getSelect" style="width: 130px"
+ v-model="optionVal"
+ class="m-2"
+ @change="getWorkOrder"
>
<el-option
v-for="item in options"
@@ -330,7 +358,7 @@
</el-select>
<el-button
- @click="getWorkOrder(isButtonDisabled)"
+ @click="getWorkOrder"
:disabled="isButtonDisabled"
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
@@ -344,6 +372,7 @@
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -362,14 +391,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"
- @click="getTableRow(row,'edit')"
- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"
- link
- type="primary"
- size="small">
- {{$t('workOrder.transferOrder')}}
- </el-button>
+<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+<!-- @click="getTableRow(row,'edit')"-->
+<!-- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+<!-- link-->
+<!-- type="primary"-->
+<!-- size="small">-->
+<!-- {{$t('workOrder.transferOrder')}}-->
+<!-- </el-button>-->
<!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
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 078e09b..6d200f6 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
@@ -10,12 +10,14 @@
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.mm.FinishedOperateLogMapper;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +46,8 @@
OrderMapper orderMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public Map<String, Object> defaultDateFinishedGoodsInventory(Integer pageNum, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory) {
Integer offset = (pageNum - 1) * pageSize;
@@ -88,6 +92,12 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
+ log.setFunction("addSelectWarehousing鍏ュ簱");
+ logService.saveLog(log);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
@@ -176,6 +186,12 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
+ log.setFunction("addDeliveryDetail鍑哄簱");
+ logService.saveLog(log);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class);
if (!orderDetaillist.isEmpty()){
@@ -267,6 +283,12 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
+ log.setFunction("updateFinishedGoodsInventoryAllocate璋冩嫧");
+ logService.saveLog(log);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class);
if (!orderDetaillist.isEmpty()){
@@ -361,6 +383,12 @@
if (object.get("operateType") != null) {
operateType = object.get("operateType").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
+ log.setFunction("updateFinishedGoodsInventoryTakeOut棰嗗嚭");
+ logService.saveLog(log);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class);
if (!orderDetaillist.isEmpty()){
@@ -494,6 +522,10 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FinishedOperateLog> finishedOperateLogslist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), FinishedOperateLog.class);
if (!finishedOperateLogslist.isEmpty()){
@@ -503,15 +535,18 @@
finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"宸插鏍�");
//瀹℃牳淇敼搴撳瓨鏁伴噺
finishedGoodsInventoryMapper.updateInventoryInventoryOut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ log.setFunction("updateFinishedGoodsInventoryToExamine瀹℃牳");
} else if (Objects.equals(type, "鍙嶅")) {
//瀹℃牳淇敼棰嗗嚭璁板綍
finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"鏈鏍�");
//瀹℃牳淇敼搴撳瓨鏁伴噺
finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
+ log.setFunction("updateFinishedGoodsInventoryToExamine鍙嶅");
}
}
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -540,6 +575,12 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(object.toString());
+ log.setFunction("cancelFinishedGoodsInventoryToExamine浣滃簾");
+ logService.saveLog(log);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FinishedOperateLog> finishedOperateLogslist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), FinishedOperateLog.class);
if (!finishedOperateLogslist.isEmpty()){
@@ -618,7 +659,8 @@
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
-
+ Log log = new Log();
+ log.setContent(object.toString());
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<FinishedOperateLog> finishedOperateLogslist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), FinishedOperateLog.class);
if (!finishedOperateLogslist.isEmpty()){
@@ -649,6 +691,7 @@
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
}
+ log.setFunction("cancelFinishedGoodsInventoryStorage鍏ュ簱");
}else if(Objects.equals(finishedOperateLog.getOperateType(), "鍑哄簱")){
//淇敼璁板綍琛�
@@ -673,11 +716,13 @@
//淇敼鍙戣揣琛ㄧ姸鎬�
finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),0);
}
+ log.setFunction("cancelFinishedGoodsInventoryStorage鍑哄簱");
}
}
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -701,6 +746,11 @@
public Boolean oneClickStorage(String orderId,String userName) {
boolean saveState = true;
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ Log log = new Log();
+ log.setContent(orderId);
+ log.setOperator(userName);
+ log.setFunction("oneClickStorage鍏ュ簱:"+orderId);
+ logService.saveLog(log);
try {
String oddNumber= orderNumberSetting("鍏ュ簱");
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId));
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 a76a23c..bb9e466 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
@@ -10,10 +10,12 @@
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.MaterialInventoryMapper;
import com.example.erp.mapper.mm.MaterialStoreMapper;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +42,8 @@
BasicWarehouseTypeMapper basicWarehouseTypeMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public Boolean saveMaterialOutbound(Map<String,Object> object) {
boolean saveState = true;
@@ -50,6 +54,8 @@
if (object.get("materialOutboundId") != null) {
materialOutboundId = object.get("materialOutboundId").toString();
}
+ Log log = new Log();
+ log.setContent(object.toString());
try {
MaterialOutbound materialOutbound = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialOutbound.class);
List<MaterialOutboundDetail> materialOutboundDetailList = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialOutboundDetail")), MaterialOutboundDetail.class);
@@ -76,11 +82,13 @@
materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
materialInventoryMapper.updateMaterialOutbound(materialOutbound, materialOutboundId);
oddNumber = materialOutboundId;
+ log.setFunction("saveMaterialOutbound淇敼:"+oddNumber);
} else {
//鑾峰彇鍗曞彿
oddNumber = orderNumberSetting("鍑哄簱");
//鏂板鏉愭枡鍑哄簱琛ㄦ暟鎹�
materialInventoryMapper.insertMaterialOutbound(materialOutbound, oddNumber);
+ log.setFunction("saveMaterialOutbound鏂板:"+oddNumber);
}
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
@@ -105,6 +113,7 @@
}
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -137,6 +146,8 @@
if (object.get("materialCode") != null) {
materialCode = Long.valueOf(object.get("materialCode").toString());
}
+ Log log = new Log();
+ log.setContent(object.toString());
MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class);
@@ -145,9 +156,12 @@
if(MaterialInventoryCount>0){
materialInventoryMapper.updateMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory);
+ log.setFunction("saveMaterialInventory淇敼");
}else {
materialInventoryMapper.insertMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory);
+ log.setFunction("saveMaterialInventory鏂板");
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -246,7 +260,10 @@
materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
materialInventoryMapper.deleteMaterialOutbound(materialOutboundId);
}
-
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteMaterialOutbound鍒犻櫎:"+materialOutboundId);
+ logService.saveLog(log);
} catch (Exception e) {
@@ -322,6 +339,11 @@
if (object.get("reviewed") != null) {
reviewed = object.get("reviewed").toString();
}
+ Log log = new Log();
+ log.setOperator(reviewed);
+ log.setContent(object.toString());
+ log.setFunction("updateMaterialOutboundToExamine锛�"+type);
+ logService.saveLog(log);
if (type==1){
List<MaterialOutboundDetail> materialOutboundDetailList = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
@@ -375,6 +397,9 @@
if (object.get("returningId") != null) {
returningId = object.get("returningId").toString();
}
+ Log log = new Log();
+ log.setContent(object.toString());
+
ReturningWarehouse returningWarehouse = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), ReturningWarehouse.class);
List<ReturningWarehouseDetail> returningWarehouseDetailList = JSONArray.parseArray(JSONObject.toJSONString(object.get("returningWarehouseDetail")), ReturningWarehouseDetail.class);
//鏌ヨ鍑哄簱鍗曟槸鍚﹀瓨鍦�
@@ -391,11 +416,13 @@
//鍒犻櫎鏉愭枡鍑哄簱鏄庣粏鐨勬暟鎹�
materialInventoryMapper.deleteReturningWarehouseDetail(returningId);
oddNumber = returningId;
+ log.setFunction("saveReturningWarehouse淇敼锛�"+oddNumber);
} else {
//鑾峰彇鍗曞彿
oddNumber = orderNumberSetting("杩斿簱");
//鏂板鏉愭枡鍑哄簱琛ㄦ暟鎹�
materialInventoryMapper.insertReturningWarehouse(returningWarehouse, oddNumber);
+ log.setFunction("saveReturningWarehouse鏂板锛�"+oddNumber);
}
@@ -455,6 +482,7 @@
}
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -499,6 +527,11 @@
if (object.get("reviewed") != null) {
reviewed = object.get("reviewed").toString();
}
+ Log log = new Log();
+ log.setOperator(reviewed);
+ log.setContent(object.toString());
+ log.setFunction("updateReturningWarehouseToExamine锛�"+type);
+ logService.saveLog(log);
if (type==1){
List<ReturningWarehouseDetail> returningWarehouseDetailList = materialInventoryMapper.getIsNotReturningWarehouseDetail(returningId);
@@ -586,43 +619,47 @@
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- String creator = "";
- if (object.get("creator") != null) {
- creator = object.get("creator").toString();
- }
- String type = "";
- if (object.get("type") != null) {
- type = object.get("type").toString();
- }
- int state = 0;
- if (object.get("state") != null) {
- state = Integer.parseInt(object.get("state").toString());
- }
+ String creator = "";
+ if (object.get("creator") != null) {
+ creator = object.get("creator").toString();
+ }
+ String type = "";
+ if (object.get("type") != null) {
+ type = object.get("type").toString();
+ }
+ int state = 0;
+ if (object.get("state") != null) {
+ state = Integer.parseInt(object.get("state").toString());
+ }
+ Log log = new Log();
+ log.setOperator(creator);
+ log.setContent(object.toString());
+ log.setFunction("addSelectSurplusMaterialsDate锛�"+state);
+ logService.saveLog(log);
-
- if(state==1){
- SurplusMaterials surplusMaterials = JSONObject.parseObject(JSONObject.toJSONString(object.get("surplusMaterials")), SurplusMaterials.class);
- if(surplusMaterials!=null){
- SurplusMaterials surplusMaterials1=materialInventoryMapper.selectSurplusMaterialsCount(surplusMaterials);
- if(surplusMaterials1!=null){
- System.out.println(surplusMaterials1);
- materialInventoryMapper.updateSurplusMaterialsIntQuantity(surplusMaterials1);
- materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials1,creator,type);
- }else{
- materialInventoryMapper.insertSurplusMaterials(surplusMaterials);
- materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials,creator,type);
- }
- }
- } else if (state==2) {
- List<SurplusMaterials> surplusMaterialsList = JSONArray.parseArray(JSONObject.toJSONString(object.get("surplusMaterials")), SurplusMaterials.class);
- if(!surplusMaterialsList.isEmpty()){
- for(SurplusMaterials surplusMaterials:surplusMaterialsList){
- materialInventoryMapper.updateSurplusMaterialsOutQuantity(surplusMaterials);
- materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials,creator,type);
- }
-
+ if(state==1){
+ SurplusMaterials surplusMaterials = JSONObject.parseObject(JSONObject.toJSONString(object.get("surplusMaterials")), SurplusMaterials.class);
+ if(surplusMaterials!=null){
+ SurplusMaterials surplusMaterials1=materialInventoryMapper.selectSurplusMaterialsCount(surplusMaterials);
+ if(surplusMaterials1!=null){
+ System.out.println(surplusMaterials1);
+ materialInventoryMapper.updateSurplusMaterialsIntQuantity(surplusMaterials1);
+ materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials1,creator,type);
+ }else{
+ materialInventoryMapper.insertSurplusMaterials(surplusMaterials);
+ materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials,creator,type);
}
}
+ } else if (state==2) {
+ List<SurplusMaterials> surplusMaterialsList = JSONArray.parseArray(JSONObject.toJSONString(object.get("surplusMaterials")), SurplusMaterials.class);
+ if(!surplusMaterialsList.isEmpty()){
+ for(SurplusMaterials surplusMaterials:surplusMaterialsList){
+ materialInventoryMapper.updateSurplusMaterialsOutQuantity(surplusMaterials);
+ materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials,creator,type);
+ }
+
+ }
+ }
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 63f6a3c..31d79e7 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
@@ -2,10 +2,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.mm.MaterialStore;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.MaterialInventoryMapper;
import com.example.erp.mapper.mm.MaterialStoreMapper;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,6 +29,8 @@
BasicWarehouseTypeMapper basicWarehouseTypeMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public String saveMaterialStore(Map<String,Object> object) {
String saveState = "true";
@@ -54,6 +58,10 @@
if (object.get("height") != null) {
height = Double.parseDouble(object.get("height").toString());
}
+
+ Log log = new Log();
+ log.setContent(object.toString());
+
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
@@ -63,12 +71,15 @@
if (Objects.equals(type, "鍘熺墖")){
materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
}
+ log.setFunction("saveMaterialStore淇敼");
}else{
materialStoreMapper.insertMaterialStore(type,json);
+ log.setFunction("saveMaterialStore鏂板");
}
}else{
saveState = "false1";
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -111,6 +122,10 @@
}
}
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteMaterialStore鍒犻櫎锛�"+id);
+ logService.saveLog(log);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index a898137..284cc42 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -57,10 +57,15 @@
String orderId = orderDetaillist.get(0).getOrderId();
for (OrderDetail orderDetail : orderDetaillist) {
+ if(orderDetail.getOrderId()!= orderId){
+ orderId = orderDetail.getOrderId();
+ letters = '1';
+ lettr = 'A';
+ }
//鐢熸垚鐢熶骇璁㈠崟鍙�
for (int i = 0; i < count; i++) {
letters = lettr++;
- productIdVl = orderId + letters;
+ productIdVl = orderDetail.getOrderId() + letters;
//鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
if (workCount < 1) {
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 6d9c114..6863176 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
@@ -7,9 +7,11 @@
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.*;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.sd.*;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@
CustomerMapper customerMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public Map<String, Object> getSelectCustomer(Integer pageNum, Integer pageSize, Customer customer) {
@@ -42,6 +46,8 @@
public Boolean insertCustomer(Map<String,Object> object) {
boolean saveState = true;
+ Log log = new Log();
+ log.setContent(object.toString());
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
@@ -49,9 +55,12 @@
if(customer!=null){
if (customer.getId()!=null && customer.getId()!=0){
customerMapper.updateCustomer(customer);
+ log.setFunction("insertCustomer淇敼");
}else{
customerMapper.insertCustomer(customer);
+ log.setFunction("insertCustomer鏂板");
}
+ logService.saveLog(log);
}
@@ -79,6 +88,10 @@
if (customer.getId()!=null){
customerMapper.deleteCustomer(customer);
}
+ Log log = new Log();
+ 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 3df2aca..361fe0d 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
@@ -410,6 +410,10 @@
deliveryMapper.updateDeliveryToExamine(deliveryId,type);
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("updateDeliveryToExamine淇敼:"+deliveryId);
+ logService.saveLog(log);
return true;
@@ -438,6 +442,11 @@
deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
deliveryMapper.deleteDelivery(deliveryId);
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteDelivery鍒犻櫎:"+deliveryId);
+ logService.saveLog(log);
+
return true;
}catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
diff --git a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
index 5cdb2ee..e95fd1f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml
@@ -142,7 +142,7 @@
from sd.order_detail as od
left join sd.order as o
on od.order_id =o.order_id
- where od.order_id = #{orderId} and o.production_order!=2
+ where FIND_IN_SET(od.order_id,#{orderId}) and o.production_order!=2
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
and od.order_id regexp #{orderDetail.orderId}
</if>
--
Gitblit v1.8.0