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

1

master
God 6 months ago
parent
7d0076ff58
commit
40f86025cc
16 changed files with 193 additions and 160 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. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityVo.java
  2. 32
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDetailsVo.java
  3. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDto.java
  4. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeign.java
  5. 72
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeignFallback.java
  6. 21
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractQuery.java
  7. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractVo.java
  8. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.java
  9. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityRest.java
  10. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityService.java
  11. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.java
  12. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.xml
  13. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractRest.java
  14. 114
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractService.java
  15. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  16. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityVo.java
View File

@ -57,6 +57,8 @@ public class ScmActivityVo implements Vo {
private String createOrgName;
@ApiModelProperty("活动名称")
private String activityName; // 活动名称
@ApiModelProperty("活动地点")
private String activityAddress;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("开始日期")
private Date activityStartDate; // 开始日期

32
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDetailsVo.java
View File

@ -29,7 +29,11 @@ package com.yxt.anrui.scm.api.scminteract;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -53,23 +57,27 @@ public class ScmInteractDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人姓名")
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("厂家名称")
@ApiModelProperty("厂家名称")
private String manufactorName; // 厂家名称
@ApiModelProperty("对接人")
@ApiModelProperty("对接人")
private String contacts; // 对接人
@ApiModelProperty("沟通事宜")
@ApiModelProperty("沟通事宜")
private String interactContent; // 沟通事宜
@ApiModelProperty("沟通结果")
@ApiModelProperty("沟通结果")
private String interactResult; // 沟通结果
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDateStart; // 沟通日期
private Date interactDateEnd; // 沟通日期
@ApiModelProperty("创建组织sid")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDate; // 沟通日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty
private List<String> urls = new ArrayList<>();
}

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDto.java
View File

@ -29,7 +29,11 @@ package com.yxt.anrui.scm.api.scminteract;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -53,6 +57,10 @@ public class ScmInteractDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("厂家名称")
@ -63,13 +71,13 @@ public class ScmInteractDto implements Dto {
private String interactContent; // 沟通事宜
@ApiModelProperty("沟通结果")
private String interactResult; // 沟通结果
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDateStart; // 沟通日期
private Date interactDateEnd; // 沟通日期
private Date interactDate; // 沟通日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty
private List<String> urls = new ArrayList<>();
}

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeign.java
View File

