xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11"

This commit is contained in:
xd 2024-06-06 17:04:37 +08:00
parent 5665d2b633
commit 2c781da6a1
8 changed files with 42 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,5 +1,5 @@
#for tests only !
#Tue Jun 04 16:46:03 CST 2024
#Thu Jun 06 14:19:16 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
jco.client.ashost=172.19.0.120
@ -7,5 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC
jco.client.sysnr=00
jco.destination.peak_limit=10
jco.client.passwd=654321
jco.client.passwd=fyP*^^S)mI4.TUT*}uMrHy])~sv.u}p[_7L*O}z3,^XTYYOu
jco.client.client=300

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
View File

@ -329,7 +329,7 @@ public class CustomerController extends BaseController
@PreAuthorize("@ss.hasPermi('customer:customer:qcclist')")
@PostMapping("/checkQccCount")
public AjaxResult checkQccCount(){
String qccCusCount = configService.selectConfigByKey("qcc:cus:count");
String qccCusCount = configService.selectConfigByKey("qcc.cus.count");
Integer searchCount = redisCache.getCacheObject(getCacheKey(getUsername()));
if (searchCount == null){
searchCount = 1;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -293,7 +293,7 @@ public class QuotController extends BaseController
public AjaxResult commitQuot(@RequestBody Quot quot)
{
// 每天限制提交200条
String quotCommitCount = configService.selectConfigByKey("quot:commit:count");
String quotCommitCount = configService.selectConfigByKey("quot.commit.count");
String count = quotService.selectQuotListCount();
if(Integer.valueOf(count)>=Integer.valueOf(quotCommitCount)){
return error("当前报价量已达极限，无法继续提供报价单");

23
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/OAQuotTask.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/QuotTask.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.quartz.task;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.quartz.domain.OASysQuot;
@ -11,12 +12,12 @@ import javax.annotation.Resource;
import java.util.List;
/**
* 定时任务调度-同步红本数据库
* 定时任务调度-报价单OA流程状态读取
*
* @author ruoyi
*/
@Component("OAQuotTask")
public class OAQuotTask
@Component("quotTask")
public class QuotTask
{
@Autowired
private RedisCache redisCache;
@ -27,7 +28,7 @@ public class OAQuotTask
@Resource
private OAQuotService quotService;
public static OAQuotTask testUtils;
public static QuotTask testUtils;
@PostConstruct
public void init() {
@ -39,7 +40,7 @@ public class OAQuotTask
*/
public void OAQuot() throws Exception {
Boolean lock= redisLock.getLock("OAQuotTask", -1, "1");
Boolean lock= redisLock.getLock(getJobKey("OAQuotTaskLock"), 120, "OAQuotTask");
if(lock){
try{
// 查询 报价单-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态
@ -50,10 +51,20 @@ public class OAQuotTask
//将中间表 根据报价单号更新 isfinish=1 表示报价流程已结束
quotService.updateOAQuotByQuotCode(sysoaquot.getQuotCode());
}
redisCache.deleteObject("OAQuotTask");
}catch (Exception e) {
throw new Exception(e.getMessage(), e);
}
}
}
/**
* 定时任务缓存键名
*
* @param jobId 任务编号
* @return 缓存键key
*/
private String getJobKey(String jobId)
{
return CacheConstants.SYS_JOB_KEY + jobId;
}
}

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RbTask.java
View File

@ -54,7 +54,7 @@ public class RbTask
public void tongb() throws Exception {
String rbVersionUid = testUtils.sapTjService.selRbVersionUid();//红本调价记录uid
Boolean lock= redisLock.getLock(getJobKey("rbTask"), -1, rbVersionUid);
Boolean lock= redisLock.getLock(getJobKey("rbTask"), 480, "rbTask");
if(lock){
//判断是否已执行调价 （6.3 redbook rb_productVersion 是否有新增uid and sta='1'、sdmdm1 调价日期今日的数据是否存在）
String locVersionUid = testUtils.sapTjService.selLocVersionUid();//本地红本调价记录uid

192
ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuotMaterial.java
View File

@ -1,192 +0,0 @@
package com.ruoyi.quot.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* 报价单-产品对象 SysOaQuotMaterial
*
* @author ruoyi
* @date 2024-04-01
*/
public class SysOaQuotMaterial extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 产品ID */
private String matId;
/** 型号 */
private String matXingh;
/** 规格 */
private String matGuig;
/** 电压 */
private String matDiany;
/** 标准 */
private String matStandard;
/** 单位 */
private String matDanw;
/** 数量 */
private BigDecimal matSl;
/** 备注 */
private String matRemark;
/** 料价 */
private BigDecimal matMatprice;
/** 红本价 */
private BigDecimal matPrice;
/** 报价 */
private BigDecimal matQuotPrice;
/** 报价金额 */
private BigDecimal matQuotAllPrice;
/** 料价价差率 */
private BigDecimal matMatpriceDiff;
/** 序号 */
private Integer xh;//序号
/** 行号 */
private Integer index;//行号
/** 报价单ID */
private String quotId;
public String getMatId() {
return matId;
}
public void setMatId(String matId) {
this.matId = matId;
}
public String getMatXingh() {
return matXingh;
}
public void setMatXingh(String matXingh) {
this.matXingh = matXingh;
}
public String getMatGuig() {
return matGuig;
}
public void setMatGuig(String matGuig) {
this.matGuig = matGuig;
}
public String getMatDiany() {
return matDiany;
}
public void setMatDiany(String matDiany) {
this.matDiany = matDiany;
}
public String getMatStandard() {
return matStandard;
}
public void setMatStandard(String matStandard) {
this.matStandard = matStandard;
}
public String getMatDanw() {
return matDanw;
}
public void setMatDanw(String matDanw) {
this.matDanw = matDanw;
}
public BigDecimal getMatSl() {
return matSl;
}
public void setMatSl(BigDecimal matSl) {
this.matSl = matSl;
}
public String getMatRemark() {
return matRemark;
}
public void setMatRemark(String matRemark) {
this.matRemark = matRemark;
}
public BigDecimal getMatMatprice() {
return matMatprice;
}
public void setMatMatprice(BigDecimal matMatprice) {
this.matMatprice = matMatprice;
}
public BigDecimal getMatPrice() {
return matPrice;
}
public void setMatPrice(BigDecimal matPrice) {
this.matPrice = matPrice;
}
public BigDecimal getMatQuotPrice() {
return matQuotPrice;
}
public void setMatQuotPrice(BigDecimal matQuotPrice) {
this.matQuotPrice = matQuotPrice;
}
public BigDecimal getMatQuotAllPrice() {
return matQuotAllPrice;
}
public void setMatQuotAllPrice(BigDecimal matQuotAllPrice) {
this.matQuotAllPrice = matQuotAllPrice;
}
public BigDecimal getMatMatpriceDiff() {
return matMatpriceDiff;
}
public void setMatMatpriceDiff(BigDecimal matMatpriceDiff) {
this.matMatpriceDiff = matMatpriceDiff;
}
public Integer getXh() {
return xh;
}
public void setXh(Integer xh) {
this.xh = xh;
}
public Integer getIndex() {
return index;
}
public void setIndex(Integer index) {
this.index = index;
}
public String getQuotId() {
return quotId;
}
public void setQuotId(String quotId) {
this.quotId = quotId;
}
}

27
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -148,22 +148,22 @@
</el-table-column>
<el-table-column label="数量" align="center" prop="quotQuantity" width="100"/>
<el-table-column label="反馈说明" align="center" prop="quotFeedbackExplanation" width="150px"/>
<el-table-column label="金思维提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
<el-table-column label="金思维提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT'])">
<template slot-scope="scope">
<dict-tag :options="dict.type.quot_jsw_approval_status" :value="scope.row.quotJswApprovalStatus" v-if="scope.row.quotJswApprovalStatus!=0"/>
</template>
</el-table-column>
<el-table-column label="OA提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
<el-table-column label="OA提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT'])">
<template slot-scope="scope">
<dict-tag :options="dict.type.quot_oa_approval_status" :value="scope.row.quotOAApprovalStatus" v-if="scope.row.quotOAApprovalStatus!=0"/>
</template>
</el-table-column>
<el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
<el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT'])">
<template slot-scope="scope">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus" v-if="scope.row.quotJsxzApprovalStatus!=0"/>
</template>
</el-table-column>
<el-table-column label="核价协助状态" align="center" prop="quotHjApprovalStatus" width="150px">
<el-table-column label="核价协助状态" align="center" prop="quotHjApprovalStatus" width="150px" v-if="checkRole(['QUOT'])">
<template slot-scope="scope">
<dict-tag :options="dict.type.quot_hj_approval_status" :value="scope.row.quotHjApprovalStatus" v-if="scope.row.quotHjApprovalStatus!=0"/>
</template>
@ -370,7 +370,7 @@
<el-divider content-position="left" class="customer_divider_text">反馈附件</el-divider>
<div v-hasPermi="['quot:quot:quotFkFile']" >
<el-upload class="upload-demo"
ref="upload"
ref="quotFkFileUpload"
name="quotFile"
:action="uploadUrl"
:headers="headers"
@ -481,7 +481,7 @@
<el-divider content-position="left" class="customer_divider_text">清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
<div v-hasPermi="['quot:quot:quotXjFile']">
<el-upload class="upload-demo"
ref="upload"
ref="quotXjFileUpload"
name="quotFile"
:action="uploadUrl"
:headers="headers"
@ -517,7 +517,7 @@
<el-divider content-position="left" class="customer_divider_text">技术附件(先保存再上传)</el-divider>
<div v-hasPermi="['quot:quot:quotJsgfFile']">
<el-upload class="upload-demo"
ref="upload"
ref="quotJsgfFileUpload"
name="quotFile"
:action="uploadUrl"
:headers="headers"
@ -1563,6 +1563,7 @@ export default {
},
//获取报价单-技术规范附件列表
getQuotJsgfFileList(){
console.log(this.form.quotId)
const param = {relationId:this.form.quotId,fileType:'quotJsgfFile'}
quotFileList(param).then(response => {
this.quotJsgfFileList = response.rows;
@ -1636,8 +1637,14 @@ export default {
}
} else {
this.$modal.msgError(res.msg);
if(activeName=='quotXjFile'){
this.$refs.quotXjFileUpload.clearFiles(); //上传成功之后清除历史记录**加粗样式**
}else if(activeName=='quotJsgfFile'){
this.$refs.quotJsgfFileUpload.clearFiles(); //上传成功之后清除历史记录**加粗样式**
}else if(activeName=='quotFkFile'){
this.$refs.quotFkFileUpload.clearFiles(); //上传成功之后清除历史记录**加粗样式**
}
}
this.$refs.upload.clearFiles(); //上传成功之后清除历史记录**加粗样式**
},
//下载附件
@ -1648,10 +1655,12 @@ export default {
//删除附件
deleteFile(fileId,activeName){
//let activeName = this.activeName;
console.log(fileId)
console.log(activeName)
quotFileDelete(fileId).then(response => {
if(activeName=='quotXjFile'){
this.getQuotXjFileList();
}else if(activeName=='quotJsgfInfo'){
}else if(activeName=='quotJsgfFile'){
this.getQuotJsgfFileList();
}else if(activeName=='quotFkFile'){
this.getQuotFkFileList();

3
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
View File

@ -993,8 +993,9 @@
param.quotJsxzGroup = quotJsxzGroup;//组名
param.type = type;//操作人、审核人、组长
param.state = state;//通过/驳回
param.fileNum = quotJsxzGroup=='TL'?this.quotJsqrTlFileNum:quotJsxzGroup=='Dy'?this.quotJsqrDyFileNum:quotJsxzGroup=='Zy'?this.quotJsqrZyFileNum:this.quotJsqrQtFileNum;//反馈附件数
param.fileNum = quotJsxzGroup=='TL'?this.quotJsqrTlFileNum:(quotJsxzGroup=='DY'?this.quotJsqrDyFileNum:(quotJsxzGroup=='ZY'?this.quotJsqrZyFileNum:this.quotJsqrQtFileNum));//反馈附件数
console.log(param.fileNum)
param.quotJsqrTlRemark = this.form.quotJsqrTlRemark;
param.quotJsqrTlCheckRemark = this.form.quotJsqrTlCheckRemark;
param.quotJsqrTlLeaderRemark = this.form.quotJsqrTlLeaderRemark;