From 0a68c5b8442e3da4325ec5ad4e42db64d42057f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 24 四月 2024 13:11:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml | 3 -
north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml | 3 -
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 14 ++++++
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 32 +++++++---------
north-glass-erp/target/classes/application.yml | 35 -----------------
5 files changed, 29 insertions(+), 58 deletions(-)
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 c9d799c..07ea07f 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
@@ -540,13 +540,25 @@
}
}
+//璁＄畻閲戦挶
+const countMoney = (list) => {
+ let countMoney = 0
+ list.forEach((item)=>{
+ countMoney += parseFloat(item.grossAmount)
+ })
+ // otherMoney.value.forEach(item => {
+ // countMoney+=item.quantity*item.price
+ // })
+ return parseFloat((countMoney).toFixed(2))
+}
+
//鍏抽棴鍏朵粬閲戦鐣岄潰
const refOtherMoney = ref()
const closeOtherMoneyDialog = async (done) => {
const flag = await refOtherMoney.value.validate()
if(flag){
done()
- titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ //titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
}
}
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 91a3128..e27ceb3 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
@@ -133,7 +133,7 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try{
+
String deliveryId="";
String oddNumber;
@@ -187,8 +187,13 @@
Integer quantity = 0;
double money = 0.0;
AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
- //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ deliveryOtherMoney.setQuantity(0.0);
+ });
+
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
@@ -200,16 +205,16 @@
Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
- if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity (otherColumns.get(key)==null?0:otherColumns.get(key));
- deliveryOtherMoney.setQuantity(((value==null?0:value)*orderDetail.getDeliveryDetail().getQuantity()));
- }
- });
+ if(value!=null) {
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+ }
});
}
-
//鏂板鍙戣揣鏄庣粏鏁版嵁
deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
@@ -235,16 +240,7 @@
} else {
return false;
}
- }catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- //灏嗗紓甯镐紶鍏ユ暟鎹簱
- SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
- sysErrorService.insert(sysError);
- saveState = false;
- }
return saveState;
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
index d065c29..f0ca31e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -97,8 +97,7 @@
left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
- where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id
-
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
</select>
diff --git a/north-glass-erp/target/classes/application.yml b/north-glass-erp/target/classes/application.yml
index 8c37623..e69de29 100644
--- a/north-glass-erp/target/classes/application.yml
+++ b/north-glass-erp/target/classes/application.yml
@@ -1,35 +0,0 @@
-
-server:
- port: 8086
-
-
-
-spring:
- datasource:
- dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- user_info:
- url: jdbc:mysql://localhost:3306/erp_user_info?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- sd:
- url: jdbc:mysql://localhost:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- mm:
- url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
-#mybatis-plus:
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
index d065c29..f0ca31e 100644
--- a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
@@ -97,8 +97,7 @@
left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
- where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id
-
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
</select>
--
Gitblit v1.8.0