@ -52,8 +52,7 @@ import java.util.List;
@FeignClient(
contextId = "anrui-scm-ScmInteract",
name = "anrui-scm",
path = "v1/scminteract",
fallback = ScmInteractFeignFallback.class)
path = "v1/manufactorInteract")
public interface ScmInteractFeign {
@ApiOperation("根据条件分页查询数据的列表")
@ -62,7 +61,7 @@ public interface ScmInteractFeign {
public ResultBean<PagerVo<ScmInteractVo>> listPage(@RequestBody PagerQuery<ScmInteractQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@PostMapping("/saveOrUpdate")
@ResponseBody
public ResultBean save(@RequestBody ScmInteractDto dto);
@ -72,7 +71,7 @@ public interface ScmInteractFeign {
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@GetMapping("/gteInitBySid/{sid}")
@ResponseBody
public ResultBean<ScmInteractDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

72
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeignFallback.java
View File

@ -1,72 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scminteract;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-scm(销售支持业务) <br/>
* File: ScmInteractFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scminteract.ScmInteractFeignFallback <br/>
* Description: 厂家沟通管理. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-14 17:20:43 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmInteractFeignFallback implements ScmInteractFeign {
@Override
public ResultBean<PagerVo<ScmInteractVo>> listPage(PagerQuery<ScmInteractQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scminteract/listPage无法访问");
}
@Override
public ResultBean save(ScmInteractDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scminteract/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scminteract/delBySids无法访问");
}
@Override
public ResultBean<ScmInteractDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scminteract/fetchDetailsBySid无法访问");
}
}

21
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractQuery.java
View File

@ -51,23 +51,16 @@ import lombok.Data;
@ApiModel(value = "厂家沟通管理 查询条件", description = "厂家沟通管理 查询条件")
public class ScmInteractQuery implements Query {
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("厂家名称")
private String manufactorName; // 厂家名称
@ApiModelProperty("对接人")
private String contacts; // 对接人
@ApiModelProperty("沟通事宜")
private String interactContent; // 沟通事宜
@ApiModelProperty("沟通结果")
private String interactResult; // 沟通结果
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDateStart; // 沟通日期
private Date interactDateEnd; // 沟通日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String interactDateStartDate; // 沟通日期
private String interactDateEndDate; // 沟通日期
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
private String orgName; // 创建组织名称
private String userSid;
private String orgPath;
private String menuUrl;
private String menuSid;
}

18
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractVo.java
View File

@ -53,23 +53,15 @@ public class ScmInteractVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("厂家名称")
private String manufactorName; // 厂家名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDate;
@ApiModelProperty("对接人")
private String contacts; // 对接人
@ApiModelProperty("沟通事宜")
private String interactContent; // 沟通事宜
@ApiModelProperty("沟通结果")
private String interactResult; // 沟通结果
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("沟通日期")
private Date interactDateStart; // 沟通日期
private Date interactDateEnd; // 沟通日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.java
View File

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmactivity.ScmActivity;
import com.yxt.anrui.scm.api.scmactivity.ScmActivityVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -54,5 +55,7 @@ import java.util.List;
public interface ScmActivityMapper extends BaseMapper<ScmActivity> {
IPage<ScmActivityVo> selectPageVo(IPage<ScmActivity> page, @Param(Constants.WRAPPER) Wrapper<ScmActivity> qw);
@Update("update scm_activity set isDelete = 1 where sid = #{sid}")
void updateIsDel(String sid);
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityRest.java
View File

@ -55,8 +55,8 @@ import com.yxt.anrui.scm.api.scmactivity.ScmActivityFeign;
* @since 1.0
*/
@Api(tags = "营销活动管理")
@RestController("com.yxt.anrui.scm.biz.scmactivity.ScmActivityRest")
@RequestMapping("v1/scmactivity")
@RestController
@RequestMapping("v1/marketingActivities")
public class ScmActivityRest implements ScmActivityFeign {
@Autowired
@ -79,7 +79,7 @@ public class ScmActivityRest implements ScmActivityFeign {
@Override
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmActivityService.delBySids(sids);
scmActivityService.updateIsDel(sids);
return rb.success();
}

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityService.java
View File

@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busfleet.BusFleetVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
@ -52,6 +53,7 @@ import com.yxt.anrui.scm.api.scmactivity.ScmActivityFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -147,13 +149,20 @@ public class ScmActivityService extends MybatisBaseService<ScmActivityMapper, Sc
String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setLinkSid(sid);
// scmFile.setAttachType(ScmEnum.GKXY.getAttachType());
scmFile.setFilePath(filePath);
scmFileService.save(scmFile);
}
return;
}
this.updateByDto(dto);
scmFileService.delByMainSid(dtoSid);
for (String url : urls) {
String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setLinkSid(dtoSid);
scmFile.setFilePath(filePath);
scmFileService.save(scmFile);
}
}
public String insertByDto(ScmActivityDto dto) {
@ -177,6 +186,19 @@ public class ScmActivityService extends MybatisBaseService<ScmActivityMapper, Sc
ScmActivity entity = fetchBySid(sid);
ScmActivityDetailsVo vo = new ScmActivityDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<String> urls = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
String url = fileUploadComponent.getUrlPrefix() + scmFileVo.getFilePath();
urls.add(url);
}
vo.setUrls(urls);
return vo;
}
public void updateIsDel(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDel(sid);
}
}
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.java
View File

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scminteract.ScmInteract;
import com.yxt.anrui.scm.api.scminteract.ScmInteractVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -53,13 +54,8 @@ import java.util.List;
@Mapper
public interface ScmInteractMapper extends BaseMapper<ScmInteract> {
//@Update("update scm_interact set name=#{msg} where id=#{id}")
//IPage<ScmInteractVo> voPage(IPage<ScmInteract> page, @Param(Constants.WRAPPER) QueryWrapper<ScmInteract> qw);
IPage<ScmInteractVo> selectPageVo(IPage<ScmInteract> page, @Param(Constants.WRAPPER) Wrapper<ScmInteract> qw);
List<ScmInteractVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmInteract> qw);
@Select("select * from scm_interact")
List<ScmInteractVo> selectListVo();
@Update("update scm_interact set isDelete = 1 where sid = #{sid}")
void updateIsDel(String sid);
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.xml
View File

@ -4,10 +4,8 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scminteract.ScmInteractVo">
SELECT * FROM scm_interact <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scminteract.ScmInteractVo">
SELECT * FROM scm_interact <where> ${ew.sqlSegment} </where>
SELECT * FROM scm_interact si
LEFT JOIN anrui_portal.sys_organization as u ON si.createOrgSid = u.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractRest.java
View File

