yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 262e807292 5df3314204
commit ebff60e8e8
9 changed files with 197 additions and 8 deletions
Show Stats Download Patch File Download Diff File

49
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/controller/MaterialController.java
Unescape View File

@ -19,11 +19,15 @@ import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.entity.MaterialVoMobileEntity;
import jnpf.materialvo.model.material.*;
import jnpf.materialvo.service.MaterialService;
import jnpf.reservoirarea.entity.ReservoirareaEntity;
import jnpf.reservoirarea.service.ReservoirareaService;
import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.UploadUtil;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
@ -64,6 +68,9 @@ public class MaterialController {
@Autowired
private MaterialService materialService;
@Autowired
private ReservoirareaService reservoirareaService;
@ -78,10 +85,22 @@ public class MaterialController {
List<MaterialVoMobileEntity> list= materialService.getList(materialPagination);
//处理id字段转名称，若无需转或者为空可删除
for(MaterialVoMobileEntity entity:list){
Map<String,Object> outAreaMap = new HashMap<>();
entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
Map<String,Object> inAreaMap = new HashMap<>();
entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
if(StringUtils.isNotEmpty(entity.getInArea())){
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getInArea());
if (ObjectUtils.isNotEmpty(reservoirareaEntity) && StringUtils.isNotEmpty(reservoirareaEntity.getAreaname())){
entity.setInArea(reservoirareaEntity.getAreaname());
}
}
if(StringUtils.isNotEmpty(entity.getOutArea())){
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getOutArea());
if (ObjectUtils.isNotEmpty(reservoirareaEntity) && StringUtils.isNotEmpty(reservoirareaEntity.getAreaname())){
entity.setOutArea(reservoirareaEntity.getAreaname());
}
}
// Map<String,Object> outAreaMap = new HashMap<>();
// entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
// Map<String,Object> inAreaMap = new HashMap<>();
// entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
}
List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
for(MaterialListVO materialVO:listVO){
@ -95,6 +114,28 @@ public class MaterialController {
return ActionResult.success(vo);
}
/**
* PC列表
*
* @param materialPagination
* @return
*/
@PostMapping("/getListPC")
public ActionResult listPC(@RequestBody MaterialPagination materialPagination)throws IOException{
List<MaterialEntity> list= materialService.getList2(materialPagination);
//处理id字段转名称，若无需转或者为空可删除
for(MaterialEntity entity:list){
}
List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
for(MaterialListVO materialVO:listVO){
}
PageListVO vo=new PageListVO();
vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(materialPagination,PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建

9
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/mapper/MaterialMapper.java
Unescape View File

@ -4,8 +4,12 @@ package jnpf.materialvo.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.entity.MaterialVoMobileEntity;
import jnpf.materialvo.model.material.MaterialPagination;
import jnpf.receiptout.entity.ReceiptoutEntity;
import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
import org.apache.ibatis.annotations.Param;
/**
@ -23,7 +27,8 @@ public interface MaterialMapper extends BaseMapper<MaterialEntity> {
* @param queryWrapper 条件映射
* @return 派工单信息
*/
IPage<MaterialVoMobileEntity> getMaterialMobileList(@Param("page") IPage<MaterialVoMobileEntity> page,
@Param("ew") Wrapper<MaterialEntity> queryWrapper);
IPage<MaterialVoMobileEntity> getMaterialMobileList(@Param("page") IPage<MaterialVoMobileEntity> page, @Param("ew") Wrapper<MaterialEntity> queryWrapper);
IPage<MaterialEntity> queryMaterial(@Param("page") Page<MaterialEntity> page, @Param("materialPagination") MaterialPagination materialPagination, @Param("ew") Wrapper<MaterialEntity> queryWrapper);
}

6
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/model/material/MaterialPagination.java
Unescape View File

@ -21,6 +21,12 @@ public class MaterialPagination extends Pagination {
/** 物料名称 */
private String itemName;
/**
* 添加权限
*/
private String departmentId;
private String orgnizeId;
/**
* 菜单id
*/

2
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/MaterialService.java
Unescape View File

@ -27,6 +27,8 @@ public interface MaterialService extends IService<MaterialEntity> {
List<MaterialVoMobileEntity> getList(MaterialPagination materialPagination);
List<MaterialEntity> getList2(MaterialPagination materialPagination);
List<MaterialEntity> getTypeList(MaterialPagination materialPagination,String dataType);

88
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
Unescape View File

@ -47,6 +47,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
private MaterialMapper materialMapper;
// @Override
// public IPage<MaterialVoMobileEntity> page(IPage<MaterialVoMobileEntity> page, Wrapper<MaterialEntity> queryWrapper) {
//
@ -131,6 +132,93 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
return materialPagination.setData(list, list.size());
}
}
@Override
public List<MaterialEntity> getList2(MaterialPagination materialPagination) {
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
int total=0;
int materialNum =0;
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
materialQueryWrapper.eq("a.delete_mark", "0");
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
materialQueryWrapper = (QueryWrapper<MaterialEntity>)materialObj;
materialNum++;
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
materialQueryWrapper = (QueryWrapper<MaterialEntity>)materialObj;
materialNum++;
}
}
}
/*
if(StringUtil.isNotEmpty(materialPagination.getItemCode())){
materialNum++;
materialQueryWrapper.lambda().like(MaterialEntity::getItemCode,materialPagination.getItemCode());
}
if(StringUtil.isNotEmpty(materialPagination.getItemName())){
materialNum++;
materialQueryWrapper.lambda().like(MaterialEntity::getItemName,materialPagination.getItemName());
}
*/
if(AllIdList.size()>0){
materialQueryWrapper.lambda().in(MaterialEntity::getId, AllIdList);
}
//排序
/* if(StringUtil.isEmpty(materialPagination.getSidx())){
materialQueryWrapper.lambda().orderByDesc(MaterialEntity::getCreatorTime);
}else{
try {
String sidx = materialPagination.getSidx();
MaterialVoMobileEntity materialEntity = new MaterialVoMobileEntity();
Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}
}*/
if(StringUtil.isEmpty(materialPagination.getSidx())){
materialPagination.setSidx("CREATOR_TIME");
materialPagination.setSort("DESC");
}else{
try {
String sidx = materialPagination.getSidx();
MaterialVoMobileEntity materialEntity = new MaterialVoMobileEntity();
Field declaredField = materialEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
materialPagination.setSidx(value);
// materialQueryWrapper="asc".equals(materialPagination.getSort().toLowerCase())?materialQueryWrapper.orderByAsc(value):materialQueryWrapper.orderByDesc(value);
} catch (Exception e) {
e.printStackTrace();
}
}
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
IPage<MaterialEntity> userIPage= materialMapper.queryMaterial(page,materialPagination, materialQueryWrapper);
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override
public List<MaterialEntity> getTypeList(MaterialPagination materialPagination,String dataType){
String userId=userProvider.get().getUserId();

23
SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml
Unescape View File

@ -107,5 +107,28 @@
<result column="salesWeight" property="salesWeight"/>
</resultMap>
<select id="queryMaterial" resultType="jnpf.materialvo.entity.MaterialEntity">
SELECT
a.*,
b.areaname inAreaName,
c.areaname outAreaName
FROM
jg_material a
LEFT JOIN jg_reservoirarea b ON a.in_area = b.id
AND b.delete_mark = 0
LEFT JOIN jg_reservoirarea c ON a.out_area = c.id
AND c.delete_mark = 0
${ew.customSqlSegment}
<if test="materialPagination.itemCode != null and materialPagination.itemCode != ''">
and a.item_code LIKE CONCAT('%',#{materialPagination.itemCode},'%')
</if>
<if test="materialPagination.itemName != null and materialPagination.itemName != ''">
and a.item_name LIKE CONCAT('%',#{materialPagination.itemName},'%')
</if>
<if test="materialPagination.sidx != null and materialPagination.sidx != ''">
ORDER BY ${materialPagination.sidx} ${materialPagination.sort}
</if>
</select>
</mapper>

14
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -437,6 +437,15 @@
}else if(column.taxRate == '0'){
column.taxRate = '5';
}
if (column.invoiceStatus == null){
column.invoiceStatus = '0';
}else if(column.invoiceStatus == '正常'){
column.invoiceStatus = '0';
}else if (column.invoiceStatus == '红冲'){
column.invoiceStatus = '1';
}else if (column.invoiceStatus == '作废'){
column.invoiceStatus = '2';
}
this.dataForm.arinvoices_item0List.push(column);
});
var invoiceQuantity = 0;
@ -642,7 +651,7 @@
invoiceStatus:'0',
creatorUserName:undefined,
invoiceDate:new Date().getTime(),
attachMent:undefined,
attachMent:[],
}
this.dataForm.arinvoices_item0List.push(item)
},
@ -658,6 +667,9 @@
}
for(let i=0;i<_data.arinvoices_item0List.length;i++){
var _list = _data.arinvoices_item0List[i];
if (_list.attachMent == null){
_list.attachMent = []
}
_list.attachMent = JSON.stringify(_list.attachMent)
}
return _data;

2
SC-web/src/views/scm/basicInformation/material/index.vue
Unescape View File

@ -201,7 +201,7 @@
menuId: this.menuId
}
request({
url: `/api/example/Material/getList`,
url: `/api/example/Material/getListPC`,
method: 'post',
data: _query
}).then(res => {

12
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -421,6 +421,15 @@
}else if(column.taxRate == '0'){
column.taxRate = '5';
}
if (column.invoiceStatus == null){
column.invoiceStatus = '0';
}else if(column.invoiceStatus == '正常'){
column.invoiceStatus = '0';
}else if (column.invoiceStatus == '红冲'){
column.invoiceStatus = '1';
}else if (column.invoiceStatus == '作废'){
column.invoiceStatus = '2';
}
this.dataForm.arinvoices_item0List.push(column);
});
var invoiceQuantity = 0;
@ -692,6 +701,9 @@
}
for(let i=0;i<_data.arinvoices_item0List.length;i++){
var _list = _data.arinvoices_item0List[i];
if (_list.attachMent == null){
_list.attachMent = []
}
_list.attachMent = JSON.stringify(_list.attachMent)
}
return _data;

Write Preview
Loading…
Cancel
Save