|
|
|
|
@ -1,40 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package jnpf.receiptout.controller;
|
|
|
|
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.receiptout.entity.ReceiptoutEntity;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
import jnpf.receiptout.model.receiptout.*;
|
|
|
|
|
import jnpf.receiptout.service.ReceiptoutService;
|
|
|
|
|
import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
|
|
|
|
|
import jnpf.receiptout.entity.*;
|
|
|
|
|
import jnpf.receiptout.entity.Receiptout_item0Entity;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import jnpf.base.util.*;
|
|
|
|
|
import jnpf.base.vo.ListVO;
|
|
|
|
|
import jnpf.util.context.SpringContext;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
import jnpf.receiptout.entity.ReceiptoutEntity;
|
|
|
|
|
import jnpf.receiptout.service.ReceiptoutService;
|
|
|
|
|
import jnpf.receiptout.entity.Receiptout_item0Entity;
|
|
|
|
|
import jnpf.receiptout.service.Receiptout_item0Service;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.io.FileNotFoundException;
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
@ -42,7 +55,7 @@ import java.util.Map;
|
|
|
|
|
* @版本： V3.2.0
|
|
|
|
|
* @版权： LINKAGE-BOOT
|
|
|
|
|
* @作者： LINKAGE-BOOT研发团队
|
|
|
|
|
* @日期： 2023-01-12
|
|
|
|
|
* @日期： 2023-02-08
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RestController
|
|
|
|
|
@ -62,6 +75,8 @@ public class ReceiptoutController {
|
|
|
|
|
@Autowired
|
|
|
|
|
private ReceiptoutService receiptoutService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private Receiptout_item0Service receiptout_item0Service;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -76,15 +91,10 @@ public class ReceiptoutController {
|
|
|
|
|
List<ReceiptoutEntity> list= receiptoutService.getList(receiptoutPagination);
|
|
|
|
|
//处理id字段转名称，若无需转或者为空可删除
|
|
|
|
|
for(ReceiptoutEntity entity:list){
|
|
|
|
|
Map<String,Object> sourceNoMap = new HashMap<>();
|
|
|
|
|
entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
|
|
|
|
|
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
|
|
|
|
|
}
|
|
|
|
|
List<ReceiptoutListVO> listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class);
|
|
|
|
|
for(ReceiptoutListVO receiptoutVO:listVO){
|
|
|
|
|
@ -110,16 +120,31 @@ public class ReceiptoutController {
|
|
|
|
|
public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException {
|
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
|
|
|
|
|
receiptoutCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
receiptoutCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
receiptoutCrForm.setCreatorUserId(userInfo.getUserId());
|
|
|
|
|
receiptoutCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId());
|
|
|
|
|
if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){
|
|
|
|
|
receiptoutCrForm.setDepartmentId(userInfo.getPositionIds()[0]);
|
|
|
|
|
}
|
|
|
|
|
ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
receiptoutService.save(entity);
|
|
|
|
|
List<Receiptout_item0Entity> Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class);
|
|
|
|
|
for(Receiptout_item0Entity entitys : Receiptout_item0List){
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setReceiptinId(entity.getId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
receiptout_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
@ -160,15 +185,10 @@ public class ReceiptoutController {
|
|
|
|
|
List<ReceiptoutEntity> list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType());
|
|
|
|
|
//处理id字段转名称，若无需转或者为空可删除
|
|
|
|
|
for(ReceiptoutEntity entity:list){
|
|
|
|
|
Map<String,Object> sourceNoMap = new HashMap<>();
|
|
|
|
|
entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
|
|
|
|
|
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
|
|
|
|
|
}
|
|
|
|
|
List<ReceiptoutListVO> listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class);
|
|
|
|
|
for(ReceiptoutListVO receiptoutVO:listVO){
|
|
|
|
|
@ -191,30 +211,30 @@ public class ReceiptoutController {
|
|
|
|
|
case "documentNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
|
|
|
|
|
break;
|
|
|
|
|
case "customerName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
|
|
|
|
|
case "type" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
|
|
|
|
|
break;
|
|
|
|
|
case "sourceNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo"));
|
|
|
|
|
break;
|
|
|
|
|
case "amount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库金额" ,"amount"));
|
|
|
|
|
break;
|
|
|
|
|
case "num" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库数量" ,"num"));
|
|
|
|
|
break;
|
|
|
|
|
case "currency" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("币别" ,"currency"));
|
|
|
|
|
break;
|
|
|
|
|
case "issueDate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库日期" ,"issueDate"));
|
|
|
|
|
break;
|
|
|
|
|
case "sourceNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo"));
|
|
|
|
|
case "num" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库数量" ,"num"));
|
|
|
|
|
break;
|
|
|
|
|
case "type" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
|
|
|
|
|
case "customerName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
|
|
|
|
|
break;
|
|
|
|
|
case "remark" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("备注" ,"remark"));
|
|
|
|
|
break;
|
|
|
|
|
case "issueDate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库日期" ,"issueDate"));
|
|
|
|
|
break;
|
|
|
|
|
case "status" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据状态" ,"status"));
|
|
|
|
|
break;
|
|
|
|
|
@ -222,25 +242,13 @@ public class ReceiptoutController {
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorUserId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建人id" ,"creatorUserId"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyUserId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人id" ,"lastModifyUserId"));
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建人名称" ,"creatorUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyTime" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
|
|
|
|
|
break;
|
|
|
|
|
case "orgnizeId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("组织id" ,"orgnizeId"));
|
|
|
|
|
break;
|
|
|
|
|
case "departmentId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("部门id" ,"departmentId"));
|
|
|
|
|
case "lastModifyUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
@ -309,19 +317,16 @@ public class ReceiptoutController {
|
|
|
|
|
vo.setCreatorTime(vo.getCreatorTime());
|
|
|
|
|
}
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
|
|
|
|
|
if(vo.getLastModifyTime()!=null){
|
|
|
|
|
vo.setLastModifyTime(vo.getLastModifyTime());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
|
|
|
|
|
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
|
|
|
|
|
//子表
|
|
|
|
|
List<Receiptout_item0Entity> Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
|
|
|
|
|
for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class ));
|
|
|
|
|
//副表
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
@ -338,19 +343,23 @@ public class ReceiptoutController {
|
|
|
|
|
ReceiptoutInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptoutInfoVO.class);
|
|
|
|
|
|
|
|
|
|
//子表数据转换
|
|
|
|
|
List<Receiptout_item0Entity> jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
|
|
|
|
|
List<Receiptout_item0Model> jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class);
|
|
|
|
|
for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){
|
|
|
|
|
Map<String,Object> licenseNoMap = new HashMap<>();
|
|
|
|
|
jg_receiptout_item0Model.setLicenseNo(generaterSwapUtil.getPopupSelectValue("392933248017164229","license_no","license_no",jg_receiptout_item0Model.getLicenseNo(),licenseNoMap));
|
|
|
|
|
Map<String,Object> reservoirareaIdMap = new HashMap<>();
|
|
|
|
|
jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptout_item0List(jg_receiptout_item0ModelList);
|
|
|
|
|
|
|
|
|
|
//附表数据转换
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
Map<String,Object> sourceNoMap = new HashMap<>();
|
|
|
|
|
vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",vo.getSourceNo(),sourceNoMap));
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
|
|
|
|
|
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
|
|
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
@ -370,16 +379,36 @@ public class ReceiptoutController {
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
ReceiptoutEntity entity= receiptoutService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
receiptoutUpForm.setLastModifyUserName(userInfo.getUserId());
|
|
|
|
|
receiptoutUpForm.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
|
receiptoutUpForm.setLastModifyTime(DateUtil.getNow());
|
|
|
|
|
receiptoutUpForm.setOrgnizeId(entity.getOrgnizeId());
|
|
|
|
|
receiptoutUpForm.setDepartmentId(entity.getDepartmentId());
|
|
|
|
|
receiptoutUpForm.setLastModifyUserName(userInfo.getUserId());
|
|
|
|
|
ReceiptoutEntity subentity=JsonUtil.getJsonToBean(receiptoutUpForm, ReceiptoutEntity.class);
|
|
|
|
|
subentity.setCreatorTime(entity.getCreatorTime());
|
|
|
|
|
subentity.setCreatorUserName(entity.getCreatorUserName());
|
|
|
|
|
subentity.setCreatorUserId(entity.getCreatorUserId());
|
|
|
|
|
receiptoutService.update(id, subentity);
|
|
|
|
|
|
|
|
|
|
QueryWrapper<Receiptout_item0Entity> Receiptout_item0queryWrapper = new QueryWrapper<>();
|
|
|
|
|
Receiptout_item0queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, entity.getId());
|
|
|
|
|
receiptout_item0Service.remove(Receiptout_item0queryWrapper);
|
|
|
|
|
|
|
|
|
|
List<Receiptout_item0Entity> Receiptout_item0List = JsonUtil.getJsonToList(receiptoutUpForm.getReceiptout_item0List(),Receiptout_item0Entity.class);
|
|
|
|
|
for(Receiptout_item0Entity entitys : Receiptout_item0List){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setReceiptinId(entity.getId());
|
|
|
|
|
receiptout_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("更新失败，数据不存在");
|
|
|
|
|
@ -400,6 +429,9 @@ public class ReceiptoutController {
|
|
|
|
|
ReceiptoutEntity entity= receiptoutService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
receiptoutService.delete(entity);
|
|
|
|
|
QueryWrapper<Receiptout_item0Entity> queryWrapperReceiptout_item0=new QueryWrapper<>();
|
|
|
|
|
queryWrapperReceiptout_item0.lambda().eq(Receiptout_item0Entity::getReceiptinId,entity.getId());
|
|
|
|
|
receiptout_item0Service.remove(queryWrapperReceiptout_item0);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|
|
chuang
2 years ago