From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 6 -
north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java | 2
north-glass-erp/northglass-erp/src/views/RegisterView.vue | 2
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 20 +++
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 4
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java | 2
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 171 +++++++++++++++++-----------------
north-glass-erp/northglass-erp/src/views/LoginView.vue | 19 +++
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 7 -
north-glass-erp/northglass-erp/src/lang/index.js | 6
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 5
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java | 2
12 files changed, 136 insertions(+), 110 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index d361d6f..f305b42 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -485,11 +485,7 @@
margin: 0;
padding: 0;
}
-@media print {
- @page {
- margin: 8mm 16mm 8mm 16mm;
- }
-}
+
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index 511cfd5..455cd7d 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -278,13 +278,6 @@
color: black;
}
-@media print {
- @page {
- size: auto;
- margin: 8mm 16mm 20mm 16mm;
-
- }
-}
diff --git a/north-glass-erp/northglass-erp/src/lang/index.js b/north-glass-erp/northglass-erp/src/lang/index.js
index c2d4b83..6d0a4c4 100644
--- a/north-glass-erp/northglass-erp/src/lang/index.js
+++ b/north-glass-erp/northglass-erp/src/lang/index.js
@@ -5,13 +5,13 @@
import ru from "./ru"
let messages = {
- zh:zh,
- en: en,
+ 'zh-CN':zh,
+ 'en-US': en,
ru: ru
}
const i18n = createI18n({
- locale: localStorage.getItem('lang') || 'zh', // 璁剧疆褰撳墠璇█绫诲瀷
+ locale: localStorage.getItem('lang') || 'zh-CN', // 璁剧疆褰撳墠璇█绫诲瀷
legacy: false, // 濡傛灉瑕佹敮鎸乧ompositionAPI锛屾椤瑰繀椤昏缃负false;
globalInjection: true, // 鍏ㄥ眬娉ㄥ唽$t鏂规硶
messages
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index fb4c6d7..7e663b6 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -25,6 +25,8 @@
pass: ''
})
+let registerState = ref(true)
+
if (typeof(route.query.id) != "undefined"){
userForm.userId = <string>route.query.id
}
@@ -73,6 +75,8 @@
ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
@@ -104,6 +108,15 @@
localStorage.setItem('lang',language.value)
location.reload()
}
+
+//娉ㄥ唽鎸夐挳鐨勬樉绀�
+const changeRegister = ()=>{
+ if(userForm.pass=='admin'){
+ registerState.value =false
+ }else {
+ registerState.value =true
+ }
+}
</script>
<template>
@@ -118,8 +131,8 @@
v-model="language"
placeholder=" "
style="float: right;width: 6rem">
- <el-option value="zh" label="涓枃" />
- <el-option value="en" label="English" />
+ <el-option value="zh-CN" label="涓枃" />
+ <el-option value="en-US" label="English" />
<el-option value="ru" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
</el-select>
<h2>{{$t('login.SysName')}}</h2>
@@ -142,6 +155,7 @@
<el-form-item :label="$t('login.password')+':'" prop="pass">
<el-input
v-model="userForm.pass"
+ @blur="changeRegister"
type="password"
autocomplete="off"
:prefix-icon="Lock"
@@ -151,6 +165,7 @@
<el-form-item id="submitForm">
<el-button
:loading="registerLoadings"
+ :disabled="registerState"
type="primary"
@click="register"
>{{$t('login.register')}}
diff --git a/north-glass-erp/northglass-erp/src/views/RegisterView.vue b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
index bded910..30e0d48 100644
--- a/north-glass-erp/northglass-erp/src/views/RegisterView.vue
+++ b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
@@ -97,6 +97,8 @@
ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
loginLoadings.value=false
return false
+ }).then(() => {
+ register.password = atob(register.password)
})
}
})
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 b521dc8..78095f0 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
@@ -14,6 +14,7 @@
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
import companyInfo from "@/stores/sd/companyInfo";
+import {multiply} from "@/utils/decimal";
//璇█鑾峰彇
const { t } = useI18n()
@@ -211,7 +212,6 @@
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
titleUploadData.value.deliveryId=str
- console.log(titleUploadData.value)
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
@@ -298,6 +298,7 @@
customConfig: {
storage: true
},
+ checkboxConfig:{checkAll:true},
mouseConfig:{selected: true},//榧犳爣閫変腑
keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
@@ -511,6 +512,10 @@
}
dataList.forEach((item,index) =>{
if(index>=result.start && index<=result.end){
+ //鍙栨秷閫変腑
+ if(parseInt(firstVal)<=0){
+ xGrid.value.setCheckboxRow(item, false);
+ }
if(result.cell.indexOf('.')>-1){
const columnArr = result.cell.split('.')
item[columnArr[0]][columnArr[1]] = firstVal
@@ -563,7 +568,7 @@
return new Error(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
}else if (e.row.deliveryDetail.quantity ==="") {
return new Error(t('delivery.theShipmentQuantityCannotBeEmptyOr0'))
- }
+ }
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.deliveryDetail.quantity) ) {
return new Error(t('productStock.pleaseEnterAPositiveInteger'))
@@ -584,6 +589,16 @@
],
})
+
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
</script>
@@ -678,6 +693,7 @@
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
>
<template #num1_filter="{ column, $panel }">
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index 7d4f1c8..038385e 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -256,8 +256,8 @@
const projectArray=[];
for (let i=0;i<selectRecords.length;i++){
customerIdArray.push(selectRecords[i].customerId)
- if(selectRecords[i].project.trim.length===0){
- projectArray.push(selectRecords[i].project.trim)
+ if(selectRecords[i].project.trim().length===0){
+ projectArray.push(selectRecords[i].project.trim())
}else{
projectArray.push(selectRecords[i].project)
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
index 8ca3ccd..34219ff 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
@@ -25,7 +25,7 @@
@ExcelProperty("闈㈢Н")
private Double area;
@ExcelProperty("鍗曚环")
- private Integer price;
+ private Double price;
@ExcelProperty("閲戦")
private Double money;
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
index 2ed2319..7173d05 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
@@ -29,7 +29,7 @@
@ExcelProperty("鏁伴噺")
private Integer quantity;
@ExcelProperty("鍗曚环")
- private Integer price;
+ private Double price;
@ExcelProperty("闈㈢Н")
private Double area;
@ExcelProperty("鍏朵粬閲戦")
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
index 9f3ec99..3c7839a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
@@ -28,7 +28,7 @@
@ExcelProperty("鏁伴噺")
private Integer quantity;
@ExcelProperty("鍗曚环")
- private Integer price;
+ private Double price;
@ExcelProperty("闈㈢Н")
private Double area;
@ExcelProperty("鍏朵粬閲戦")
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 7edb8c8..3df2aca 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
@@ -239,48 +239,49 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
- OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail);
- Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum();
- Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum());
- //鍒ゆ柇鏄惁宸茬粡鍙戣揣
- if(aBoolean1 && aBoolean2){
- double deliveryDetailotherMoneys=0.0;
- Integer calculateType=0;
+ if(orderDetail.getDeliveryDetail().getQuantity()>0){
+ OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail);
+ Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum();
+ Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum());
+ //鍒ゆ柇鏄惁宸茬粡鍙戣揣
+ if(aBoolean1 && aBoolean2){
+ double deliveryDetailotherMoneys=0.0;
+ Integer calculateType=0;
- if (orderDetail.getOrder().getOrderId()==null){
- Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
- calculateType=order.getCalculateType();
- }else{
- calculateType=orderDetail.getOrder().getCalculateType();
- }
- double deliveryDetailMoney = 0.0;
- double deliveryDetailArea = 0.0;
- BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
- BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
- BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
- BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
- BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
- BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
- .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
- if (calculateType==1){
- deliveryDetailMoney=singlePieceArea.doubleValue();
- deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
-
- }else if (calculateType==2){
- if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
- deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
- .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
- deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ if (orderDetail.getOrder().getOrderId()==null){
+ Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
+ calculateType=order.getCalculateType();
}else{
+ calculateType=orderDetail.getOrder().getCalculateType();
+ }
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
+ BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ if (calculateType==1){
deliveryDetailMoney=singlePieceArea.doubleValue();
deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
- }
- }else if (calculateType==3){
- deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
- deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
- }
+ }else if (calculateType==2){
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }
/*if (calculateType==1){
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
@@ -302,60 +303,60 @@
- if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
- JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
- for(String key : jsonObject.keySet()){
- boolean isnull = key.contains("M");
- if(isnull) {
- Map<String, Object> moneryItemmap = new HashMap<>();
- Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
- if(deliveryDetailOtherMoney.get("monery")!=null){
- otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
- deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
- moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
- moneryList.add(moneryItemmap);
- }else{
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- return "false1";
+ if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
+ JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull) {
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
+ if(deliveryDetailOtherMoney.get("monery")!=null){
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false1";
+ }
}
}
+
}
+
+ //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
+ quantity += orderDetail.getDeliveryDetail().getQuantity();
+ area += deliveryDetailArea;
+ money += deliveryDetailMoney;
+ Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
+
+ //棰濆閲戦淇敼
+ Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
+ if(otherColumns!=null){
+ otherColumns.forEach((key, value) ->{
+ boolean isnull = key.contains("M");
+ if(isnull){
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+
+ }
+ });
+ }
+ //鏂板鍙戣揣鏄庣粏鏁版嵁
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys,deliveryDetailArea);
+ //淇敼璁㈠崟鏄庣粏
+ deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
+ //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
+ finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false2";
}
-
-
- //瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
- quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += deliveryDetailArea;
- money += deliveryDetailMoney;
- Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
-
- //棰濆閲戦淇敼
- Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
- if(otherColumns!=null){
- otherColumns.forEach((key, value) ->{
- boolean isnull = key.contains("M");
- if(isnull){
- deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
- if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
- }
- });
-
- }
- });
- }
- //鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys,deliveryDetailArea);
- //淇敼璁㈠崟鏄庣粏
- deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
- //淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
- finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
- }else{
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- return "false2";
}
-
}
//寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index d3ffa44..e5d3c54 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -130,7 +130,10 @@
/*----------------鏂扮増鏈櫥闄�*/
public UserDTO doLogin(UserDTO userDTO) {
User user = userMapper.selectOne(new QueryWrapper<User>().
- eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
+ eq("login_name", userDTO.getUserId())
+ .eq("password", userDTO.getPass())
+ .eq("state",1)
+ );
if(user!=null){
//妫�鏌ユ槸璁╂湁鐧诲綍锛屾湁鐧诲綍鐩存帴閫�鍑�
StpUtil.logout(user.getId());
--
Gitblit v1.8.0