yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

采购单问题修改

master
God 11 months ago
parent
dc0f3c45a9
commit
5f027ee1c6
9 changed files with 188 additions and 56 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-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
  2. 3
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
  3. 47
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
  4. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
  5. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
  6. 1
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
  7. 3
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
  8. 177
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  9. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java

1
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
View File

@ -27,6 +27,7 @@
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchaseback_detail ppd
ON ppb.`sid` = ppd.`billSid`
LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>

3
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
View File

@ -80,4 +80,7 @@ public class PmsPurchasebackBillQuery implements Query {
@ApiModelProperty("组织全路径")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

47
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
View File

@ -37,6 +37,7 @@ import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBill;
import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillService;
import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo;
import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo;
import com.yxt.pms.feign.base.Rule;
import com.yxt.pms.feign.flowable.flow.*;
@ -51,6 +52,8 @@ import com.yxt.pms.feign.message.MessageFlowableQuery;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.pms.feign.privilege.PrivilegeQuery;
import com.yxt.pms.feign.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -96,13 +99,51 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<PmsPurchasebackBillVo> listPageVo(PagerQuery<PmsPurchasebackBillQuery> pq) {
PmsPurchasebackBillQuery query = pq.getParams();
QueryWrapper<PmsPurchasebackBill> qw = new QueryWrapper<>();
String orgPath = query.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
qw.eq("ppb.createOrgSid", createOrgSid);
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("ppb.createBySid", query.getUserSid());
} else {
PagerVo<PmsPurchasebackBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<PmsPurchasebackBillVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ppb.createOrgName", query.getCreateOrgName());
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
View File

@ -109,10 +109,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
@ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("预计到货日期")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date deliveryDate;
@ApiModelProperty("运费")
private BigDecimal freight;

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
View File

@ -99,10 +99,7 @@ public class PmsPurchaseBillDto implements Dto {
@ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("预计到货日期")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date deliveryDate;
@ApiModelProperty("运费")
private BigDecimal freight;

1
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
View File

@ -27,6 +27,7 @@
ON ppbi.`billSid` = ppb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppbd.`billSid` = ppb.`sid`
LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>

3
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
View File

@ -82,4 +82,7 @@ public class PmsPurchaseBillQuery implements Query {
@ApiModelProperty("组织全路径")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

177
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
View File

@ -31,6 +31,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.common.core.result.ResultBean;
import com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillService;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
@ -59,6 +60,8 @@ import com.yxt.pms.feign.message.MessageFlowableQuery;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.pms.feign.privilege.PrivilegeQuery;
import com.yxt.pms.feign.sysuser.SysUserFeign;
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto;
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDto;
import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillFeign;
@ -68,11 +71,13 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
@ -117,13 +122,52 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
private MessageFeign messageFeign;
@Autowired
private WmsAnsBillFeign wmsAnsBillFeign;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
PmsPurchaseBillQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
String orgPath = query.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
qw.eq("ppb.createOrgSid", createOrgSid);
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("ppb.createBySid", query.getUserSid());
} else {
PagerVo<PmsPurchaseBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<PmsPurchaseBillVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ppb.createOrgName", query.getCreateOrgName());
}
@ -366,16 +410,31 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
pmsPurchaseBill = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
//==================================添加线程
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
PmsPurchaseBill purchaseBill = pmsPurchaseBill;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
//==================================添加线程
return voResultBean;
}
if (r == 2) {
@ -494,18 +553,33 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
} else {
//极光推送
pmsPurchaseBill = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(pmsPurchaseBill.getProcDefId());
ufVo.setProcInsId(pmsPurchaseBill.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
//==================================添加线程
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
PmsPurchaseBill purchaseBill = pmsPurchaseBill;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(purchaseBill.getProcDefId());
ufVo.setProcInsId(purchaseBill.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
//==================================添加线程
}
return rb.success().setData(resultBean.getData());
} else {
@ -568,26 +642,41 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
updateFlowFiled(map);
//极光推送
pmsPurchaseBill = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = pmsPurchaseBill.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(pmsPurchaseBill.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(pmsPurchaseBill.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(pmsPurchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
//==================================添加线程
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
PmsPurchaseBill purchaseBill = pmsPurchaseBill;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = purchaseBill.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(purchaseBill.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("采购单申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(purchaseBill.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(purchaseBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
messageFlowableQuery.setMsgTitle("采购单申请");
messageFeign.pushMessage(messageFlowableQuery);
//==================================添加线程
return rb.success();
}
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java
View File

@ -31,7 +31,7 @@ public class WmsAnsBillDetail extends BaseEntity {
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("单位成本（采购价）")
private String cost;
private BigDecimal cost;
@ApiModelProperty("预约数量（采购订单数量）")
private String orderCount;
@ApiModelProperty("待入库数量-根据收货单计算")

Write Preview
Loading…
Cancel
Save