yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

master
fengdong777 2 years ago
parent
fabb407108 573be67464
commit
7d33cb7521
4 changed files with 179 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsQuery.java
  2. 70
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
  3. 128
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue
  4. 9
      yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/ZhjSpiderConfig.java

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsQuery.java
View File

@ -42,4 +42,5 @@ public class ProcurementDetailsQuery implements Query {
private String state;
//区分1原油 2包装物 3原料
private String type;
private String supplierName;
}

70
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
View File

@ -4,11 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto;
import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto;
import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
@ -18,6 +20,8 @@ import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetails;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsDto;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsQuery;
import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordMapper;
import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService;
import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationMapper;
import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationService;
import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper;
@ -39,15 +43,15 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
@Autowired
MaterialInventoryMapper rawMaterialInventoryMapper;
@Autowired
CrudeOilTypeInformationMapper crudeOilTypeInformationMapper;
ApprovalRecordService approvalRecordService;
public PagerVo<ProcurementDetailsVo> listPageVo(PagerQuery<ProcurementDetailsQuery> pq) {
ProcurementDetailsQuery query = pq.getParams();
QueryWrapper<ProcurementDetails> qw = new QueryWrapper<>();
// if (StringUtils.isNotBlank(query.getDate())) {
// qw.eq("STR_TO_DATE(o.deliveryDate,'%Y-%m-%d')", query.getDate());
// }
if (StringUtils.isNotBlank(query.getType())) {
qw.eq("d.type", query.getType());
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.eq("s.supplierNumber", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("d.state", query.getState());
@ -65,10 +69,24 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
public ResultBean save(ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
ProcurementDetails entity=new ProcurementDetails();
if(null==dto.getSid() || ""==dto.getSid()){
BeanUtil.copyProperties(dto, entity, "id","sid");
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(entity.getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
}else{
BeanUtil.copyProperties(dto, entity, "id");
}
// BeanUtil.copyProperties(dto, entity, "id","sid");
//多个商品
if(dto.getCommodityList().size()>1){
BeanUtil.copyProperties(dto, entity, "sid");
//BeanUtil.copyProperties(dto, entity, "sid");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
@ -79,8 +97,7 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}
return rb.success().setMsg("新增成功");
}
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
@ -93,27 +110,35 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}
public ResultBean submit(ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
String sid =dto.getCommodityList().get(1).getSid();
//不存在提交
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
String sid =dto.getSid();
List<ProcurementDetails> procurementDetails=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
//不存在保存加提交
if(sid.equals("")||sid.equals(null)){
ProcurementDetails entity=new ProcurementDetails();
if(dto.getCommodityList().size()>1){
BeanUtil.copyProperties(dto, entity, "sid");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
entity.setState(procurementDetails.get(1).getState()+1);
entity.setType("1");
entity.setWeight(pro.getWeight());
entity.setPrice(pro.getPrice());
baseMapper.insert(entity);
}
//提交记录
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(entity.getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
return rb.success().setMsg("新增成功");
}
Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
entity.setTypeSid(pro.getSid());
entity.setState(1);
entity.setState(procurementDetails.get(1).getState()+1);
entity.setType("1");
entity.setWeight(pro.getWeight());
entity.setPrice(pro.getPrice());
@ -122,13 +147,16 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
}else{
//存在该状态
List<ProcurementDetails> list =baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
if(list.size()>1){
for(ProcurementDetails pro:list){
BeanUtil.copyProperties(dto, pro, "id", "sid");
pro.setState(2);
baseMapper.updateById(pro);
}
for(ProcurementDetails pro:list){
pro.setState(procurementDetails.get(1).getState()+1);
baseMapper.updateById(pro);
}
// ApprovalRecordDto recordDto=new ApprovalRecordDto();
// recordDto.setProSid(list.get(1).getSid());
// recordDto.setApprover("");
// recordDto.getApprovalOpinions();
// recordDto.setApprovalDate(dfmt);
// approvalRecordService.save(recordDto);
}
return rb.success().setMsg("提交成功");
}
@ -136,9 +164,9 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
public ResultBean update (ProcurementDetailsDto dto){
ResultBean rb=new ResultBean();
String dtoSid = dto.getSid();
ProcurementDetails entity=fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
baseMapper.delete(new QueryWrapper<ProcurementDetails>().eq("sid",dtoSid));
dto.setSid(dtoSid);
save(dto);
return rb.success().setMsg("修改成功");
}
public ResultBean getProcurementBySid(String sid){

128
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue
View File

@ -64,12 +64,101 @@
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{formobj.arrivalDate}}</span>
<!-- <el-date-picker v-model="formobj.arrivalDate" type="date" format="yyyy-MM-dd" style="width: 80%;"
value-format="yyyy-MM-dd" placeholder="请选择" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">付款日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.paymentDate" type="date" style="width: 80%;" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="请选择" />
<!-- <span>{{formobj.supplierName}}</span> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">付款金额</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> -->
<el-input v-model="formobj.payment" placeholder="" @input="limitInput($event)" style="width: 80%;"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">付款单位</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.payer" placeholder="" style="width: 80%;" clearable />
<!-- <span>{{formobj.supplierName}}</span> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">付款单位开户行</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> -->
<el-input v-model="formobj.payerBank" placeholder="" style="width: 80%;" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">收款单位</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.payee" placeholder="" style="width: 80%;" clearable />
<!-- <span>{{formobj.supplierName}}</span> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">收款单位开户行</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> -->
<el-input v-model="formobj.payeeBank" placeholder="" style="width: 80%;" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<el-input v-model="formobj.paymentSummary" placeholder="" type="textarea" :rows="5" style="width: 100%;"
clearable />
<!-- <span>{{formobj.supplierName}}</span> -->
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1" title="商品信息">
<!-- <template slot="title" title="商品信息">
@ -113,17 +202,41 @@
arrivalDate: "",
supplierSid: "",
supplierName: "",
paymentDate: "",
payment: "",
payer: "",
payerBank: "",
payee: "",
payeeBank: "",
paymentSummary: "",
commodityList: [],
}
}
},
methods: {
/**
* 1、必须为数字
* 2、只能有一个小数点
* 3、小数点后保留两位小数
* 4、当第一位输入小数点的时候自动补全，补为 0.
* 5、除非是小数，否则数字不能以0开头
* @param {string} value - 输入的值
* @param {string} index - 匹配的对象属性 [mkPrice | slPrice]
*/
limitInput(value) {
this.formobj.payment =
("" + value) // 第一步：转成字符串
.replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
.replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
.replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
},
submitData() {
console.log(">>>>>>>>>submit", this.formobj)
if (this.formobj.state = 5) {
// 财务审批 需要填数据
} else {
// 财务之前 直接提交
req.procureAddSubmitInfo(this.formobj)
@ -156,6 +269,13 @@
arrivalDate: "",
supplierSid: "",
supplierName: "",
paymentDate: "",
payment: "",
payer: "",
payerBank: "",
payee: "",
payeeBank: "",
paymentSummary: "",
commodityList: [],
}
@ -214,4 +334,4 @@
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
</style>
</style>

9
yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/ZhjSpiderConfig.java
View File

@ -23,18 +23,19 @@ public class ZhjSpiderConfig {
return request;
}
private static String v_flag = "1";
private static String v_flag = "2";
private static void initHeaders() {
CACHE_HEADERS = new HashMap<>();
// CACHE_HEADERS.put("cookie", "cna=QZ74GyioHjsCAWpxs/DlZflP; qbi_locale=zh-CN; x_login_pk=19b6a50a88ee4c8cbeacee4420345262; xlly_s=1; qbi_version=1; qbi_redirected=1; csrf_token=f66e628f-d681-4be5-855e-56e77886e002; isg=BIqKYOxE2qEZjVZawN-NAZ2Y23Asew7V-iD6yBTCI11JxyuB_Q3P5fXx1zMbN4Zt");
// CACHE_HEADERS.put("cookie", "cna=QZ74GyioHjsCAWpxs/DlZflP; qbi_locale=zh-CN; x_login_pk=19b6a50a88ee4c8cbeacee4420345262; csrf_token=f66e628f-d681-4be5-855e-56e77886e002; qbi_version=2; xlly_s=1; isg=BLe3V-4In-iHGRsxfXgo-thHRqsBfIven4934wljCQdwuN36EEhuLkRemhjmUGNW");
CACHE_HEADERS.put("cookie", "cna=QZ74GyioHjsCAWpxs/DlZflP; qbi_locale=zh-CN; x_login_pk=19b6a50a88ee4c8cbeacee4420345262; csrf_token=f66e628f-d681-4be5-855e-56e77886e002; qbi_version=" + v_flag + "; xlly_s=1; isg=BLe3V-4In-iHGRsxfXgo-thHRqsBfIven4934wljCQdwuN36EEhuLkRemhjmUGNW");
CACHE_HEADERS.put("cookie", "qbi_locale=zh-CN; x_login_pk=19b6a50a88ee4c8cbeacee4420345262; cna=QZ74GyioHjsCAWpxs/DlZflP; csrf_token=6100e7ee-5a25-4037-a0e2-092969ae884e; xlly_s=1; qbi_version=" + v_flag+"; qbi_redirected=1; isg=BJOTzqSb88NC4b_dsQw0LtxbIhe9SCcKGwMT60WxaLJ4xLJmzB0bWovS_jSq5H8C");
// CACHE_HEADERS.put("x-csrf-token", "f66e628f-d681-4be5-855e-56e77886e002");
CACHE_HEADERS.put("x-csrf-token", "f66e628f-d681-4be5-855e-56e77886e002");
CACHE_HEADERS.put("x-csrf-token", "6100e7ee-5a25-4037-a0e2-092969ae884e");
// CACHE_HEADERS.put("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto&qbi_version_param=1");
// CACHE_HEADERS.put("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto&qbi_version_param=2");
CACHE_HEADERS.put("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto&qbi_version_param=" + v_flag);
//https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=5442b55fdf194146b0fcc809d5284e4d&dd_orientation=auto&qbi_version_param=2
CACHE_HEADERS.put("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=5442b55fdf194146b0fcc809d5284e4d&dd_orientation=auto&qbi_version_param=" + v_flag);
// CACHE_HEADERS.put("x-gw-referer", "https://bi.aliyuncs.com/token3rd/dashboard/view/pc.htm?pageId=85c4af04-1910-4005-8e47-742af1acb713&accessToken=d8c021cd40ad94b2d500d12229b57c3e&dd_orientation=auto");
}

Write Preview
Loading…
Cancel
Save