'123'

ABAP_AS_WITH_POOL.jcoDestination

@@ -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

ruoyi-admin/pom.xml

@@ -113,6 +113,13 @@
             <systemPath>${basedir}/src/main/resources/lib/dom4j-1.6.1.jar</systemPath>
             <scope>system</scope>
         </dependency>
+        <dependency>
+            <groupId>ngdbc</groupId>
+            <artifactId>ngdbc</artifactId>
+            <version>1.6.1</version>
+            <systemPath>${basedir}/src/main/resources/lib/ngdbc-0.0.1-SNAPSHOT.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>

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);
+        QuotJswResult quotJswResultObject = JSON.parseObject(QuotJswResultJson, QuotJswResult.class);
-        if(!quotJswResultObject.getResultObject().getSuccess()){
+        if(!quotJswResultObject.getSuccess()){
-            return error(quotJswResultObject.getResultObject().getErrorMessage());
+            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);
+        QuotJswResult quotJswResult = JSON.parseObject(QuotJswResultFileJson, QuotJswResult.class);
-        if(!quotJswResult.getResultObject().getSuccess()){
+        if(!quotJswResult.getSuccess()){
-            return error(quotJswResult.getResultObject().getErrorMessage());
+            return error(quotJswResult.getErrorMessage());
         }
 
 

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);
             }

ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue

@@ -66,6 +66,84 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-divider content-position="left" class="customer_divider_text">产品信息</el-divider>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddQuotMaterial" v-if="this.form.quotApprovalStatus == '0' || this.form.quotApprovalStatus == null">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteQuotMaterial" v-if="this.form.quotApprovalStatus == '0' || this.form.quotApprovalStatus == null">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-if="this.form.quotApprovalStatus == '0' || this.form.quotApprovalStatus == null">导入</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="quotMaterialList" height="300px" show-summary :summary-method="getSummaries" :row-class-name="rowQuotMaterialIndex" ref="quotMaterial">
+          <el-table-column type="selection" width="80" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="型号" prop="matXingh" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matXingh" placeholder="请输入型号" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" prop="matGuig" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matGuig" placeholder="请输入规格" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="电压" prop="matDiany" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matDiany" placeholder="请输入电压" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位" prop="matDanw">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matDanw" placeholder="请输入单位" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" prop="matSl" width="100">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matSl" placeholder="请输入数量" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="matRemark" width="250">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matRemark" placeholder="请输入备注" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="料价" prop="matMatprice" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matMatprice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="红本价" prop="matPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="特批下点" prop="matQuotTp" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="100">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotTp" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="报价" prop="matQuotPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="报价金额" prop="matQuotAllPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotAllPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="料价价差率" prop="matMatpriceDiff" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matMatpriceDiff" :disabled="true"/>
+            </template>
+          </el-table-column>
+        </el-table>
+
+
         <el-row :gutter="8">
           <el-col :span="24">
             <el-divider content-position="center">询价附件</el-divider>
@@ -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;
+    },
   }
 };
 </script>

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'"
           ></el-switch>
         </template>
       </el-table-column>
@@ -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(() => {});
     },
 
     /** 修改按钮操作-详细信息设置 */