@ -55,16 +55,14 @@ import com.yxt.anrui.scm.api.scminteract.ScmInteractFeign;
* @since 1.0
*/
@Api(tags = "厂家沟通管理")
@RestController("com.yxt.anrui.scm.biz.scminteract.ScmInteractRest")
@RequestMapping("v1/scminteract")
@RestController
@RequestMapping("v1/manufactorInteract")
public class ScmInteractRest implements ScmInteractFeign {
@Autowired
private ScmInteractService scmInteractService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmInteractVo>> listPage(@RequestBody PagerQuery<ScmInteractQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmInteractVo> pv = scmInteractService.listPageVo(pq);
@ -72,8 +70,6 @@ public class ScmInteractRest implements ScmInteractFeign {
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmInteractDto dto){
ResultBean rb = ResultBean.fireFail();
scmInteractService.saveOrUpdateDto(dto);
@ -81,17 +77,13 @@ public class ScmInteractRest implements ScmInteractFeign {
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmInteractService.delBySids(sids);
scmInteractService.updateIsDel(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmInteractDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmInteractDetailsVo vo = scmInteractService.fetchDetailsVoBySid(sid);

114
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractService.java
View File

@ -28,6 +28,13 @@ package com.yxt.anrui.scm.biz.scminteract;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.scm.api.scmactivity.ScmActivityVo;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,8 +48,10 @@ import com.yxt.anrui.scm.api.scminteract.ScmInteractDetailsVo;
import com.yxt.anrui.scm.api.scminteract.ScmInteractDto;
import com.yxt.anrui.scm.api.scminteract.ScmInteractFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -60,16 +69,69 @@ import java.util.List;
*/
@Service
public class ScmInteractService extends MybatisBaseService<ScmInteractMapper, ScmInteract> {
private QueryWrapper<ScmInteract> createQueryWrapper(ScmInteractQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmInteract> qw = new QueryWrapper<>();
return qw;
}
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private ScmFileService scmFileService;
public PagerVo<ScmInteractVo> listPageVo(PagerQuery<ScmInteractQuery> pq) {
ScmInteractQuery query = pq.getParams();
QueryWrapper<ScmInteract> qw = createQueryWrapper(query);
QueryWrapper<ScmInteract> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
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("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("si.createBySid", query.getUserSid());
} else {
PagerVo<ScmInteractVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmInteractVo> p = new PagerVo<>();
return p;
}
}
qw.eq("si.isDelete", 0);
if (StringUtils.isNotBlank(query.getOrgName())) {
qw.like("si.createOrgName", query.getOrgName());
}
if (StringUtils.isNotBlank(query.getManufactorName())) {
qw.like("si.manufactorName", query.getManufactorName());
}
String interactDateStart = query.getInteractDateStartDate();
String interactDateEnd = query.getInteractDateEndDate();
qw.apply(StringUtils.isNotEmpty(interactDateStart), "date_format (si.interactDate,'%Y-%m-%d') >= date_format('" + interactDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(interactDateEnd), "date_format (si.interactDate,'%Y-%m-%d') <= date_format('" + interactDateEnd + "','%Y-%m-%d')"
);
IPage<ScmInteract> page = PagerUtil.queryToPage(pq);
IPage<ScmInteractVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmInteractVo> p = PagerUtil.pageToVo(pagging, null);
@ -78,17 +140,34 @@ public class ScmInteractService extends MybatisBaseService<ScmInteractMapper, Sc
public void saveOrUpdateDto(ScmInteractDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
List<String> urls = dto.getUrls();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (String url : urls) {
String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setLinkSid(sid);
scmFile.setFilePath(filePath);
scmFileService.save(scmFile);
}
return;
}
this.updateByDto(dto);
scmFileService.delByMainSid(dtoSid);
for (String url : urls) {
String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setLinkSid(dtoSid);
scmFile.setFilePath(filePath);
scmFileService.save(scmFile);
}
}
public void insertByDto(ScmInteractDto dto){
public String insertByDto(ScmInteractDto dto){
ScmInteract entity = new ScmInteract();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(ScmInteractDto dto){
@ -105,6 +184,19 @@ public class ScmInteractService extends MybatisBaseService<ScmInteractMapper, Sc
ScmInteract entity = fetchBySid(sid);
ScmInteractDetailsVo vo = new ScmInteractDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<String> urls = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
String url = fileUploadComponent.getUrlPrefix() + scmFileVo.getFilePath();
urls.add(url);
}
vo.setUrls(urls);
return vo;
}
public void updateIsDel(String[] sids) {
for (String sid : sids) {
baseMapper.updateIsDel(sid);
}
}
}

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

@ -501,7 +501,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(businessSid);
for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) {
WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto();
wmsAnsBillDetailDto.setGoodsSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodSpuSid());
wmsAnsBillDetailDto.setGoodsSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodsSpuSid());
wmsAnsBillDetailDto.setGoodsSpuName(pmsPurchaseBillDetailDetailsVo.getGoodsSpuName());
wmsAnsBillDetailDto.setGoodsSkuSid(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid());
wmsAnsBillDetailDto.setGoodsSkuTitle(pmsPurchaseBillDetailDetailsVo.getGoodsSkuTitle());

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
View File

@ -58,7 +58,7 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo {
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid; // 商品基础信息Sid
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")
private String goodsSpuName; // 商品名称
@ApiModelProperty("商品Skusid")

Write Preview
Loading…
Cancel
Save