diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
deleted file mode 100644
index b020ef3..0000000
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ /dev/null
@@ -1,11 +0,0 @@
-#for tests only !
-#Fri Jun 07 13:50:17 CST 2024
-jco.destination.pool_capacity=10
-jco.client.lang=ZH
-jco.client.ashost=172.19.0.120
-jco.client.saprouter=
-jco.client.user=RFC
-jco.client.sysnr=00
-jco.destination.peak_limit=10
-jco.client.passwd=gkH^Opi?[Xww_Q-nC1k#E=#-#?!=b9Pbs9/oH+!;`0oQqb=7
-jco.client.client=300
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 0b4c0be..4edb9ec 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -113,6 +113,13 @@
${basedir}/src/main/resources/lib/dom4j-1.6.1.jar
system
+
+ ngdbc
+ ngdbc
+ 1.6.1
+ ${basedir}/src/main/resources/lib/ngdbc-0.0.1-SNAPSHOT.jar
+ system
+
org.freemarker
freemarker
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index aa2b905..fbb99fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -493,9 +493,9 @@ public class QuotController extends BaseController
String quotJson = JSON.toJSONString(quotJsw);
//调用金思维接口上传报价单信息
String QuotJswResultJson = HttpUtils.sendPostJson("http://price.jncable.com.cn:7778/GTHINKING/AjaxService/U20231485_N_XLXSBJ/100860101.ashx/RecBJDfromJN",quotJson);
- QuotResultObject quotJswResultObject = JSON.parseObject(QuotJswResultJson, QuotResultObject.class);
- if(!quotJswResultObject.getResultObject().getSuccess()){
- return error(quotJswResultObject.getResultObject().getErrorMessage());
+ QuotJswResult quotJswResultObject = JSON.parseObject(QuotJswResultJson, QuotJswResult.class);
+ if(!quotJswResultObject.getSuccess()){
+ return error(quotJswResultObject.getErrorMessage());
}
//==============================附件对接==================================
@@ -529,9 +529,9 @@ public class QuotController extends BaseController
String fileJson = JSON.toJSONString(quotJswFile);
//调用金思维接口上传附件
String QuotJswResultFileJson = HttpUtils.sendPostJson("http://price.jncable.com.cn:7778/GTHINKING/AjaxService/U20231485_N_XLXSBJ/100860101.ashx/UploadFile",fileJson);
- QuotResultObject quotJswResult = JSON.parseObject(QuotJswResultFileJson, QuotResultObject.class);
- if(!quotJswResult.getResultObject().getSuccess()){
- return error(quotJswResult.getResultObject().getErrorMessage());
+ QuotJswResult quotJswResult = JSON.parseObject(QuotJswResultFileJson, QuotJswResult.class);
+ if(!quotJswResult.getSuccess()){
+ return error(quotJswResult.getErrorMessage());
}
diff --git a/ruoyi-admin/src/main/resources/lib/ngdbc-0.0.1-SNAPSHOT.jar b/ruoyi-admin/src/main/resources/lib/ngdbc-0.0.1-SNAPSHOT.jar
new file mode 100644
index 0000000..c13281a
Binary files /dev/null and b/ruoyi-admin/src/main/resources/lib/ngdbc-0.0.1-SNAPSHOT.jar differ
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
index 48c31c4..f980b84 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
@@ -214,7 +214,7 @@ public class QuotServiceImpl implements IQuotService
for (QuotMaterial quotMaterial : quotMaterialList)
{
quotMaterial.setMatId(UUID.fastUUID().toString());
- quotMaterial.setMatStandard("国标");
+ quotMaterial.setMatStandard("G");
quotMaterial.setQuotId(quotId);
list.add(quotMaterial);
}
diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
index 1c67239..108ed27 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
@@ -66,6 +66,84 @@
+ 产品信息
+
+
+ 添加
+
+
+ 删除
+
+
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
询价附件
@@ -491,7 +569,7 @@ export default {
rejectHj(this.form).then(response => {
this.$modal.msgSuccess("驳回成功");
this.open = false;
- this.getList();
+ this.$emit('refreshList');
});
},
@@ -533,7 +611,41 @@ export default {
quotFileDelete(fileId).then(response => {
this.getQuotHjFileList();
});
- }
+ },
+
+ /** 对产品数据-数量、金额进行合算 */
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+
+ if (column.property === 'matSl' || column.property === 'matQuotAllPrice') {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return NumberAdd(prev,curr);
+ }else {
+ return prev;
+ }
+ }, 0);
+ } else {
+ sums[index] = ''
+ }
+ }
+ });
+ return sums;
+ },
+
+ /** 报价单-产品序号 */
+ rowQuotMaterialIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
}
};
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index c0aa42e..2f34f30 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -137,6 +137,7 @@
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
+ :disabled="scope.row.quotPrint=='0'"
>
@@ -1264,11 +1265,12 @@ export default {
const quotId = row.quotId || this.ids
let self = this;
this.$modal.confirm('是否确认修订所选报价单且更新状态为协助中？').then(function() {
+ }).then(() => {
getReturnUpdateQuot(quotId).then(response => {
- //self.setInfo(response);
this.$modal.msgSuccess("更改成功");
+ this.getList();
});
- }).then(() => {}).catch(() => {});
+ }).catch(() => {});
},
/** 修改按钮操作-详细信息设置 */