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

版本回滚！

Browse Source
product
巴卫 2 years ago
parent cd3088d6da
commit ab5ed5778c
124 changed files with 2115 additions and 2861 deletions
Show Stats Download Patch File Download Diff File

1
SC-boot/linkage-common/src/main/java/jnpf/util/DateUtil.java
Unescape View File

@ -43,7 +43,6 @@ public class DateUtil {
/** /**
* 获取当前时间 * 获取当前时间
* @return
*/ */
public static String getNow() { public static String getNow() {
LocalDateTime ldt1 = LocalDateTime.now(); LocalDateTime ldt1 = LocalDateTime.now();

552
SC-boot/linkage-file/src/main/java/jnpf/controller/DevUtilsCOntroller.java
Unescape View File

@ -1,552 +0,0 @@
package jnpf.controller;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult;
import jnpf.base.NoDataSourceBind;
import jnpf.base.UserInfo;
import jnpf.base.entity.DictionaryDataEntity;
import jnpf.base.service.DictionaryDataService;
import jnpf.base.util.OptimizeUtil;
import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.ListVO;
import jnpf.config.ConfigValueUtil;
import jnpf.constant.MsgCode;
import jnpf.exception.DataException;
import jnpf.model.*;
import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.StorageType;
import jnpf.util.file.UploadUtil;
import jnpf.util.minio.MinioUploadUtil;
import jnpf.utils.YozoUtils;
import lombok.Cleanup;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Author: WangChuang
* @Date: 1/3/2023 下午3:03
* @Description //注释：
* @Version 1.0
*/
@Api(tags = "公共", value = "file")
@RestController
@RequestMapping("/dev/api/file")
class DevUtilsController {
@Autowired
private ConfigValueUtil configValueUtil;
@Autowired
private RedisUtil redisUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private DictionaryDataService dictionaryDataService;
@Autowired
private YozoUtils yozoUtils;
@Autowired
private MinioUploadUtil minioUploadUtil;
/**
* 语言列表
*
* @return
*/
@ApiOperation("语言列表")
@GetMapping("/Language")
public ActionResult<ListVO<LanguageVO>> getList() {
String dictionaryTypeId = "dc6b2542d94b407cac61ec1d59592901";
List<DictionaryDataEntity> list = dictionaryDataService.getList(dictionaryTypeId);
List<LanguageVO> language = JsonUtil.getJsonToList(list, LanguageVO.class);
ListVO vo = new ListVO();
vo.setList(language);
return ActionResult.success(vo);
}
/**
* 图形验证码
*
* @return
*/
@NoDataSourceBind()
@ApiOperation("图形验证码")
@GetMapping("/ImageCode/{timestamp}")
public void imageCode(@PathVariable("timestamp") String timestamp) {
DownUtil.downCode(null);
redisUtil.insert(timestamp, ServletUtil.getSession().getAttribute(CodeUtil.RANDOMCODEKEY), 120);
}
/**
* 上传文件/图片
*
* @return
*/
@NoDataSourceBind()
@ApiOperation("上传文件/图片")
@PostMapping(value = "/Uploader/{type}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public ActionResult uploader(@RequestPart("file") MultipartFile file, @PathVariable("type") String type) throws IOException {
String fileType = UpUtil.getFileType(file);
//验证类型
if (!OptimizeUtil.fileType(configValueUtil.getAllowUploadFileType(), fileType)) {
return ActionResult.fail(MsgCode.FA017.get());
}
UploaderVO vo = uploaderVO(file, type);
return ActionResult.success(vo);
}
/**
* 获取下载文件链接
*
* @return
*/
@NoDataSourceBind()
@ApiOperation("获取下载文件链接")
@GetMapping("/Download/{type}/{fileName}")
public ActionResult<DownloadVO> downloadUrl(@PathVariable("type") String type, @PathVariable("fileName") String fileName) {
type = XSSEscape.escape(type);
fileName = XSSEscape.escape(fileName);
UserInfo userInfo = userProvider.get();
if (!configValueUtil.getFileType().equals(StorageType.STORAGE)) {
DownloadVO vo = DownloadVO.builder().name(fileName).url(UploaderUtil.uploaderFile(userInfo.getId() + "#" + fileName + "#" + type)).build();
return ActionResult.success(vo);
}
String filePath = FilePathUtil.getFilePath(type) + fileName;
if (FileUtil.fileIsFile(filePath)) {
DownloadVO vo = DownloadVO.builder().name(fileName).url(UploaderUtil.uploaderFile(userInfo.getId() + "#" + fileName + "#" + type)).build();
return ActionResult.success(vo);
}
return ActionResult.fail(MsgCode.FA018.get());
}
/**
* 下载文件链接
*
* @return
*/
@NoDataSourceBind()
@ApiOperation("下载文件链接")
@GetMapping("/Download")
public void downloadFile() throws DataException {
HttpServletRequest request = ServletUtil.getRequest();
String reqJson = request.getParameter("encryption");
String name = request.getParameter("name");
String fileNameAll = DesUtil.aesDecode(reqJson);
if (!StringUtil.isEmpty(fileNameAll)) {
String[] data = fileNameAll.split("#");
String token = data.length > 0 ? data[0] : "";
//验证token
if (redisUtil.exists(token)) {
String fileName = data.length > 1 ? data[1] : "";
String type = data.length > 2 ? data[2] : "";
String filePath = FilePathUtil.getFilePath(type.toLowerCase());
//下载文件
UploadUtil.downFile(configValueUtil.getFileType(), fileName, type, filePath, name);
} else {
throw new DataException("token验证失败");
}
}
}
/**
* 下载文件链接
*
* @return
*/
@NoDataSourceBind()
@ApiOperation("下载模板文件链接")
@GetMapping("/DownloadModel")
public void downloadModel() throws DataException {
HttpServletRequest request = ServletUtil.getRequest();
String reqJson = request.getParameter("encryption");
String fileNameAll = DesUtil.aesDecode(reqJson);
if (!StringUtil.isEmpty(fileNameAll)) {
String token = fileNameAll.split("#")[0];
if (redisUtil.exists(token)) {
String fileName = fileNameAll.split("#")[1];
String filePath = configValueUtil.getTemplateFilePath();
//下载文件
UploadUtil.downFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPLATEFILE, filePath, null);
}
}
}
/**
* 获取图片
*
* @param fileName
* @param type
* @return
*/
@NoDataSourceBind()
@ApiOperation("获取图片")
@GetMapping("/Image/{type}/{fileName}")
public void downLoadImg(@PathVariable("type") String type, @PathVariable("fileName") String fileName) {
String filePath = FilePathUtil.getFilePath(type.toLowerCase());
if (FileTypeEnum.IM.equalsIgnoreCase(type)) {
type = "imfile";
} else if (FileTypeEnum.ANNEX.equalsIgnoreCase(type)) {
type = FileTypeEnum.ANNEXPIC;
}
//下载文件
UploadUtil.writeImage(configValueUtil.getFileType(), fileName, type.toLowerCase(), filePath);
}
/**
* 获取IM聊天图片
* 注意 后缀名前端故意把 .替换@
*
* @param fileName
* @return
*/
@NoDataSourceBind()
@ApiOperation("获取IM聊天图片")
@GetMapping("/IMImage/{fileName}")
public void imImage(@PathVariable("fileName") String fileName) {
//下载文件
UploadUtil.downFile(configValueUtil.getFileType(), fileName, "imfile", FilePathUtil.getFilePath(FileTypeEnum.IM) + fileName, null);
}
/**
* 查看图片
*
* @param type 哪个文件夹
* @param fileName 文件名称
* @return
*/
@NoDataSourceBind()
@ApiOperation("查看图片")
@GetMapping("/{type}/{fileName}")
public void img(@PathVariable("type") String type, @PathVariable("fileName") String fileName) {
String filePath = configValueUtil.getBiVisualPath() + type + File.separator;
if (StorageType.MINIO.equals(configValueUtil.getFileType())) {
fileName = "/" + type + "/" + fileName;
filePath = configValueUtil.getBiVisualPath().substring(0, configValueUtil.getBiVisualPath().length() - 1);
}
//下载文件
UploadUtil.downFile(configValueUtil.getFileType(), fileName, FileTypeEnum.BIVISUALPATH, filePath, null);
}
/**
* 获取IM聊天语音
* 注意 后缀名前端故意把 .替换@
*
* @param fileName
* @return
*/
@NoDataSourceBind()
@ApiOperation("获取IM聊天语音")
@GetMapping("/IMVoice/{fileName}")
public void imVoice(@PathVariable("fileName") String fileName) {
String paths = FilePathUtil.getFilePath(FileTypeEnum.IM) + fileName.replaceAll("@", ".");
UploadUtil.downFile(configValueUtil.getFileType(), fileName, "imfile", paths, null);
}
/**
* app启动获取信息
*
* @param appName
* @return
*/
@NoDataSourceBind()
@ApiOperation("app启动获取信息")
@GetMapping("/AppStartInfo/{appName}")
public ActionResult getAppStartInfo(@PathVariable("appName") String appName) {
appName = XSSEscape.escape(appName);
JSONObject object = new JSONObject();
object.put("AppVersion", configValueUtil.getAppVersion());
object.put("AppUpdateContent", configValueUtil.getAppUpdateContent());
return ActionResult.success(object);
}
//----------大屏图片下载---------
@NoDataSourceBind()
@ApiOperation("获取图片")
@GetMapping("/VisusalImg/{type}/{fileName}")
public void downVisusalImg(@PathVariable("type") String type, @PathVariable("fileName") String fileName) {
type = XSSEscape.escape(type);
fileName = XSSEscape.escape(fileName);
String filePath = FilePathUtil.getFilePath(FileTypeEnum.BIVISUALPATH) + type + File.separator;
if (StorageType.MINIO.equals(configValueUtil.getFileType())) {
fileName = "/" + type + "/" + fileName;
}
UploadUtil.downFile(configValueUtil.getFileType(), fileName, FileTypeEnum.BIVISUALPATH, filePath, null);
}
//----------------------
// @NoDataSourceBind()
// @ApiOperation("预览文件")
// @GetMapping("/Uploader/Preview")
// public ActionResult Preview(PreviewParams previewParams) {
// //读取允许文件预览类型
// String allowPreviewType = configValueUtil.getAllowPreviewFileType();
// String[] fileType = allowPreviewType.split(",");
//
// String fileName = XSSEscape.escape(previewParams.getFileName());
//
// //文件预览类型检验
// String docType = fileName.substring(fileName.lastIndexOf(".") + 1);
// String s = Arrays.asList(fileType).stream().filter(type -> type.equals(docType)).findFirst().orElse(null);
//
// if (StringUtil.isEmpty(s)) {
// return ActionResult.fail("预览失败,请检查文件类型是否规范");
// }
//
// //解析文件url 获取类型
// String type = FileTypeEnum.ANNEX;
//
// String fileNameAll = previewParams.getFileDownloadUrl();
// if (!StringUtil.isEmpty(fileNameAll)) {
// String[] data = fileNameAll.split("/");
// type = data.length > 4 ? data[4] : "";
// }
//
// String url;
// //文件预览策略
// if ("yozo".equals(configValueUtil.getPreviewType())) {
// if (StringUtil.isEmpty(previewParams.getFileVersionId())) {
// return ActionResult.fail("预览失败,请重新上传文件");
// }
//
// String fileVersionId = XSSEscape.escape(previewParams.getFileVersionId());
//
// //获取签名
// Map<String, String[]> parameter = new HashMap<String, String[]>();
// parameter.put("appId", new String[]{YozoParams.APP_ID});
// parameter.put("fileVersionId", new String[]{fileVersionId});
// String sign = yozoUtils.generateSign(YozoParams.APP_ID, YozoParams.APP_KEY, parameter).getData();
// url = "http://eic.yozocloud.cn/api/view/file?fileVersionId="
// + fileVersionId
// + "&appId="
// + YozoParams.APP_ID
// + "&sign="
// + sign;
// } else {
// if ("local".equals(configValueUtil.getFileType())) {
// url = YozoParams.JNPF_DOMAINS + "/api/file/filedownload/" + type + "/" + previewParams.getFileName();
// } else {
// url = minioUploadUtil.getFile(fileName, type);
// }
// //encode编码
// String fileUrl = Base64.encodeBase64String(url.getBytes());
// url = configValueUtil.getKkFileUrl() + "onlinePreview?url=" + fileUrl;
// }
// return ActionResult.success(MsgCode.SU000.get(), url);
// }
@NoDataSourceBind()
@ApiOperation("kk本地文件预览")
@GetMapping("/filedownload/{type}/{fileName}")
public void filedownload(@PathVariable("type") String type, @PathVariable("fileName") String fileName, HttpServletResponse response) {
String filePath = FilePathUtil.getFilePath(type) + fileName;
OutputStream os = null;
if ("local".equals(configValueUtil.getFileType())) {
//本地取对应文件
File file = new File(filePath);
try {
os = response.getOutputStream();
String contentType = Files.probeContentType(Paths.get(file.getAbsolutePath()));
response.setHeader("Content-Type", contentType);
response.setHeader("Content-Dispostion", "attachment;filename=" + new String(file.getName().getBytes("utf-8"), "ISO8859-1"));
FileInputStream fileInputStream = new FileInputStream(file);
WritableByteChannel writableByteChannel = Channels.newChannel(os);
FileChannel channel = fileInputStream.getChannel();
channel.transferTo(0, channel.size(), writableByteChannel);
channel.close();
os.flush();
writableByteChannel.close();
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
if (os != null) {
os.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@NoDataSourceBind()
@ApiOperation("分片上传获取")
@GetMapping("/chunk")
public ActionResult checkChunk(Chunk chunk) {
String type = chunk.getExtension();
if(!OptimizeUtil.fileType(configValueUtil.getAllowUploadFileType(),type)){
return ActionResult.fail(MsgCode.FA017.get());
}
String identifier = chunk.getIdentifier();
String path = FilePathUtil.getFilePath(FileTypeEnum.TEMPORARY);
String filePath = XSSEscape.escapePath(path + identifier);
List<File> chunkFiles = FileUtil.getFile(new File(filePath));
List<Integer> existsChunk = chunkFiles.stream().filter(f->{
if(f.getName().endsWith(".tmp")){
FileUtils.deleteQuietly(f);
return false;
}else{
return true;
}
}).map(f->Integer.parseInt(f.getName().replace(chunk.getIdentifier().concat("-"), ""))).collect(Collectors.toList());
ChunkRes chunkRes = ChunkRes.builder().merge(false).chunkNumbers(existsChunk).build();
return ActionResult.success(chunkRes);
}
@NoDataSourceBind()
@ApiOperation("分片上传附件")
@PostMapping("/chunk")
public ActionResult upload(Chunk chunk, @RequestParam("file") MultipartFile file) {
String type = chunk.getExtension();
if(!OptimizeUtil.fileType(configValueUtil.getAllowUploadFileType(),type)){
return ActionResult.fail(MsgCode.FA017.get());
}
ChunkRes chunkRes = ChunkRes.builder().build();
chunkRes.setMerge(false);
File chunkFile = null;
File chunkTmpFile = null;
try {
String filePath = FilePathUtil.getFilePath(FileTypeEnum.TEMPORARY);
Integer chunkNumber = chunk.getChunkNumber();
String identifier = chunk.getIdentifier();
String chunkTempPath = filePath + identifier;
File path = new File(chunkTempPath);
if (!path.exists()) {
path.mkdirs();
}
String chunkName = identifier.concat("-") + chunkNumber;
String chunkTmpName = chunkName.concat(".tmp");
chunkFile = new File(chunkTempPath, chunkName);
chunkTmpFile = new File(chunkTempPath, chunkTmpName);
if (chunkFile.exists() && chunkFile.length() == chunk.getCurrentChunkSize()) {
System.out.println("该分块已经上传：" + chunkFile.getName());
} else {
@Cleanup InputStream inputStream = file.getInputStream();
FileUtils.copyInputStreamToFile(inputStream, chunkTmpFile);
chunkTmpFile.renameTo(chunkFile);
}
chunkRes.setMerge(chunk.getChunkNumber().equals(chunk.getTotalChunks()));
} catch (Exception e) {
try{
FileUtils.deleteQuietly(chunkTmpFile);
FileUtils.deleteQuietly(chunkFile);
}catch (Exception ee){
e.printStackTrace();
}
System.out.println("上传异常：" + e);
return ActionResult.fail("上传异常");
}
return ActionResult.success(chunkRes);
}
@NoDataSourceBind()
@ApiOperation("分片组装")
@PostMapping("/merge")
public ActionResult merge(MergeChunkDto mergeChunkDto) {
String identifier = mergeChunkDto.getIdentifier();
String path = FilePathUtil.getFilePath(FileTypeEnum.TEMPORARY);
String filePath = XSSEscape.escapePath(path + identifier);
String uuid = RandomUtil.uuId();
String partFile = XSSEscape.escapePath(path + uuid + "." + mergeChunkDto.getExtension());
UploaderVO vo = UploaderVO.builder().build();
try {
List<File> mergeFileList = FileUtil.getFile(new File(filePath));
@Cleanup FileOutputStream destTempfos = new FileOutputStream(partFile, true);
for (int i = 0; i < mergeFileList.size(); i++) {
String chunkName = identifier.concat("-") + (i + 1);
File files = new File(filePath, chunkName);
if (files.exists()) {
FileUtils.copyFile(files, destTempfos);
}
}
File partFiles = new File(partFile);
if (partFiles.exists()) {
MultipartFile multipartFile = FileUtil.createFileItem(partFiles);
String type = mergeChunkDto.getType();
vo = uploaderVO(multipartFile, type);
FileUtil.deleteTmp(multipartFile);
}
} catch (Exception e) {
System.out.println("合并分片失败:" + e);
}finally {
FileUtils.deleteQuietly(new File(filePath));
FileUtils.deleteQuietly(new File(partFile));
}
return ActionResult.success(vo);
}
/**
* 封装上传附件
*
* @param file
* @param type
* @return
* @throws IOException
*/
private UploaderVO uploaderVO(MultipartFile file, String type) throws IOException {
String orgFileName = file.getOriginalFilename();
String fileType = UpUtil.getFileType(file);
// if (OptimizeUtil.fileSize(file.getSize(), 1024000)) {
// return ActionResult.fail("上传失败，文件大小超过1M");
// }
String fileName = DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + "." + fileType;
if (type.equals(FileTypeEnum.MAIL)) {
type = FileTypeEnum.TEMPORARY;
}
String filePath = FilePathUtil.getFilePath(type.toLowerCase());
UploaderVO vo = UploaderVO.builder().name(fileName).build();
//上传文件
UploadUtil.uploadFile(configValueUtil.getFileType(), type, fileName, file, filePath);
if (type.equalsIgnoreCase(FileTypeEnum.USERAVATAR)) {
vo.setUrl(UploaderUtil.uploaderImg(fileName));
} else if (type.equalsIgnoreCase(FileTypeEnum.ANNEX)) {
// UserInfo userInfo = userProvider.get();
// vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + fileName + "#" + type));
vo.setUrl(UploaderUtil.uploaderImg("/api/file/Image/annex/", fileName));
} else if (type.equalsIgnoreCase(FileTypeEnum.ANNEXPIC)) {
vo.setUrl(UploaderUtil.uploaderImg("/api/file/Image/annex/", fileName));
}else {
vo.setUrl(UploaderUtil.uploaderImg("/api/file/Image/"+type.toLowerCase()+"/", fileName));
}
//上传到永中
if ("yozo".equals(configValueUtil.getAllowPreviewFileType())) {
try {
@Cleanup InputStream inputStream = file.getInputStream();
String s = yozoUtils.uploadFileInPreview(inputStream, orgFileName);
Map<String, Object> map = JsonUtil.stringToMap(s);
if ("操作成功".equals(map.get("message"))) {
Map<String, Object> dataMap = JsonUtil.stringToMap(String.valueOf(map.get("data")));
String verId = String.valueOf(dataMap.get("fileVersionId"));
vo.setFileVersionId(verId);
}
} catch (Exception e) {
System.out.println("上传到永中失败");
e.printStackTrace();
}
}
return vo;
}
}

123
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
Unescape View File

@ -15,14 +15,17 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.service.SaleorderitemService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.arinvoices.model.arinvoices.*; import jnpf.arinvoices.model.arinvoices.*;
import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination; import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination;
import jnpf.arinvoices.entity.Arinvoices_item1Entity; import jnpf.arinvoices.entity.*;
import jnpf.arinvoices.entity.Arinvoices_item0Entity; import jnpf.arinvoices.entity.Arinvoices_item0Entity;
import jnpf.util.*; import jnpf.util.*;
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.extern.slf4j.Slf4j;
import lombok.Cleanup; import lombok.Cleanup;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -31,12 +34,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.arinvoices.service.ArinvoicesService; import jnpf.arinvoices.service.ArinvoicesService;
import jnpf.arinvoices.service.Arinvoices_item1Service; import jnpf.arinvoices.entity.Arinvoices_item0Entity;
import jnpf.arinvoices.service.Arinvoices_item0Service; import jnpf.arinvoices.service.Arinvoices_item0Service;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
@ -51,7 +55,7 @@ import jnpf.util.enums.FileTypeEnum;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -71,12 +75,8 @@ public class ArinvoicesController {
@Autowired @Autowired
private ArinvoicesService arinvoicesService; private ArinvoicesService arinvoicesService;
@Autowired
private Arinvoices_item1Service arinvoices_item1Service;
@Autowired @Autowired
private Arinvoices_item0Service arinvoices_item0Service; private Arinvoices_item0Service arinvoices_item0Service;
@Autowired
private SaleorderitemService saleorderitemService;
@ -91,12 +91,6 @@ public class ArinvoicesController {
List<ArinvoicesEntity> list= arinvoicesService.getList(arinvoicesPagination); List<ArinvoicesEntity> list= arinvoicesService.getList(arinvoicesPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ArinvoicesEntity entity:list){ for(ArinvoicesEntity entity:list){
Map<String,Object> salesOrderIdMap = new HashMap<>();
entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
} }
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){ for(ArinvoicesListVO arinvoicesVO:listVO){
@ -122,23 +116,19 @@ public class ArinvoicesController {
public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException { public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class); ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class);
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId());
saleorderitemEntity.setStatus("2");
saleorderitemService.updateById(saleorderitemEntity);
entity.setId(mainId); entity.setId(mainId);
arinvoicesService.save(entity); arinvoicesService.save(entity);
List<Arinvoices_item1Entity> Arinvoices_item1List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item1List(),Arinvoices_item1Entity.class);
for(Arinvoices_item1Entity entitys : Arinvoices_item1List){
entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId());
arinvoices_item1Service.save(entitys);
}
List<Arinvoices_item0Entity> Arinvoices_item0List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item0List(),Arinvoices_item0Entity.class); List<Arinvoices_item0Entity> Arinvoices_item0List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item0List(),Arinvoices_item0Entity.class);
for(Arinvoices_item0Entity entitys : Arinvoices_item0List){ for(Arinvoices_item0Entity entitys : Arinvoices_item0List){
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId()); entitys.setArinvoicesId(entity.getId());
arinvoices_item0Service.save(entitys); arinvoices_item0Service.save(entitys);
} }
@ -182,12 +172,6 @@ public class ArinvoicesController {
List<ArinvoicesEntity> list= arinvoicesService.getTypeList(arinvoicesPagination,arinvoicesPaginationExportModel.getDataType()); List<ArinvoicesEntity> list= arinvoicesService.getTypeList(arinvoicesPagination,arinvoicesPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ArinvoicesEntity entity:list){ for(ArinvoicesEntity entity:list){
Map<String,Object> salesOrderIdMap = new HashMap<>();
entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
} }
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class); List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){ for(ArinvoicesListVO arinvoicesVO:listVO){
@ -213,35 +197,44 @@ public class ArinvoicesController {
case "businessDate" : case "businessDate" :
entitys.add(new ExcelExportEntity("业务日期" ,"businessDate")); entitys.add(new ExcelExportEntity("业务日期" ,"businessDate"));
break; break;
case "customerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
break;
case "amount" : case "amount" :
entitys.add(new ExcelExportEntity("金额" ,"amount")); entitys.add(new ExcelExportEntity("金额" ,"amount"));
break; break;
case "quantity" : case "quantity" :
entitys.add(new ExcelExportEntity("数量" ,"quantity")); entitys.add(new ExcelExportEntity("数量" ,"quantity"));
break; break;
case "invoiceQuantity" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceQuantity"));
break;
case "customerTaxNo" :
entitys.add(new ExcelExportEntity("客户税号" ,"customerTaxNo"));
break;
case "customerAddress" :
entitys.add(new ExcelExportEntity("客户地址" ,"customerAddress"));
break;
case "currency" : case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency")); entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break; break;
case "remark" : case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark")); entitys.add(new ExcelExportEntity("备注" ,"remark"));
break; break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
case "invoiceAmount" : case "invoiceAmount" :
entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount")); entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
break; break;
case "invoiceQuantity" : case "salesOrderNo" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceQuantity")); entitys.add(new ExcelExportEntity("销售订单号" ,"salesOrderNo"));
break; break;
case "salesOrderId" : case "contractName" :
entitys.add(new ExcelExportEntity("销售订单号" ,"salesOrderId")); entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break; break;
case "contractId" : case "status" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractId")); entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break; break;
case "customerId" : case "creatorUserName" :
entitys.add(new ExcelExportEntity("客户" ,"customerId")); entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break; break;
default: default:
break; break;
@ -308,10 +301,6 @@ public class ArinvoicesController {
ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class); ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class);
//子表 //子表
List<Arinvoices_item1Entity> Arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id);
for(Arinvoices_item1Entity arinvoices_item1Entity : Arinvoices_item1List){
}
vo.setArinvoices_item1List(JsonUtil.getJsonToList(Arinvoices_item1List,Arinvoices_item1Model.class ));
List<Arinvoices_item0Entity> Arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id); List<Arinvoices_item0Entity> Arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id);
for(Arinvoices_item0Entity arinvoices_item0Entity : Arinvoices_item0List){ for(Arinvoices_item0Entity arinvoices_item0Entity : Arinvoices_item0List){
} }
@ -332,13 +321,6 @@ public class ArinvoicesController {
ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class); ArinvoicesInfoVO vo=JsonUtil.getJsonToBean(entity, ArinvoicesInfoVO.class);
//子表数据转换 //子表数据转换
List<Arinvoices_item1Entity> jg_arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id);
List<Arinvoices_item1Model> jg_arinvoices_item1ModelList = JsonUtil.getJsonToList(jg_arinvoices_item1List,Arinvoices_item1Model.class);
for(Arinvoices_item1Model jg_arinvoices_item1Model : jg_arinvoices_item1ModelList){
Map<String,Object> materialIdMap = new HashMap<>();
jg_arinvoices_item1Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_arinvoices_item1Model.getMaterialId(),materialIdMap));
}
vo.setArinvoices_item1List(jg_arinvoices_item1ModelList);
List<Arinvoices_item0Entity> jg_arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id); List<Arinvoices_item0Entity> jg_arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id);
List<Arinvoices_item0Model> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0Model.class); List<Arinvoices_item0Model> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0Model.class);
for(Arinvoices_item0Model jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){ for(Arinvoices_item0Model jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){
@ -348,12 +330,6 @@ public class ArinvoicesController {
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
Map<String,Object> salesOrderIdMap = new HashMap<>();
vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesOrderId(),salesOrderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
vo.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",vo.getContractId(),contractIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",vo.getCustomerId(),customerIdMap));
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -376,26 +352,6 @@ public class ArinvoicesController {
ArinvoicesEntity subentity=JsonUtil.getJsonToBean(arinvoicesUpForm, ArinvoicesEntity.class); ArinvoicesEntity subentity=JsonUtil.getJsonToBean(arinvoicesUpForm, ArinvoicesEntity.class);
arinvoicesService.update(id, subentity); arinvoicesService.update(id, subentity);
QueryWrapper<Arinvoices_item1Entity> Arinvoices_item1queryWrapper = new QueryWrapper<>();
Arinvoices_item1queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, entity.getId());
arinvoices_item1Service.remove(Arinvoices_item1queryWrapper);
List<Arinvoices_item1Entity> Arinvoices_item1List = JsonUtil.getJsonToList(arinvoicesUpForm.getArinvoices_item1List(),Arinvoices_item1Entity.class);
for(Arinvoices_item1Entity entitys : Arinvoices_item1List){
entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId());
arinvoices_item1Service.save(entitys);
}
QueryWrapper<Arinvoices_item0Entity> Arinvoices_item0queryWrapper = new QueryWrapper<>(); QueryWrapper<Arinvoices_item0Entity> Arinvoices_item0queryWrapper = new QueryWrapper<>();
Arinvoices_item0queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, entity.getId()); Arinvoices_item0queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, entity.getId());
arinvoices_item0Service.remove(Arinvoices_item0queryWrapper); arinvoices_item0Service.remove(Arinvoices_item0queryWrapper);
@ -408,10 +364,6 @@ public class ArinvoicesController {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId()); entitys.setArinvoicesId(entity.getId());
arinvoices_item0Service.save(entitys); arinvoices_item0Service.save(entitys);
@ -437,9 +389,6 @@ public class ArinvoicesController {
ArinvoicesEntity entity= arinvoicesService.getInfo(id); ArinvoicesEntity entity= arinvoicesService.getInfo(id);
if(entity!=null){ if(entity!=null){
arinvoicesService.delete(entity); arinvoicesService.delete(entity);
QueryWrapper<Arinvoices_item1Entity> queryWrapperArinvoices_item1=new QueryWrapper<>();
queryWrapperArinvoices_item1.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,entity.getId());
arinvoices_item1Service.remove(queryWrapperArinvoices_item1);
QueryWrapper<Arinvoices_item0Entity> queryWrapperArinvoices_item0=new QueryWrapper<>(); QueryWrapper<Arinvoices_item0Entity> queryWrapperArinvoices_item0=new QueryWrapper<>();
queryWrapperArinvoices_item0.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,entity.getId()); queryWrapperArinvoices_item0.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,entity.getId());
arinvoices_item0Service.remove(queryWrapperArinvoices_item0); arinvoices_item0Service.remove(queryWrapperArinvoices_item0);

11
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java
Unescape View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
@TableName("jg_arinvoices") @TableName("jg_arinvoices")
@ -110,13 +110,4 @@ public class ArinvoicesEntity {
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@TableField("CUSTOMER_ID")
private String customerId;
@TableField("SALES_ORDER_ID")
private String salesOrderId;
@TableField("CONTRACT_ID")
private String contractId;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java
Unescape View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
@TableName("jg_arinvoices_item0") @TableName("jg_arinvoices_item0")
@ -101,7 +101,4 @@ public class Arinvoices_item0Entity {
@TableField("ARINVOICES_ID") @TableField("ARINVOICES_ID")
private String arinvoicesId; private String arinvoicesId;
@TableField("SALES_ORDER_NO")
private String salesOrderNo;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item1Entity.java
Unescape View File

@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
@TableName("jg_arinvoices_item1") @TableName("jg_arinvoices_item1")
@ -102,7 +102,4 @@ public class Arinvoices_item1Entity {
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@TableField("MATERIAL_ID")
private String materialId;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> { public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item0Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface Arinvoices_item0Mapper extends BaseMapper<Arinvoices_item0Entity> { public interface Arinvoices_item0Mapper extends BaseMapper<Arinvoices_item0Entity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/Arinvoices_item1Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface Arinvoices_item1Mapper extends BaseMapper<Arinvoices_item1Entity> { public interface Arinvoices_item1Mapper extends BaseMapper<Arinvoices_item1Entity> {

56
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesCrForm.java
Unescape View File

@ -2,7 +2,6 @@
package jnpf.arinvoices.model.arinvoices; package jnpf.arinvoices.model.arinvoices;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -16,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesCrForm { public class ArinvoicesCrForm {
@ -27,15 +26,31 @@ public class ArinvoicesCrForm {
/** 业务日期 **/ /** 业务日期 **/
@JsonProperty("businessDate") @JsonProperty("businessDate")
private Long businessDate; private String businessDate;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 金额 **/ /** 金额 **/
@JsonProperty("amount") @JsonProperty("amount")
private Integer amount; private String amount;
/** 数量 **/ /** 数量 **/
@JsonProperty("quantity") @JsonProperty("quantity")
private Integer quantity; private String quantity;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 客户税号 **/
@JsonProperty("customerTaxNo")
private String customerTaxNo;
/** 客户地址 **/
@JsonProperty("customerAddress")
private String customerAddress;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
@ -45,33 +60,26 @@ public class ArinvoicesCrForm {
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 发票金额 **/ /** 发票金额 **/
@JsonProperty("invoiceAmount") @JsonProperty("invoiceAmount")
private Integer invoiceAmount; private String invoiceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private Integer invoiceQuantity;
/** 销售订单号 **/ /** 销售订单号 **/
@JsonProperty("salesOrderId") @JsonProperty("salesOrderNo")
private String salesOrderId; private String salesOrderNo;
/** 合同名称 **/ /** 合同名称 **/
@JsonProperty("contractId") @JsonProperty("contractName")
private String contractId; private String contractName;
/** 客户 **/ /** 单据状态 **/
@JsonProperty("customerId") @JsonProperty("status")
private String customerId; private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("arinvoices_item1List")
private List<Arinvoices_item1Model> arinvoices_item1List;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("arinvoices_item0List") @JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List; private List<Arinvoices_item0Model> arinvoices_item0List;

56
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java
Unescape View File

@ -3,7 +3,6 @@
package jnpf.arinvoices.model.arinvoices; package jnpf.arinvoices.model.arinvoices;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -17,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesInfoVO{ public class ArinvoicesInfoVO{
@ -31,15 +30,31 @@ public class ArinvoicesInfoVO{
/** 业务日期 **/ /** 业务日期 **/
@JsonProperty("businessDate") @JsonProperty("businessDate")
private Long businessDate; private String businessDate;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 金额 **/ /** 金额 **/
@JsonProperty("amount") @JsonProperty("amount")
private Integer amount; private String amount;
/** 数量 **/ /** 数量 **/
@JsonProperty("quantity") @JsonProperty("quantity")
private Integer quantity; private String quantity;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 客户税号 **/
@JsonProperty("customerTaxNo")
private String customerTaxNo;
/** 客户地址 **/
@JsonProperty("customerAddress")
private String customerAddress;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
@ -49,33 +64,26 @@ public class ArinvoicesInfoVO{
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 发票金额 **/ /** 发票金额 **/
@JsonProperty("invoiceAmount") @JsonProperty("invoiceAmount")
private Integer invoiceAmount; private String invoiceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private Integer invoiceQuantity;
/** 销售订单号 **/ /** 销售订单号 **/
@JsonProperty("salesOrderId") @JsonProperty("salesOrderNo")
private String salesOrderId; private String salesOrderNo;
/** 合同名称 **/ /** 合同名称 **/
@JsonProperty("contractId") @JsonProperty("contractName")
private String contractId; private String contractName;
/** 客户 **/ /** 单据状态 **/
@JsonProperty("customerId") @JsonProperty("status")
private String customerId; private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("arinvoices_item1List")
private List<Arinvoices_item1Model> arinvoices_item1List;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("arinvoices_item0List") @JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List; private List<Arinvoices_item0Model> arinvoices_item0List;

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListQuery.java
Unescape View File

@ -10,16 +10,13 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesListQuery extends Pagination { public class ArinvoicesListQuery extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentNo; private String documentNo;
/** 业务日期 */
private List<String> businessDate;
/** /**
* 菜单id * 菜单id
*/ */

60
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java
Unescape View File

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesListVO{ public class ArinvoicesListVO{
@ -30,18 +30,39 @@ public class ArinvoicesListVO{
/** 业务日期 **/ /** 业务日期 **/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonProperty("businessDate") @JsonProperty("businessDate")
private Date businessDate; private String businessDate;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 金额 **/ /** 金额 **/
@JsonProperty("amount") @JsonProperty("amount")
private Integer amount; private String amount;
/** 数量 **/ /** 数量 **/
@JsonProperty("quantity") @JsonProperty("quantity")
private Integer quantity; private String quantity;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 客户税号 **/
@JsonProperty("customerTaxNo")
private String customerTaxNo;
/** 客户地址 **/
@JsonProperty("customerAddress")
private String customerAddress;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
@ -53,32 +74,29 @@ public class ArinvoicesListVO{
private String remark; private String remark;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 发票金额 **/ /** 发票金额 **/
@JsonProperty("invoiceAmount") @JsonProperty("invoiceAmount")
private Integer invoiceAmount; private String invoiceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private Integer invoiceQuantity;
/** 销售订单号 **/ /** 销售订单号 **/
@JsonProperty("salesOrderId") @JsonProperty("salesOrderNo")
private String salesOrderId; private String salesOrderNo;
/** 合同名称 **/ /** 合同名称 **/
@JsonProperty("contractId") @JsonProperty("contractName")
private String contractId; private String contractName;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 客户 **/ /** 制单人 **/
@JsonProperty("customerId") @JsonProperty("creatorUserName")
private String customerId; private String creatorUserName;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java
Unescape View File

@ -11,16 +11,13 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesPagination extends Pagination { public class ArinvoicesPagination extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentNo; private String documentNo;
/** 业务日期 */
private List<String> businessDate;
/** /**
* 菜单id * 菜单id
*/ */

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPaginationExportModel.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesPaginationExportModel extends Pagination { public class ArinvoicesPaginationExportModel extends Pagination {
@ -23,7 +23,4 @@ public class ArinvoicesPaginationExportModel extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentNo; private String documentNo;
/** 业务日期 */
private List<String> businessDate;
} }

63
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesUpForm.java
Unescape View File

@ -2,7 +2,6 @@
package jnpf.arinvoices.model.arinvoices; package jnpf.arinvoices.model.arinvoices;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item1Model;
import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model; import jnpf.arinvoices.model.arinvoices.Arinvoices_item0Model;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -17,7 +16,7 @@ import lombok.Data;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-23 * @日期： 2023-01-30
*/ */
@Data @Data
public class ArinvoicesUpForm{ public class ArinvoicesUpForm{
@ -32,17 +31,37 @@ public class ArinvoicesUpForm{
/** 业务日期 **/ /** 业务日期 **/
@JsonProperty("businessDate") @JsonProperty("businessDate")
private Long businessDate; private String businessDate;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 金额 **/ /** 金额 **/
@JsonProperty("amount") @JsonProperty("amount")
private Integer amount; private String amount;
/** 数量 **/ /** 数量 **/
@JsonProperty("quantity") @JsonProperty("quantity")
private Integer quantity; private String quantity;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 客户税号 **/
@JsonProperty("customerTaxNo")
private String customerTaxNo;
/** 客户地址 **/
@JsonProperty("customerAddress")
private String customerAddress;
/** 币别 **/ /** 币别 **/
@ -55,38 +74,30 @@ public class ArinvoicesUpForm{
private String remark; private String remark;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 发票金额 **/ /** 发票金额 **/
@JsonProperty("invoiceAmount") @JsonProperty("invoiceAmount")
private Integer invoiceAmount; private String invoiceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private Integer invoiceQuantity;
/** 销售订单号 **/ /** 销售订单号 **/
@JsonProperty("salesOrderId") @JsonProperty("salesOrderNo")
private String salesOrderId; private String salesOrderNo;
/** 合同名称 **/ /** 合同名称 **/
@JsonProperty("contractId") @JsonProperty("contractName")
private String contractId; private String contractName;
/** 客户 **/ /** 单据状态 **/
@JsonProperty("customerId") @JsonProperty("status")
private String customerId; private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("arinvoices_item1List")
private List<Arinvoices_item1Model> arinvoices_item1List;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("arinvoices_item0List") @JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List; private List<Arinvoices_item0Model> arinvoices_item0List;

21
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java
Unescape View File

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
@Data @Data
public class Arinvoices_item0Model { public class Arinvoices_item0Model {
@ -26,14 +26,6 @@ public class Arinvoices_item0Model {
@JsonProperty("invoiceNo") @JsonProperty("invoiceNo")
private String invoiceNo; private String invoiceNo;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 发票金额 **/
@JsonProperty("involceAmount")
private String involceAmount;
/** 税率 **/ /** 税率 **/
@JsonProperty("taxRate") @JsonProperty("taxRate")
private String taxRate; private String taxRate;
@ -46,16 +38,11 @@ public class Arinvoices_item0Model {
@JsonProperty("amountNotTax") @JsonProperty("amountNotTax")
private String amountNotTax; private String amountNotTax;
/** 发票状态 **/
@JsonProperty("invoiceStatus")
private String invoiceStatus;
/** 开票人 **/ /** 开票人 **/
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 开票日期 **/ /** 备注信息 **/
@JsonProperty("invoiceDate") @JsonProperty("remark")
private Long invoiceDate; private String remark;
} }

60
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item1Model.java
Unescape View File

@ -1,60 +0,0 @@
package jnpf.arinvoices.model.arinvoices;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
*
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23
*/
@Data
public class Arinvoices_item1Model {
/** 物料 **/
@JsonProperty("materialId")
private String materialId;
/** 数量 **/
@JsonProperty("quantity")
private String quantity;
/** 单价 **/
@JsonProperty("unitPrice")
private String unitPrice;
/** 单价 **/
@JsonProperty("unit")
private String unit;
/** 金额 **/
@JsonProperty("amount")
private String amount;
/** 税率 **/
@JsonProperty("taxRate")
private String taxRate;
/** 税额 **/
@JsonProperty("taxAmount")
private String taxAmount;
/** 不含税金额 **/
@JsonProperty("amountNotTax")
private String amountNotTax;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/ArinvoicesService.java
Unescape View File

@ -1,6 +1,4 @@
package jnpf.arinvoices.service; package jnpf.arinvoices.service;
import jnpf.arinvoices.entity.Arinvoices_item1Entity;
import jnpf.arinvoices.service.Arinvoices_item1Service;
import jnpf.arinvoices.entity.Arinvoices_item0Entity; import jnpf.arinvoices.entity.Arinvoices_item0Entity;
import jnpf.arinvoices.service.Arinvoices_item0Service; import jnpf.arinvoices.service.Arinvoices_item0Service;
@ -14,7 +12,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface ArinvoicesService extends IService<ArinvoicesEntity> { public interface ArinvoicesService extends IService<ArinvoicesEntity> {
@ -33,7 +31,6 @@ public interface ArinvoicesService extends IService<ArinvoicesEntity> {
boolean update( String id, ArinvoicesEntity entity); boolean update( String id, ArinvoicesEntity entity);
// 子表方法 // 子表方法
List<Arinvoices_item1Entity> GetArinvoices_item1List(String id);
List<Arinvoices_item0Entity> GetArinvoices_item0List(String id); List<Arinvoices_item0Entity> GetArinvoices_item0List(String id);
//列表子表数据方法 //列表子表数据方法

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface Arinvoices_item0Service extends IService<Arinvoices_item0Entity> { public interface Arinvoices_item0Service extends IService<Arinvoices_item0Entity> {

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
public interface Arinvoices_item1Service extends IService<Arinvoices_item1Entity> { public interface Arinvoices_item1Service extends IService<Arinvoices_item1Entity> {

33
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
Unescape View File

@ -38,7 +38,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
@Service @Service
public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, ArinvoicesEntity> implements ArinvoicesService{ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, ArinvoicesEntity> implements ArinvoicesService{
@ -51,9 +51,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
private AuthorizeService authorizeService; private AuthorizeService authorizeService;
@Autowired
private Arinvoices_item1Service arinvoices_item1Service;
@Autowired @Autowired
private Arinvoices_item0Service arinvoices_item0Service; private Arinvoices_item0Service arinvoices_item0Service;
@ -135,17 +132,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo()); arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo());
} }
if(StringUtil.isNotEmpty(arinvoicesPagination.getBusinessDate())){
arinvoicesNum++;
List<String> BusinessDateList = arinvoicesPagination.getBusinessDate();
Long fir = Long.valueOf(BusinessDateList.get(0));
Long sec = Long.valueOf(BusinessDateList.get(1));
arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
.le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(AllIdList.size()>0){ if(AllIdList.size()>0){
arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList); arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList);
} }
@ -248,17 +234,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo()); arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo());
} }
if(StringUtil.isNotEmpty(arinvoicesPagination.getBusinessDate())){
arinvoicesNum++;
List<String> BusinessDateList = arinvoicesPagination.getBusinessDate();
Long fir = Long.valueOf(BusinessDateList.get(0));
Long sec = Long.valueOf(BusinessDateList.get(1));
arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
.le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(AllIdList.size()>0){ if(AllIdList.size()>0){
arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList); arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList);
} }
@ -316,12 +291,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} }
//子表方法 //子表方法
@Override @Override
public List<Arinvoices_item1Entity> GetArinvoices_item1List(String id){
QueryWrapper<Arinvoices_item1Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Arinvoices_item1Entity::getArinvoicesId, id);
return arinvoices_item1Service.list(queryWrapper);
}
@Override
public List<Arinvoices_item0Entity> GetArinvoices_item0List(String id){ public List<Arinvoices_item0Entity> GetArinvoices_item0List(String id){
QueryWrapper<Arinvoices_item0Entity> queryWrapper = new QueryWrapper<>(); QueryWrapper<Arinvoices_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, id); queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, id);

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
@Service @Service
public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Mapper, Arinvoices_item0Entity> implements Arinvoices_item0Service{ public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Mapper, Arinvoices_item0Entity> implements Arinvoices_item0Service{

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item1ServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-23 * 日期： 2023-01-30
*/ */
@Service @Service
public class Arinvoices_item1ServiceImpl extends ServiceImpl<Arinvoices_item1Mapper, Arinvoices_item1Entity> implements Arinvoices_item1Service{ public class Arinvoices_item1ServiceImpl extends ServiceImpl<Arinvoices_item1Mapper, Arinvoices_item1Entity> implements Arinvoices_item1Service{

261
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -8,21 +8,16 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.ir.IfNode;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.collection.service.SaleorderCETService;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity; import jnpf.saleback.entity.SaleorderEntity;
import jnpf.poundlist.service.PoundlistService; import org.bytedeco.opencv.presets.opencv_core;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import jnpf.collection.model.collection.*; import jnpf.collection.model.collection.*;
@ -55,7 +50,6 @@ import jnpf.util.GeneraterSwapUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import jnpf.util.file.UploadUtil; import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum; import jnpf.util.enums.FileTypeEnum;
@ -66,7 +60,7 @@ import jnpf.util.enums.FileTypeEnum;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -90,155 +84,57 @@ public class CollectionController {
private Collection_item0Service collection_item0Service; private Collection_item0Service collection_item0Service;
@Autowired @Autowired
private SaleorderitemService saleorderitemService; private SaleorderCETService saleorderCETService;
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private PoundlistService poundlistService;
/** @PostMapping("/confirmprice")
* 提交
*
* @param ids
* @return
*/
@PostMapping("/commit/{ids}")
@Transactional @Transactional
public ActionResult commit(@PathVariable("ids") String ids) { public ActionResult confirmPrice(@RequestBody CollectionListVO collectionListVO) {
String[] idList = ids.split(","); CollectionEntity collectionEntity = collectionService.getInfo(collectionListVO.getId());
for (String id : idList) { if (!collectionEntity.getStatus().equals("2")){
CollectionEntity collectionEntity = collectionService.getInfo(id); return ActionResult.fail("审核中，请先通过审核");
if (ObjectUtils.isNotEmpty(collectionEntity)) {
if (collectionEntity.getStatus().equals("1")) {
return ActionResult.fail("已提交,无需再次提交");
}
if (collectionEntity.getStatus().equals("2")) {
return ActionResult.fail("已认款，无需再次提交");
}
if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) {
return ActionResult.fail("请先输入收款金额");
}
collectionEntity.setStatus("1");
collectionService.updateById(collectionEntity);
return ActionResult.success("提交成功");
} else {
return ActionResult.fail("数据为空");
}
} }
return ActionResult.fail("请选择一条数据"); QueryWrapper<Collection_item0Entity> queryWrapper = new QueryWrapper<>();
} queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId,collectionListVO.getId());
List<Collection_item0Entity> collection_item0EntityList = collection_item0Service.list(queryWrapper);
/** for (Collection_item0Entity collection_item0Entity : collection_item0EntityList){
* 认款 SaleorderCETEntity saleordercetEntity = saleorderCETService.getById(collection_item0Entity.getSalesorderId());
* if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())){
* @param ids return ActionResult.fail("已回款金额等于金额");
* @return }
*/ if (saleordercetEntity.getAmountCollected()!=null && collection_item0Entity.getAmount() !=null) {
@PostMapping("/confirmprice/{ids}") BigDecimal sum =saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount());
@Transactional saleordercetEntity.setAmountCollected(sum);
public ActionResult confirmPrice(@PathVariable("ids") String ids) { if (saleordercetEntity.getAmountCollected().compareTo(saleordercetEntity.getPrice()) > 0) {
String[] idList = ids.split(","); return ActionResult.fail("总回款金额大于金额");
for (String id : idList) {
CollectionEntity collectionEntity = collectionService.getInfo(id);
if (collectionEntity.getStatus().equals("0")){
return ActionResult.fail("提交中");
}
if (collectionEntity.getStatus().equals("2")){
return ActionResult.fail("已认款");
}
if (collectionEntity.getStatus().equals("1")) {
QueryWrapper<Collection_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id);
List<Collection_item0Entity> collection_item0EntityList = collection_item0Service.list(queryWrapper);//查询收款单子表信息
for (Collection_item0Entity collection_item0Entity : collection_item0EntityList) {
BigDecimal sum;
SaleorderitemEntity saleordercetEntity = saleorderitemService.getById(collection_item0Entity.getSalesorderId());//查询销售订单信息
if (saleordercetEntity.getAmountCollected() == null) {
saleordercetEntity.setAmountCollected(new BigDecimal(0));
}
if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())) {
return ActionResult.fail("已回款金额等于金额");
}
if (saleordercetEntity.getAmountCollected() != null && collection_item0Entity.getAmount() != null) {
sum = saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount());
if (saleordercetEntity.getAmountCollected().compareTo(saleordercetEntity.getPrice()) > 0) {
return ActionResult.fail("总回款金额大于金额");
}
// saleordercetEntity.setAmountCollected(sum);
// saleordercetEntity.setStatus("3");
// saleorderitemService.updateById(saleordercetEntity);
} else {
return ActionResult.fail("已回款金额或回款金额不能为空");
}
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleordercetEntity.getId());
List<Salesorder_item0Entity> list = salesorder_item0Service.list(queryWrapper1);
List<PoundlistEntity> poundlist = new ArrayList<>();
// List<PoundlistEntity> poundsort = new LinkedList<>();
for (Salesorder_item0Entity saleItem : list){
PoundlistEntity poundlistEntity = collectionService.queryPoundInfo(saleItem.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
poundlist.add(poundlistEntity);
}
}
if (poundlist.size() > 0) {
poundlist = poundlist.stream().sorted(Comparator.comparing(PoundlistEntity::getAdvance).reversed()
.thenComparing(Comparator.comparing(PoundlistEntity::getPoundDate))).collect(Collectors.toList());
}else{
return ActionResult.fail("磅单为空");
}
BigDecimal amount = new BigDecimal(0);
List<PoundlistEntity> poundlist1 = new ArrayList<>();
for (PoundlistEntity pound : poundlist){
if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) {
amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement()));
if (amount.compareTo(sum) < 1) {
poundlist1.add(pound);
}else{
break;
}
}
}
for (PoundlistEntity poundlistEntity : poundlist1){
poundlistEntity.setIsCollection("1");
if (poundlistEntity.getPaymentDate() == null){
poundlistEntity.setPaymentDate(new Date());
}
saleordercetEntity.setAmountCollected(sum);
saleordercetEntity.setStatus("3");
saleorderitemService.updateById(saleordercetEntity);
poundlistService.updateById(poundlistEntity);
collectionEntity.setStatus("2");
collectionService.updateById(collectionEntity);
return ActionResult.success("认款成功");
} }
return ActionResult.fail("收款金额不足"); saleordercetEntity.setStatus("2");
saleorderCETService.updateById(saleordercetEntity);
}else {
return ActionResult.fail("已回款金额或回款金额不能为空");
} }
} }
return ActionResult.success("认款成功");
} }
return ActionResult.fail("请选择一条数据");
}
/** /**
* 列表 * 列表
* *
* @param collectionPagination * @param collectionPagination
* @return * @return
*/ */
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody CollectionPagination collectionPagination)throws IOException{ public ActionResult list(@RequestBody CollectionPagination collectionPagination)throws IOException{
List<CollectionEntity> list= collectionService.getList(collectionPagination); List<CollectionEntity> list= collectionService.getList(collectionPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(CollectionEntity entity:list){ for(CollectionEntity entity:list){
Map<String,Object> customerIdMap = new HashMap<>(); Map<String,Object> customerNameMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("393371066040385285","supplier_nm","supplier_nm",entity.getCustomerName(),customerNameMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher())); entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
} }
List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class);
for(CollectionListVO collectionVO:listVO){ for(CollectionListVO jg_collectionVO:listVO){
} }
PageListVO vo=new PageListVO(); PageListVO vo=new PageListVO();
@ -248,6 +144,11 @@ public class CollectionController {
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@GetMapping("autoCreate")
public ActionResult autoCreate() throws DataException {
String document = generaterSwapUtil.getBillNumber("collection",false);
return ActionResult.success(document);
}
/** /**
* 创建 * 创建
@ -261,11 +162,13 @@ public class CollectionController {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false)); collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
collectionCrForm.setCreatorUserName(userInfo.getUserId());
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class); CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId); entity.setId(mainId);
collectionService.save(entity); collectionService.save(entity);
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){ for(Collection_item0Entity entitys : Collection_item0List){
entitys.setSalesorderId(entitys.getId());
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setCollectionId(entity.getId()); entitys.setCollectionId(entity.getId());
collection_item0Service.save(entitys); collection_item0Service.save(entitys);
@ -311,10 +214,8 @@ public class CollectionController {
List<CollectionEntity> list= collectionService.getTypeList(collectionPagination,collectionPaginationExportModel.getDataType()); List<CollectionEntity> list= collectionService.getTypeList(collectionPagination,collectionPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(CollectionEntity entity:list){ for(CollectionEntity entity:list){
Map<String,Object> customerIdMap = new HashMap<>(); Map<String,Object> customerNameMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("393371066040385285","supplier_nm","supplier_nm",entity.getCustomerName(),customerNameMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher())); entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
} }
List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class); List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class);
@ -338,8 +239,8 @@ public class CollectionController {
case "documentNo" : case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo")); entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break; break;
case "customerId" : case "customerName" :
entitys.add(new ExcelExportEntity("客户" ,"customerId")); entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
break; break;
case "amountCollected" : case "amountCollected" :
entitys.add(new ExcelExportEntity("收款金额" ,"amountCollected")); entitys.add(new ExcelExportEntity("收款金额" ,"amountCollected"));
@ -437,21 +338,24 @@ public class CollectionController {
//子表 //子表
List<Collection_item0Entity> Collection_item0List = collectionService.GetCollection_item0List(id); List<Collection_item0Entity> Collection_item0List = collectionService.GetCollection_item0List(id);
List<Collection_item0Model> collection_item0ModelList = new ArrayList<>();
Collection_item0Model collection_item0Model = new Collection_item0Model();
for(Collection_item0Entity collection_item0Entity : Collection_item0List){ for(Collection_item0Entity collection_item0Entity : Collection_item0List){
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>(); SaleorderCETEntity saleorderCETEntity = saleorderCETService.getById(collection_item0Entity.getSalesorderId());
queryWrapper.lambda().eq(SaleorderitemEntity::getId,collection_item0Entity.getSalesorderId()); collection_item0Model.setId(collection_item0Entity.getSalesorderId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); collection_item0Model.setAmount(String.valueOf(collection_item0Entity.getAmount()));
collection_item0Entity.setPrice(saleorderitemEntity.getPrice()); collection_item0Model.setPrice(String.valueOf(saleorderCETEntity.getPrice()));
collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected()); collection_item0Model.setAmountCollected(String.valueOf(saleorderCETEntity.getAmountCollected()));
collection_item0Entity.setContractCode(saleorderitemEntity.getContractId()); collection_item0Model.setDocumentNo(String.valueOf(saleorderCETEntity.getDocumentNo()));
collection_item0Entity.setSalesorderId(saleorderitemEntity.getId()); collection_item0Model.setContractCode(String.valueOf(saleorderCETEntity.getContractCode()));
collection_item0Entity.setCreatorTime(saleorderitemEntity.getCreatorTime()); collection_item0Model.setNum(String.valueOf(saleorderCETEntity.getNum()));
collection_item0Entity.setNum(saleorderitemEntity.getNum()); collection_item0Model.setAdvanceAmount(String.valueOf(saleorderCETEntity.getAdvanceAmount()));
collection_item0Entity.setAdvanceAmount(saleorderitemEntity.getAdvanceAmount()); collection_item0Model.setRate(String.valueOf(saleorderCETEntity.getRate()));
collection_item0Entity.setRate(saleorderitemEntity.getRate()); collection_item0Model.setNotPrice(String.valueOf(saleorderCETEntity.getNotPrice()));
collection_item0Entity.setNotPrice(saleorderitemEntity.getNotPrice()); collection_item0Model.setCreatorTime(String.valueOf(saleorderCETEntity.getCreatorTime()));
collection_item0ModelList.add(collection_item0Model);
} }
vo.setCollection_item0List(JsonUtil.getJsonToList(Collection_item0List,Collection_item0Model.class )); vo.setCollection_item0List(JsonUtil.getJsonToList(collection_item0ModelList,Collection_item0Model.class ));
//副表 //副表
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -471,31 +375,14 @@ public class CollectionController {
List<Collection_item0Entity> jg_collection_item0List = collectionService.GetCollection_item0List(id); List<Collection_item0Entity> jg_collection_item0List = collectionService.GetCollection_item0List(id);
List<Collection_item0Model> jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class); List<Collection_item0Model> jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class);
for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){ for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,jg_collection_item0Model.getSalesorderId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
jg_collection_item0Model.setContractCode(saleorderitemEntity.getContractId());
jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate()));
jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice()));
// Map<String,Object> salesorderIdMap = new HashMap<>();
// jg_collection_item0Model.setSalesorderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",jg_collection_item0Model.getSalesorderId(),salesorderIdMap));
Map<String,Object> deleteTimeMap = new HashMap<>(); Map<String,Object> deleteTimeMap = new HashMap<>();
jg_collection_item0Model.setContractCode(generaterSwapUtil.getPopupSelectValue("398848549678332037","id","contract_code",jg_collection_item0Model.getContractCode(),deleteTimeMap)); jg_collection_item0Model.setDocumentNo(generaterSwapUtil.getPopupSelectValue("393372436705378053","document_no","document_no",jg_collection_item0Model.getDocumentNo(),deleteTimeMap));
} }
vo.setCollection_item0List(jg_collection_item0ModelList); vo.setCollection_item0List(jg_collection_item0ModelList);
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
Map<String,Object> customerIdMap = new HashMap<>();
vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",vo.getCustomerId(),customerIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
vo.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
vo.setVoucher(generaterSwapUtil.getFileNameInJson(vo.getVoucher())); vo.setVoucher(generaterSwapUtil.getFileNameInJson(vo.getVoucher()));
return ActionResult.success(vo); return ActionResult.success(vo);
@ -515,6 +402,9 @@ public class CollectionController {
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CollectionUpForm collectionUpForm) throws DataException { public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CollectionUpForm collectionUpForm) throws DataException {
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
CollectionEntity entity= collectionService.getInfo(id); CollectionEntity entity= collectionService.getInfo(id);
if (entity.getStatus().equals("2") || entity.getStatus().equals("3")){
return ActionResult.fail("已审核，不允许编辑");
}
if(entity!=null){ if(entity!=null){
CollectionEntity subentity=JsonUtil.getJsonToBean(collectionUpForm, CollectionEntity.class); CollectionEntity subentity=JsonUtil.getJsonToBean(collectionUpForm, CollectionEntity.class);
collectionService.update(id, subentity); collectionService.update(id, subentity);
@ -522,20 +412,13 @@ public class CollectionController {
QueryWrapper<Collection_item0Entity> Collection_item0queryWrapper = new QueryWrapper<>(); QueryWrapper<Collection_item0Entity> Collection_item0queryWrapper = new QueryWrapper<>();
Collection_item0queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, entity.getId()); Collection_item0queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, entity.getId());
collection_item0Service.remove(Collection_item0queryWrapper); collection_item0Service.remove(Collection_item0queryWrapper);
for (Collection_item0Model collection_item0Model : collectionUpForm.getCollection_item0List()){
collection_item0Model.setCreatorTime(null);
}
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class); List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){ for(Collection_item0Entity entitys : Collection_item0List){
entitys.setSalesorderId(entitys.getId());
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setCollectionId(entity.getId()); entitys.setCollectionId(entity.getId());
collection_item0Service.save(entitys); collection_item0Service.save(entitys);

9
SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
Unescape View File

@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
@TableName("jg_collection") @TableName("jg_collection")
@ -69,7 +69,7 @@ public class CollectionEntity {
private String settlementType; private String settlementType;
@TableField("IS_COLLECTION") @TableField("IS_COLLECTION")
private String isCollection; private String IS_COLLECTION;
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@ -113,9 +113,4 @@ public class CollectionEntity {
@TableField("CUSTOMER_ID") @TableField("CUSTOMER_ID")
private String customerId; private String customerId;
@TableField("CONTRACT_ID")
private String contractId;
} }

32
SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java
Unescape View File

@ -9,6 +9,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.bytedeco.opencv.presets.opencv_core;
/** /**
@ -17,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
@TableName("jg_collection_item0") @TableName("jg_collection_item0")
@ -71,33 +72,4 @@ public class Collection_item0Entity {
@TableField("AMOUNT") @TableField("AMOUNT")
private BigDecimal amount; private BigDecimal amount;
/** 订单金额 **/
@TableField(exist = false)
private BigDecimal price;
/** 已收款金额 **/
@TableField(exist = false)
private BigDecimal amountCollected;
/** 合同编码 **/
@TableField(exist = false)
private String contractCode;
/** 重量 **/
@TableField(exist = false)
private BigDecimal num;
/** 垫资金额 **/
@TableField(exist = false)
private BigDecimal advanceAmount;
/** 税额 **/
@TableField(exist = false)
private BigDecimal rate;
/** 不含税金额 **/
@TableField(exist = false)
private BigDecimal notPrice;
} }

144
SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/SaleorderCETEntity.java
Unescape View File

@ -0,0 +1,144 @@
package jnpf.collection.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* 销售订单
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-03
*/
@Data
@TableName("jg_salesorder")
public class SaleorderCETEntity {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("DOCUMENT_NO")
private String documentNo;
@TableField("ERP_NO")
private String erpNo;
@TableField("SOURCE_PO_NO")
private String sourcePoNo;
@TableField("CONTRACT_CODE")
private String contractCode;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("CONTRACT_NO")
private String contractNo;
@TableField("COSTOMER_CODE")
private String costomerCode;
@TableField("COSTOMER_NAME")
private String costomerName;
@TableField("NUM")
private BigDecimal num;
@TableField("PRICE")
private BigDecimal price;
@TableField("NOT_PRICE")
private BigDecimal notPrice;
@TableField("RATE")
private BigDecimal rate;
@TableField("POUND_NUM")
private Integer poundNum;
@TableField("CURRENCY")
private String currency;
@TableField("ADVANCE_AMOUNT")
private BigDecimal advanceAmount;
@TableField("AMOUNT_COLLECTED")
private BigDecimal amountCollected;
@TableField("INVOICE_NUM")
private BigDecimal invoiceNum;
@TableField("INVOICE_AMOUNT")
private BigDecimal invoiceAmount;
@TableField("RETURN_QUANTITY")
private BigDecimal returnQuantity;
@TableField("REF_AMOUNT")
private BigDecimal reamount;
@TableField("STATUS")
private String status;
@TableField("SOURCE_SYSTEM")
private String sourceSystem;
@TableField("IS_SETTLE")
private String isSettle;
@TableField("ISSUE")
private String issue;
@TableField("REMARK")
private String remark;
@TableField("CLOSING_DATE")
private Date closingDate;
@TableField("OVERDUE_INTEREST")
private BigDecimal overdueInterest;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java
Unescape View File

@ -3,8 +3,6 @@ package jnpf.collection.mapper;
import jnpf.collection.entity.CollectionEntity; import jnpf.collection.entity.CollectionEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.poundlist.entity.PoundlistEntity;
import org.apache.ibatis.annotations.Param;
/** /**
* *
@ -12,9 +10,8 @@ import org.apache.ibatis.annotations.Param;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
public interface CollectionMapper extends BaseMapper<CollectionEntity> { public interface CollectionMapper extends BaseMapper<CollectionEntity> {
PoundlistEntity queryPound(@Param("poundlistId") String poundlistId);
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/Collection_item0Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
public interface Collection_item0Mapper extends BaseMapper<Collection_item0Entity> { public interface Collection_item0Mapper extends BaseMapper<Collection_item0Entity> {

17
SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/SaleorderCETMapper.java
Unescape View File

@ -0,0 +1,17 @@
package jnpf.collection.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.collection.entity.SaleorderCETEntity;
/**
*
* saleorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
public interface SaleorderCETMapper extends BaseMapper<SaleorderCETEntity> {
}

23
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java
Unescape View File

@ -16,23 +16,22 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionCrForm { public class CollectionCrForm {
/** 客户名称 **/
@JsonProperty("customerCode")
private String customerCode;
/** 单据编号 **/ /** 单据编号 **/
@JsonProperty("documentNo") @JsonProperty("documentNo")
private String documentNo; private String documentNo;
/** 客户 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerName")
private String customerId; private String customerName;
/** 合同 **/
@JsonProperty("contractId")
private String contractId;
/** 收款金额 **/ /** 收款金额 **/
@JsonProperty("amountCollected") @JsonProperty("amountCollected")
@ -77,7 +76,7 @@ public class CollectionCrForm {
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("collection_item0List") @JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List; private List<Collection_item0Model> collection_item0List;
// /** 客户id **/ /** 客户id **/
// @JsonProperty("customerId") @JsonProperty("customerId")
// private String customerId; private String customerId;
} }

20
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java
Unescape View File

@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionInfoVO{ public class CollectionInfoVO{
@ -28,13 +28,13 @@ public class CollectionInfoVO{
@JsonProperty("documentNo") @JsonProperty("documentNo")
private String documentNo; private String documentNo;
/** 客户 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerCode")
private String customerId; private String customerCode;
/** 合同 **/ /** 客户名称 **/
@JsonProperty("contractId") @JsonProperty("customerName")
private String contractId; private String customerName;
/** 收款金额 **/ /** 收款金额 **/
@JsonProperty("amountCollected") @JsonProperty("amountCollected")
@ -79,7 +79,7 @@ public class CollectionInfoVO{
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("collection_item0List") @JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List; private List<Collection_item0Model> collection_item0List;
// /** 客户id **/ /** 客户id **/
// @JsonProperty("customerId") @JsonProperty("customerId")
// private String customerId; private String customerId;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListQuery.java
Unescape View File

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionListQuery extends Pagination { public class CollectionListQuery extends Pagination {

20
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
Unescape View File

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionListVO{ public class CollectionListVO{
@ -28,14 +28,14 @@ public class CollectionListVO{
@JsonProperty("documentNo") @JsonProperty("documentNo")
private String documentNo; private String documentNo;
/** 客户名称 **/
@JsonProperty("customerCode")
private String customerCode;
/** 客户 **/
@JsonProperty("customerId")
private String customerId;
/** 合同 **/ /** 客户名称 **/
@JsonProperty("contractId") @JsonProperty("customerName")
private String contractId; private String customerName;
/** 收款金额 **/ /** 收款金额 **/
@ -86,8 +86,8 @@ public class CollectionListVO{
/** 制单人 **/ /** 制单人 **/
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
// /** 客户id **/ /** 客户id **/
// @JsonProperty("customerId") @JsonProperty("customerId")
// private String customerId; private String customerId;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionPagination extends Pagination { public class CollectionPagination extends Pagination {

2
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPaginationExportModel.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionPaginationExportModel extends Pagination { public class CollectionPaginationExportModel extends Pagination {

20
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java
Unescape View File

@ -16,7 +16,7 @@ import lombok.Data;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-25 * @日期： 2023-02-09
*/ */
@Data @Data
public class CollectionUpForm{ public class CollectionUpForm{
@ -28,14 +28,14 @@ public class CollectionUpForm{
@JsonProperty("documentNo") @JsonProperty("documentNo")
private String documentNo; private String documentNo;
/** 客户名称 **/
@JsonProperty("customerCode")
private String customerCode;
/** 客户 **/
@JsonProperty("customerId")
private String customerId;
/** 合同 **/ /** 客户名称 **/
@JsonProperty("contractId") @JsonProperty("customerName")
private String contractId; private String customerName;
/** 收款金额 **/ /** 收款金额 **/
@ -90,8 +90,8 @@ public class CollectionUpForm{
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("collection_item0List") @JsonProperty("collection_item0List")
private List<Collection_item0Model> collection_item0List; private List<Collection_item0Model> collection_item0List;
// /** 客户id **/ /** 客户id **/
// @JsonProperty("customerId") @JsonProperty("customerId")
// private String customerId; private String customerId;
} }

17
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java
Unescape View File

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
@Data @Data
public class Collection_item0Model { public class Collection_item0Model {
@ -22,6 +22,10 @@ public class Collection_item0Model {
@JsonProperty("amount") @JsonProperty("amount")
private String amount; private String amount;
/** 销售订单主表id **/
@JsonProperty("id")
private String id;
/** 订单金额 **/ /** 订单金额 **/
@JsonProperty("price") @JsonProperty("price")
private String price; private String price;
@ -30,11 +34,11 @@ public class Collection_item0Model {
@JsonProperty("amountCollected") @JsonProperty("amountCollected")
private String amountCollected; private String amountCollected;
/** 销售订单 **/ /** 销售订单编号 **/
@JsonProperty("salesorderId") @JsonProperty("documentNo")
private String salesorderId; private String documentNo;
/** 合同编码 **/ /** 合同编号 **/
@JsonProperty("contractCode") @JsonProperty("contractCode")
private String contractCode; private String contractCode;
@ -42,7 +46,6 @@ public class Collection_item0Model {
@JsonProperty("num") @JsonProperty("num")
private String num; private String num;
/** 垫资金额 **/ /** 垫资金额 **/
@JsonProperty("advanceAmount") @JsonProperty("advanceAmount")
private String advanceAmount; private String advanceAmount;
@ -57,6 +60,6 @@ public class Collection_item0Model {
/** 业务日期 **/ /** 业务日期 **/
@JsonProperty("creatorTime") @JsonProperty("creatorTime")
private Long creatorTime; private String creatorTime;
} }

6
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java
Unescape View File

@ -5,8 +5,6 @@ import jnpf.collection.service.Collection_item0Service;
import jnpf.collection.entity.CollectionEntity; import jnpf.collection.entity.CollectionEntity;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.collection.model.collection.CollectionPagination; import jnpf.collection.model.collection.CollectionPagination;
import jnpf.poundlist.entity.PoundlistEntity;
import java.util.*; import java.util.*;
/** /**
* *
@ -14,7 +12,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
public interface CollectionService extends IService<CollectionEntity> { public interface CollectionService extends IService<CollectionEntity> {
@ -35,7 +33,5 @@ public interface CollectionService extends IService<CollectionEntity> {
// 子表方法 // 子表方法
List<Collection_item0Entity> GetCollection_item0List(String id); List<Collection_item0Entity> GetCollection_item0List(String id);
PoundlistEntity queryPoundInfo(String poundlistId);
//列表子表数据方法 //列表子表数据方法
} }

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
public interface Collection_item0Service extends IService<Collection_item0Entity> { public interface Collection_item0Service extends IService<Collection_item0Entity> {

20
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/SaleorderCETService.java
Unescape View File

@ -0,0 +1,20 @@
package jnpf.collection.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.collection.entity.*;
import jnpf.saleorder.model.saleorder.SaleorderPagination;
import java.util.List;
/**
*
* saleorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
public interface SaleorderCETService extends IService<SaleorderCETEntity> {
}

18
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
Unescape View File

@ -4,8 +4,6 @@ import jnpf.collection.entity.*;
import jnpf.collection.mapper.CollectionMapper; import jnpf.collection.mapper.CollectionMapper;
import jnpf.collection.service.*; import jnpf.collection.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.util.RandomUtil; import jnpf.util.RandomUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@ -32,8 +30,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import javax.annotation.Resource;
import java.util.*; import java.util.*;
/** /**
@ -42,7 +38,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
@Service @Service
public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, CollectionEntity> implements CollectionService{ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, CollectionEntity> implements CollectionService{
@ -57,10 +53,6 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
@Autowired @Autowired
private Collection_item0Service collection_item0Service; private Collection_item0Service collection_item0Service;
@Resource
private CollectionMapper collectionMapper;
@Autowired
private PoundlistService poundlistService;
@ -269,14 +261,6 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
return collection_item0Service.list(queryWrapper); return collection_item0Service.list(queryWrapper);
} }
@Override
public PoundlistEntity queryPoundInfo(String poundlistId) {
QueryWrapper<PoundlistEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PoundlistEntity::getId,poundlistId);
return poundlistService.getOne(queryWrapper);
// return collectionMapper.queryPound(poundlistId);
}
//列表子表数据方法 //列表子表数据方法

2
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/Collection_item0ServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-25 * 日期： 2023-02-09
*/ */
@Service @Service
public class Collection_item0ServiceImpl extends ServiceImpl<Collection_item0Mapper, Collection_item0Entity> implements Collection_item0Service{ public class Collection_item0ServiceImpl extends ServiceImpl<Collection_item0Mapper, Collection_item0Entity> implements Collection_item0Service{

28
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/SaleorderCETServiceImpl.java
Unescape View File

@ -0,0 +1,28 @@
package jnpf.collection.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.collection.entity.*;
import jnpf.collection.mapper.SaleorderCETMapper;
import jnpf.collection.service.*;
import org.springframework.stereotype.Service;
/**
*
* saleorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
@Service
public class SaleorderCETServiceImpl extends ServiceImpl<SaleorderCETMapper, SaleorderCETEntity> implements SaleorderCETService {
}

37
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -15,8 +15,6 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import jnpf.poundlist.model.poundlist.*; import jnpf.poundlist.model.poundlist.*;
@ -74,37 +72,6 @@ public class PoundlistController {
@Autowired @Autowired
private PoundlistService poundlistService; private PoundlistService poundlistService;
/**
* 生成销售
*
* @param ids
* @return
*/
@PostMapping("/createsale/{ids}")
public ActionResult createSale(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
List<PoundlistEntity> list = new ArrayList<>();
for (String allId : idList){
QueryWrapper<PoundlistEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PoundlistEntity::getId,allId);
queryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1");
queryWrapper.lambda().eq(PoundlistEntity::getSalesStatus,"99");
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
list.add(poundlistEntity);
}
}
if (list.size() > 0) {
long count = list.stream().map(PoundlistEntity::getSalesId).distinct().count();
if (count != 1) {
return ActionResult.fail("销售订单不一致");
}else{
return ActionResult.success(list);
}
}else{
return ActionResult.fail("当前状态不能生成销售订单");
}
}
@ -214,7 +181,7 @@ public class PoundlistController {
entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap)); entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
Map<String,Object> businessIdMap = new HashMap<>(); Map<String,Object> businessIdMap = new HashMap<>();
entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",entity.getBusinessId(),businessIdMap)); entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_ID","F_RealName",entity.getBusinessId(),businessIdMap));
Map<String,Object> naturalIdMap = new HashMap<>(); Map<String,Object> naturalIdMap = new HashMap<>();
entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap)); entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
Map<String,Object> purchaseIdMap = new HashMap<>(); Map<String,Object> purchaseIdMap = new HashMap<>();
@ -418,7 +385,7 @@ public class PoundlistController {
vo.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",vo.getVehicleId(),vehicleIdMap)); vo.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",vo.getVehicleId(),vehicleIdMap));
vo.setVehiclePictures(generaterSwapUtil.getFileNameInJson(vo.getVehiclePictures())); vo.setVehiclePictures(generaterSwapUtil.getFileNameInJson(vo.getVehiclePictures()));
Map<String,Object> businessIdMap = new HashMap<>(); Map<String,Object> businessIdMap = new HashMap<>();
vo.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",vo.getBusinessId(),businessIdMap)); vo.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_ID","F_RealName",vo.getBusinessId(),businessIdMap));
Map<String,Object> naturalIdMap = new HashMap<>(); Map<String,Object> naturalIdMap = new HashMap<>();
vo.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",vo.getNaturalId(),naturalIdMap)); vo.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",vo.getNaturalId(),naturalIdMap));
Map<String,Object> purchaseIdMap = new HashMap<>(); Map<String,Object> purchaseIdMap = new HashMap<>();

1
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
Unescape View File

@ -62,7 +62,6 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int poundlistNum =0; int poundlistNum =0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>(); QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1"); poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1");
// poundlistQueryWrapper.lambda().eq(PoundlistEntity::getSalesStatus,"99");
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");

88
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java
Unescape View File

@ -15,8 +15,6 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.service.SaleorderitemService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import jnpf.receiptout.model.receiptout.*; import jnpf.receiptout.model.receiptout.*;
@ -57,12 +55,12 @@ import jnpf.util.enums.FileTypeEnum;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "receiptout" , value = "receipout") @Api(tags = "receiptout" , value = "example")
@RequestMapping("/api/receipout/Receiptout") @RequestMapping("/api/example/Receiptout")
public class ReceiptoutController { public class ReceiptoutController {
@Autowired @Autowired
@ -79,41 +77,8 @@ public class ReceiptoutController {
@Autowired @Autowired
private Receiptout_item0Service receiptout_item0Service; private Receiptout_item0Service receiptout_item0Service;
@Autowired
private SaleorderitemService saleorderitemService;
/**
* 销售订单出货，出库单创建
*
* @param receiptoutCrForm
* @return
*/
@PostMapping("/saleordercreate")
@Transactional
public ActionResult saleorderCreate(@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());
ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class);
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSalesId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
saleorderitemEntity.setStatus("1");
saleorderitemService.updateById(saleorderitemEntity);
entity.setId(mainId);
entity.setIssueDate(new Date());
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());
entitys.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num",false));
receiptout_item0Service.save(entitys);
}
return ActionResult.success("创建成功");
}
/** /**
* 列表 * 列表
@ -126,10 +91,8 @@ public class ReceiptoutController {
List<ReceiptoutEntity> list= receiptoutService.getList(receiptoutPagination); List<ReceiptoutEntity> list= receiptoutService.getList(receiptoutPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ReceiptoutEntity entity:list){ for(ReceiptoutEntity entity:list){
Map<String,Object> salesIdMap = new HashMap<>(); Map<String,Object> sourceNoMap = new HashMap<>();
entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
} }
@ -167,8 +130,23 @@ public class ReceiptoutController {
for(Receiptout_item0Entity entitys : Receiptout_item0List){ for(Receiptout_item0Entity entitys : Receiptout_item0List){
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setReceiptinId(entity.getId()); entitys.setReceiptinId(entity.getId());
receiptout_item0Service.save(entitys); receiptout_item0Service.save(entitys);
} }
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
@ -207,10 +185,8 @@ public class ReceiptoutController {
List<ReceiptoutEntity> list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); List<ReceiptoutEntity> list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ReceiptoutEntity entity:list){ for(ReceiptoutEntity entity:list){
Map<String,Object> salesIdMap = new HashMap<>(); Map<String,Object> sourceNoMap = new HashMap<>();
entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
} }
@ -238,8 +214,8 @@ public class ReceiptoutController {
case "type" : case "type" :
entitys.add(new ExcelExportEntity("业务类型" ,"type")); entitys.add(new ExcelExportEntity("业务类型" ,"type"));
break; break;
case "salesId" : case "sourceNo" :
entitys.add(new ExcelExportEntity("来源单号" ,"salesId")); entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo"));
break; break;
case "amount" : case "amount" :
entitys.add(new ExcelExportEntity("出库金额" ,"amount")); entitys.add(new ExcelExportEntity("出库金额" ,"amount"));
@ -370,24 +346,18 @@ public class ReceiptoutController {
List<Receiptout_item0Entity> jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id); List<Receiptout_item0Entity> jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
List<Receiptout_item0Model> jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class); List<Receiptout_item0Model> jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class);
for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){ for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){
Map<String,Object> vehicleIdMap = new HashMap<>(); Map<String,Object> licenseNoMap = new HashMap<>();
jg_receiptout_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptout_item0Model.getVehicleId(),vehicleIdMap)); jg_receiptout_item0Model.setLicenseNo(generaterSwapUtil.getPopupSelectValue("392933248017164229","license_no","license_no",jg_receiptout_item0Model.getLicenseNo(),licenseNoMap));
Map<String,Object> materialIdMap = new HashMap<>();
jg_receiptout_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptout_item0Model.getMaterialId(),materialIdMap));
Map<String,Object> reservoirareaIdMap = new HashMap<>(); Map<String,Object> reservoirareaIdMap = new HashMap<>();
jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap)); jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap));
Map<String,Object> warehouseMap = new HashMap<>();
jg_receiptout_item0Model.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptout_item0Model.getWarehouseId(),warehouseMap));
} }
vo.setReceiptout_item0List(jg_receiptout_item0ModelList); vo.setReceiptout_item0List(jg_receiptout_item0ModelList);
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
Map<String,Object> salesIdMap = new HashMap<>(); Map<String,Object> sourceNoMap = new HashMap<>();
vo.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesId(),salesIdMap)); vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",vo.getSourceNo(),sourceNoMap));
Map<String,Object> customerIdMap = new HashMap<>();
vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName())); vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));

7
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
Unescape View File

@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
@TableName("jg_receiptout") @TableName("jg_receiptout")
@ -99,9 +99,4 @@ public class ReceiptoutEntity {
@TableField("SALES_ID") @TableField("SALES_ID")
private String salesId; private String salesId;
@TableField("CUSTOMER_ID")
private String customerId;
} }

10
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
Unescape View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
@TableName("jg_receiptout_item0") @TableName("jg_receiptout_item0")
@ -116,12 +116,4 @@ public class Receiptout_item0Entity {
@TableField("VEHICLE_ID") @TableField("VEHICLE_ID")
private String vehicleId; private String vehicleId;
@TableField("POUND_TYPE")
private String poundType;
@TableField("MATERIAL_ID")
private String materialId;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> { public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
public interface Receiptout_item0Mapper extends BaseMapper<Receiptout_item0Entity> { public interface Receiptout_item0Mapper extends BaseMapper<Receiptout_item0Entity> {

16
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java
Unescape View File

@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutCrForm { public class ReceiptoutCrForm {
@ -30,8 +30,8 @@ public class ReceiptoutCrForm {
private String type; private String type;
/** 来源单号 **/ /** 来源单号 **/
@JsonProperty("salesId") @JsonProperty("sourceNo")
private String salesId; private String sourceNo;
/** 出库金额 **/ /** 出库金额 **/
@JsonProperty("amount") @JsonProperty("amount")
@ -46,8 +46,8 @@ public class ReceiptoutCrForm {
private String num; private String num;
/** 客户名称 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerName")
private String customerId; private String customerName;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
@ -81,7 +81,7 @@ public class ReceiptoutCrForm {
@JsonProperty("receiptout_item0List") @JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List; private List<Receiptout_item0Model> receiptout_item0List;
// /** 销售id **/ /** 销售id **/
// @TableField("salesId") @TableField("salesId")
// private String salesId;/ private String salesId;
} }

16
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java
Unescape View File

@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutInfoVO{ public class ReceiptoutInfoVO{
@ -34,8 +34,8 @@ public class ReceiptoutInfoVO{
private String type; private String type;
/** 来源单号 **/ /** 来源单号 **/
@JsonProperty("salesId") @JsonProperty("sourceNo")
private String salesId; private String sourceNo;
/** 出库金额 **/ /** 出库金额 **/
@JsonProperty("amount") @JsonProperty("amount")
@ -50,8 +50,8 @@ public class ReceiptoutInfoVO{
private String num; private String num;
/** 客户名称 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerName")
private String customerId; private String customerName;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
@ -87,7 +87,7 @@ public class ReceiptoutInfoVO{
@JsonProperty("receiptout_item0List") @JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List; private List<Receiptout_item0Model> receiptout_item0List;
// /** 来源单号销售id **/ /** 来源单号销售id **/
// @TableField("salesId") @TableField("salesId")
// private String salesId; private String salesId;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java
Unescape View File

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutListQuery extends Pagination { public class ReceiptoutListQuery extends Pagination {
@ -20,6 +20,9 @@ public class ReceiptoutListQuery extends Pagination {
/** 业务类型 */ /** 业务类型 */
private String type; private String type;
/** 客户名称 */
private String customerName;
/** /**
* 菜单id * 菜单id
*/ */

16
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java
Unescape View File

@ -16,7 +16,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutListVO{ public class ReceiptoutListVO{
@ -36,8 +36,8 @@ public class ReceiptoutListVO{
/** 来源单号 **/ /** 来源单号 **/
@JsonProperty("salesId") @JsonProperty("sourceNo")
private String salesId; private String sourceNo;
/** 出库金额 **/ /** 出库金额 **/
@ -56,8 +56,8 @@ public class ReceiptoutListVO{
/** 客户名称 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerName")
private String customerId; private String customerName;
/** 备注 **/ /** 备注 **/
@ -98,9 +98,9 @@ public class ReceiptoutListVO{
private String lastModifyUserName; private String lastModifyUserName;
// /** 来源单号销售id **/ /** 来源单号销售id **/
// @TableField("salesId") @TableField("salesId")
// private String salesId; private String salesId;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutPagination extends Pagination { public class ReceiptoutPagination extends Pagination {
@ -21,6 +21,9 @@ public class ReceiptoutPagination extends Pagination {
/** 业务类型 */ /** 业务类型 */
private String type; private String type;
/** 客户名称 */
private String customerName;
/** /**
* 菜单id * 菜单id
*/ */

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutPaginationExportModel extends Pagination { public class ReceiptoutPaginationExportModel extends Pagination {
@ -26,4 +26,7 @@ public class ReceiptoutPaginationExportModel extends Pagination {
/** 业务类型 */ /** 业务类型 */
private String type; private String type;
/** 客户名称 */
private String customerName;
} }

16
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java
Unescape View File

@ -17,7 +17,7 @@ import lombok.Data;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-24 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptoutUpForm{ public class ReceiptoutUpForm{
@ -36,8 +36,8 @@ public class ReceiptoutUpForm{
/** 来源单号 **/ /** 来源单号 **/
@JsonProperty("salesId") @JsonProperty("sourceNo")
private String salesId; private String sourceNo;
/** 出库金额 **/ /** 出库金额 **/
@ -56,8 +56,8 @@ public class ReceiptoutUpForm{
/** 客户名称 **/ /** 客户名称 **/
@JsonProperty("customerId") @JsonProperty("customerName")
private String customerId; private String customerName;
/** 备注 **/ /** 备注 **/
@ -98,8 +98,8 @@ public class ReceiptoutUpForm{
@JsonProperty("receiptout_item0List") @JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List; private List<Receiptout_item0Model> receiptout_item0List;
// /** 来源单号销售id **/ /** 来源单号销售id **/
// @TableField("salesId") @TableField("salesId")
// private String salesId; private String salesId;
} }

24
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
Unescape View File

@ -13,24 +13,24 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
@Data @Data
public class Receiptout_item0Model { public class Receiptout_item0Model {
/** 车牌号 **/ /** 车牌号 **/
@JsonProperty("vehicleId") @JsonProperty("licenseNo")
private String vehicleId; private String licenseNo;
/** 物料名称 **/ /** 物料名称 **/
@JsonProperty("materialId") @JsonProperty("materialName")
private String materialId; private String materialName;
/** 库区名称 **/ /** 库区id **/
@JsonProperty("reservoirareaId") @JsonProperty("reservoirareaId")
private String reservoirareaId; private String reservoirareaId;
/** 仓库名称 **/ /** 仓库id **/
@JsonProperty("warehouseId") @JsonProperty("warehouseId")
private String warehouseId; private String warehouseId;
@ -63,11 +63,11 @@ public class Receiptout_item0Model {
private String batchNo; private String batchNo;
/** 磅单类型 **/ /** 磅单类型 **/
@JsonProperty("poundType") @JsonProperty("deleteUserId")
private String poundType; private String deleteUserId;
// /** 磅单类型 **/ /** 磅单类型 **/
// @JsonProperty("vehicleId") @JsonProperty("vehicleId")
// private String vehicleId; private String vehicleId;
} }

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

@ -12,7 +12,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
public interface ReceiptoutService extends IService<ReceiptoutEntity> { public interface ReceiptoutService extends IService<ReceiptoutEntity> {

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
public interface Receiptout_item0Service extends IService<Receiptout_item0Entity> { public interface Receiptout_item0Service extends IService<Receiptout_item0Entity> {

12
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
Unescape View File

@ -38,7 +38,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
@Service @Service
public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, ReceiptoutEntity> implements ReceiptoutService{ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, ReceiptoutEntity> implements ReceiptoutService{
@ -119,6 +119,11 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType()); receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType());
} }
if(StringUtil.isNotEmpty(receiptoutPagination.getCustomerName())){
receiptoutNum++;
receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getCustomerName,receiptoutPagination.getCustomerName());
}
if(AllIdList.size()>0){ if(AllIdList.size()>0){
receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList); receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList);
} }
@ -208,6 +213,11 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType()); receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType());
} }
if(StringUtil.isNotEmpty(receiptoutPagination.getCustomerName())){
receiptoutNum++;
receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getCustomerName,receiptoutPagination.getCustomerName());
}
if(AllIdList.size()>0){ if(AllIdList.size()>0){
receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList); receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList);
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-24 * 日期： 2023-02-08
*/ */
@Service @Service
public class Receiptout_item0ServiceImpl extends ServiceImpl<Receiptout_item0Mapper, Receiptout_item0Entity> implements Receiptout_item0Service{ public class Receiptout_item0ServiceImpl extends ServiceImpl<Receiptout_item0Mapper, Receiptout_item0Entity> implements Receiptout_item0Service{

118
SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java
Unescape View File

@ -16,10 +16,15 @@ import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.saleback.model.saleback.*; import jnpf.saleback.model.saleback.*;
import jnpf.saleback.model.saleback.SalebackPagination; import jnpf.saleback.model.saleback.SalebackPagination;
import jnpf.saleback.entity.*;
import jnpf.saleback.entity.Saleback_item0Entity; import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.util.*; import jnpf.util.*;
import jnpf.base.util.*;
import jnpf.base.vo.ListVO;
import jnpf.util.context.SpringContext;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import lombok.Cleanup; import lombok.Cleanup;
@ -29,11 +34,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import jnpf.saleback.entity.SalebackEntity; import jnpf.saleback.entity.SalebackEntity;
import jnpf.saleback.service.SalebackService; import jnpf.saleback.service.SalebackService;
import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleback.service.Saleback_item0Service; import jnpf.saleback.service.Saleback_item0Service;
import jnpf.saleback.service.SaleorderService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
@ -71,32 +79,8 @@ public class SalebackController {
@Autowired @Autowired
private Saleback_item0Service saleback_item0Service; private Saleback_item0Service saleback_item0Service;
@Autowired
// /** private SaleorderService saleorderService;
// * 流程创建
// *
// * @param salebackCrForm
// * @return
// */
// @PostMapping
// @Transactional
// public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException {
// String mainId =RandomUtil.uuId();
// UserInfo userInfo=userProvider.get();
// salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
// salebackCrForm.setCreatorTime(DateUtil.getNow());
// salebackCrForm.setCreatorUserName(userInfo.getUserId());
// SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class);
// entity.setId(mainId);
// salebackService.save(entity);
// List<Saleback_item0Entity> Saleback_item0List = JsonUtil.getJsonToList(salebackCrForm.getSaleback_item0List(),Saleback_item0Entity.class);
// for(Saleback_item0Entity entitys : Saleback_item0List){
// entitys.setId(RandomUtil.uuId());
// entitys.setSalesBackId(entity.getId());
// saleback_item0Service.save(entitys);
// }
// return ActionResult.success("创建成功");
// }
/** /**
@ -115,7 +99,12 @@ public class SalebackController {
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
} }
List<SalebackListVO> listVO=JsonUtil.getJsonToList(list,SalebackListVO.class); List<SalebackListVO> listVO=JsonUtil.getJsonToList(list,SalebackListVO.class);
for(SalebackListVO salebackVO:listVO){
SaleorderEntity saleorderEntity = salebackService.getSaleorder(salebackVO.getSalesOrderId());
if(ObjectUtil.isNotEmpty(saleorderEntity)){
salebackVO.setJg_salesorder(JsonUtil.getJsonToBean(saleorderEntity,SaleorderListVO.class));
}
}
PageListVO vo=new PageListVO(); PageListVO vo=new PageListVO();
@ -137,7 +126,6 @@ public class SalebackController {
public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException { public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
salebackCrForm.setCreatorTime(DateUtil.getNow()); salebackCrForm.setCreatorTime(DateUtil.getNow());
salebackCrForm.setCreatorUserName(userInfo.getUserId()); salebackCrForm.setCreatorUserName(userInfo.getUserId());
SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class); SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class);
@ -147,8 +135,29 @@ public class SalebackController {
for(Saleback_item0Entity entitys : Saleback_item0List){ for(Saleback_item0Entity entitys : Saleback_item0List){
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setSalesBackId(entity.getId()); entitys.setSalesBackId(entity.getId());
saleback_item0Service.save(entitys); saleback_item0Service.save(entitys);
} }
//子表数据
if(ObjectUtil.isNotEmpty(salebackCrForm.getJg_salesorder())){
SaleorderEntity jg_salesorderentity = JsonUtil.getJsonToBean(salebackCrForm.getJg_salesorder(), SaleorderEntity.class);
jg_salesorderentity.setId(entity.getSalesOrderId());
//自动生成的字段
jg_salesorderentity.setId(mainId);
saleorderService.save(jg_salesorderentity);
}
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
@ -192,7 +201,12 @@ public class SalebackController {
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
} }
List<SalebackListVO> listVO=JsonUtil.getJsonToList(list,SalebackListVO.class); List<SalebackListVO> listVO=JsonUtil.getJsonToList(list,SalebackListVO.class);
for(SalebackListVO salebackVO:listVO){
SaleorderEntity saleorderEntity = salebackService.getSaleorder(salebackVO.getSalesOrderId());
if(ObjectUtil.isNotEmpty(saleorderEntity)){
salebackVO.setJg_salesorder(JsonUtil.getJsonToBean(saleorderEntity,SaleorderListVO.class));
}
}
//转换为map输出 //转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
@ -326,6 +340,11 @@ public class SalebackController {
for(Saleback_item0Entity saleback_item0Entity : Saleback_item0List){ for(Saleback_item0Entity saleback_item0Entity : Saleback_item0List){
} }
vo.setSaleback_item0List(JsonUtil.getJsonToList(Saleback_item0List,Saleback_item0Model.class )); vo.setSaleback_item0List(JsonUtil.getJsonToList(Saleback_item0List,Saleback_item0Model.class ));
//副表
QueryWrapper<SaleorderEntity> queryWrapperSaleorder = new QueryWrapper<>();
queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId());
SaleorderEntity jg_salesorderEntity = saleorderService.getOne(queryWrapperSaleorder);
vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class));
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -345,16 +364,19 @@ public class SalebackController {
List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class); List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class);
for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){ for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
Map<String,Object> licenseNumMap = new HashMap<>(); Map<String,Object> licenseNumMap = new HashMap<>();
jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap)); jg_salesback_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383568082196537541","license_num","license_num",jg_salesback_item0Model.getLicenseNum(),licenseNumMap));
Map<String,Object> materialIdMap = new HashMap<>();
jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap));
Map<String,Object> businessIdMap = new HashMap<>();
jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap));
} }
vo.setSaleback_item0List(jg_salesback_item0ModelList); vo.setSaleback_item0List(jg_salesback_item0ModelList);
//附表数据转换
QueryWrapper<SaleorderEntity> queryWrapperSaleorder = new QueryWrapper<>();
queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId());
SaleorderEntity jg_salesorderEntity = saleorderService.getOne(queryWrapperSaleorder);
// vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class)); if(ObjectUtil.isEmpty(jg_salesorderEntity)){
jg_salesorderEntity = new SaleorderEntity();
}
vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class));
//添加到详情表单对象中 //添加到详情表单对象中
Map<String,Object> salesOrderIdMap = new HashMap<>(); Map<String,Object> salesOrderIdMap = new HashMap<>();
@ -405,16 +427,16 @@ public class SalebackController {
saleback_item0Service.save(entitys); saleback_item0Service.save(entitys);
} }
// //子表数据 //子表数据
// if(ObjectUtil.isNotEmpty(salebackUpForm.getJg_salesorder())){ if(ObjectUtil.isNotEmpty(salebackUpForm.getJg_salesorder())){
// QueryWrapper<SaleorderEntity> queryWrapperSaleorder =new QueryWrapper<>(); QueryWrapper<SaleorderEntity> queryWrapperSaleorder =new QueryWrapper<>();
// queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId()); queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId());
// SaleorderEntity jg_salesorderOneEntity= saleorderService.getOne(queryWrapperSaleorder); SaleorderEntity jg_salesorderOneEntity= saleorderService.getOne(queryWrapperSaleorder);
// SaleorderEntity jg_salesorderentity=JsonUtil.getJsonToBean(salebackUpForm.getJg_salesorder(), SaleorderEntity.class); SaleorderEntity jg_salesorderentity=JsonUtil.getJsonToBean(salebackUpForm.getJg_salesorder(), SaleorderEntity.class);
// jg_salesorderentity.setId(jg_salesorderOneEntity.getId()); jg_salesorderentity.setId(jg_salesorderOneEntity.getId());
// jg_salesorderentity.setId(entity.getSalesOrderId()); jg_salesorderentity.setId(entity.getSalesOrderId());
// saleorderService.updateById(jg_salesorderentity); saleorderService.updateById(jg_salesorderentity);
// } }
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ }else{
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
@ -439,7 +461,9 @@ public class SalebackController {
queryWrapperSaleback_item0.lambda().eq(Saleback_item0Entity::getSalesBackId,entity.getId()); queryWrapperSaleback_item0.lambda().eq(Saleback_item0Entity::getSalesBackId,entity.getId());
saleback_item0Service.remove(queryWrapperSaleback_item0); saleback_item0Service.remove(queryWrapperSaleback_item0);
//子表数据 //子表数据
QueryWrapper<SaleorderEntity> queryWrapperSaleorder=new QueryWrapper<>();
queryWrapperSaleorder.lambda().eq(SaleorderEntity::getId,entity.getSalesOrderId());
saleorderService.remove(queryWrapperSaleorder);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");

8
SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
Unescape View File

@ -80,8 +80,8 @@ public class Saleback_item0Entity {
@TableField("MATERIAL_NAME") @TableField("MATERIAL_NAME")
private String materialName; private String materialName;
@TableField("BUSINESS_ID") @TableField("POUNT_USER")
private String businessId; private String pountUser;
@TableField("POUNT_TYPE") @TableField("POUNT_TYPE")
private String pountType; private String pountType;
@ -107,8 +107,4 @@ public class Saleback_item0Entity {
@TableField("VEHICLE_ID") @TableField("VEHICLE_ID")
private String vehicleId; private String vehicleId;
@TableField("MATERIAL_ID")
private String materialId;
} }

156
SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SaleorderEntity.java
Unescape View File

@ -0,0 +1,156 @@
package jnpf.saleback.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* 销售订单
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-13
*/
@Data
@TableName("jg_salesorder")
public class SaleorderEntity {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("DOCUMENT_NO")
private String documentNo;
@TableField("ERP_NO")
private String erpNo;
@TableField("SOURCE_PO_NO")
private String sourcePoNo;
@TableField("CONTRACT_CODE")
private String contractCode;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("CONTRACT_NO")
private String contractNo;
@TableField("COSTOMER_CODE")
private String costomerCode;
@TableField("COSTOMER_NAME")
private String costomerName;
@TableField("NUM")
private BigDecimal num;
@TableField("PRICE")
private BigDecimal price;
@TableField("NOT_PRICE")
private BigDecimal notPrice;
@TableField("RATE")
private BigDecimal rate;
@TableField("POUND_NUM")
private Integer poundNum;
@TableField("CURRENCY")
private String currency;
@TableField("ADVANCE_AMOUNT")
private BigDecimal advanceAmount;
@TableField("AMOUNT_COLLECTED")
private BigDecimal amountCollected;
@TableField("INVOICE_NUM")
private BigDecimal invoiceNum;
@TableField("INVOICE_AMOUNT")
private BigDecimal invoiceAmount;
@TableField("RETURN_QUANTITY")
private BigDecimal returnQuantity;
@TableField("REF_AMOUNT")
private BigDecimal reamount;
@TableField("STATUS")
private String status;
@TableField("SOURCE_SYSTEM")
private String sourceSystem;
@TableField("IS_SETTLE")
private String isSettle;
@TableField("ISSUE")
private String issue;
@TableField("REMARK")
private String remark;
@TableField("CLOSING_DATE")
private Date closingDate;
@TableField("OVERDUE_INTEREST")
private BigDecimal overdueInterest;
}

17
SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SaleorderMapper.java
Unescape View File

@ -0,0 +1,17 @@
package jnpf.saleback.mapper;
import jnpf.saleback.entity.SaleorderEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_salesorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-13
*/
public interface SaleorderMapper extends BaseMapper<SaleorderEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackCrForm.java
Unescape View File

@ -64,8 +64,8 @@ public class SalebackCrForm {
@JsonProperty("saleback_item0List") @JsonProperty("saleback_item0List")
private List<Saleback_item0Model> saleback_item0List; private List<Saleback_item0Model> saleback_item0List;
// /** 列表子表数据 **/ /** 列表子表数据 **/
// @JsonProperty("jg_salesorder") @JsonProperty("jg_salesorder")
// private SaleorderModel jg_salesorder; private SaleorderModel jg_salesorder;
} }

6
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackInfoVO.java
Unescape View File

@ -68,7 +68,7 @@ public class SalebackInfoVO{
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("saleback_item0List") @JsonProperty("saleback_item0List")
private List<Saleback_item0Model> saleback_item0List; private List<Saleback_item0Model> saleback_item0List;
// /** 列表子表数据 **/ /** 列表子表数据 **/
// @JsonProperty("jg_salesorder") @JsonProperty("jg_salesorder")
// private SaleorderModel jg_salesorder; private SaleorderModel jg_salesorder;
} }

8
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java
Unescape View File

@ -74,8 +74,8 @@ public class SalebackListVO{
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
//
// /**列表子表数据 */ /**列表子表数据 */
// @JsonProperty("jg_salesorder") @JsonProperty("jg_salesorder")
// private SaleorderListVO jg_salesorder; private SaleorderListVO jg_salesorder;
} }

8
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackUpForm.java
Unescape View File

@ -76,8 +76,8 @@ public class SalebackUpForm{
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("saleback_item0List") @JsonProperty("saleback_item0List")
private List<Saleback_item0Model> saleback_item0List; private List<Saleback_item0Model> saleback_item0List;
//
// /** 列表子表数据 **/ /** 列表子表数据 **/
// @JsonProperty("jg_salesorder") @JsonProperty("jg_salesorder")
// private SaleorderModel jg_salesorder; private SaleorderModel jg_salesorder;
} }

15
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java
Unescape View File

@ -19,12 +19,12 @@ import com.alibaba.fastjson.annotation.JSONField;
public class Saleback_item0Model { public class Saleback_item0Model {
/** 车牌号 **/ /** 车牌号 **/
@JsonProperty("vehicleId") @JsonProperty("licenseNum")
private String vehicleId; private String licenseNum;
/** 物料名称 **/ /** 物料名称 **/
@JsonProperty("materialId") @JsonProperty("materialName")
private String materialId; private String materialName;
/** 结算重量 **/ /** 结算重量 **/
@JsonProperty("settlement") @JsonProperty("settlement")
@ -51,15 +51,12 @@ public class Saleback_item0Model {
private String notAmount; private String notAmount;
/** 业务员 **/ /** 业务员 **/
@JsonProperty("businessId") @JsonProperty("pountUser")
private String businessId; private String pountUser;
/** 磅单类型 **/ /** 磅单类型 **/
@JsonProperty("pountType") @JsonProperty("pountType")
private String pountType; private String pountType;
@JsonProperty("salesorderItem0Id")
private String salesorderItem0Id;
} }

28
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderListVO.java
Unescape View File

@ -0,0 +1,28 @@
package jnpf.saleback.model.saleback;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.math.BigDecimal;
/**
*
*
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-13
*/
@Data
public class SaleorderListVO{
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 客户名称 **/
@JsonProperty("costomerName")
private String costomerName;
}

30
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SaleorderModel.java
Unescape View File

@ -0,0 +1,30 @@
package jnpf.saleback.model.saleback;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
*
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-13
*/
@Data
public class SaleorderModel {
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 客户名称 **/
@JsonProperty("costomerName")
private String costomerName;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java
Unescape View File

@ -1,8 +1,10 @@
package jnpf.saleback.service; package jnpf.saleback.service;
import jnpf.saleback.entity.Saleback_item0Entity; import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleback.service.Saleback_item0Service;
import jnpf.saleback.entity.SalebackEntity; import jnpf.saleback.entity.SalebackEntity;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.saleback.entity.SaleorderEntity;
import jnpf.saleback.model.saleback.SalebackPagination; import jnpf.saleback.model.saleback.SalebackPagination;
import java.util.*; import java.util.*;
/** /**
@ -32,6 +34,7 @@ public interface SalebackService extends IService<SalebackEntity> {
// 子表方法 // 子表方法
List<Saleback_item0Entity> GetSaleback_item0List(String id); List<Saleback_item0Entity> GetSaleback_item0List(String id);
//列表子表数据方法
SaleorderEntity getSaleorder(String id);
} }

15
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SaleorderService.java
Unescape View File

@ -0,0 +1,15 @@
package jnpf.saleback.service;
import jnpf.saleback.entity.SaleorderEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_salesorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-13
*/
public interface SaleorderService extends IService<SaleorderEntity> {
}

47
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -50,6 +50,8 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
@Autowired @Autowired
private AuthorizeService authorizeService; private AuthorizeService authorizeService;
@Autowired
private SaleorderService saleorderService;
@Autowired @Autowired
private Saleback_item0Service saleback_item0Service; private Saleback_item0Service saleback_item0Service;
@ -66,7 +68,8 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>(); QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
int saleback_item0Num =0; int saleback_item0Num =0;
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -85,6 +88,13 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} else { } else {
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj; saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++; saleback_item0Num++;
}
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
} }
} }
} }
@ -108,6 +118,14 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
} }
} }
@ -152,7 +170,8 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>(); QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
int saleback_item0Num =0; int saleback_item0Num =0;
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>(); QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -172,7 +191,13 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj; saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++; saleback_item0Num++;
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
} }
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
@ -195,7 +220,13 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
} }
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
} }
@ -268,7 +299,13 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
return saleback_item0Service.list(queryWrapper); return saleback_item0Service.list(queryWrapper);
} }
//列表子表数据方法
@Override
public SaleorderEntity getSaleorder(String id){
QueryWrapper<SaleorderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderEntity::getId, id);
return saleorderService.getOne(queryWrapper);
}
} }

41
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SaleorderServiceImpl.java
Unescape View File

@ -0,0 +1,41 @@
package jnpf.saleback.service.impl;
import jnpf.saleback.entity.*;
import jnpf.saleback.mapper.SaleorderMapper;
import jnpf.saleback.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
/**
*
* jg_salesorder
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-13
*/
@Service
public class SaleorderServiceImpl extends ServiceImpl<SaleorderMapper, SaleorderEntity> implements SaleorderService{
}

661
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java
Unescape View File

@ -0,0 +1,661 @@
package jnpf.saleorder.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
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.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 org.springframework.transaction.annotation.Transactional;
import jnpf.saleorder.model.saleorder.*;
import jnpf.saleorder.model.saleorder.SaleorderPagination;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import jnpf.util.*;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import jnpf.saleorder.service.ReceiptoutsoitemService;
import jnpf.saleorder.service.CollectionsoitemService;
import jnpf.saleorder.service.Arinvoices_item0soitemService;
import jnpf.saleorder.service.SalesbacksoitemService;
import jnpf.saleorder.service.PaymentsoitemService;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import javax.validation.Valid;
import java.io.FileOutputStream;
import java.io.IOException;
import jnpf.util.GeneraterSwapUtil;
import java.util.*;
import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum;
/**
*
* saleorder
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-03
*/
@Slf4j
@RestController
@Api(tags = "saleorder" , value = "saleorder")
@RequestMapping("/api/saleorder/Saleorder")
public class SaleorderController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private ConfigValueUtil configValueUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private SaleorderitemService saleorderitemService;
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private ReceiptoutsoitemService receiptoutsoitemService;
@Autowired
private CollectionsoitemService collectionsoitemService;
@Autowired
private Arinvoices_item0soitemService arinvoices_item0soitemService;
@Autowired
private SalesbacksoitemService salesbacksoitemService;
@Autowired
private PaymentsoitemService paymentsoitemService;
/**
* 列表
*
* @param saleorderPagination
* @return
*/
@PostMapping("/getList")
public ActionResult list(@RequestBody SaleorderPagination saleorderPagination)throws IOException{
List<SaleorderitemEntity> list= saleorderitemService.getList(saleorderPagination);
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<SaleorderListVO> listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class);
for(SaleorderListVO saleorderVO:listVO){
}
PageListVO vo=new PageListVO();
vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(saleorderPagination,PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
* @param saleorderCrForm
* @return
*/
@PostMapping
@Transactional
public ActionResult create(@RequestBody @Valid SaleorderCrForm saleorderCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
saleorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("bxdj", false));
saleorderCrForm.setCreatorUserName(userInfo.getUserId());
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderCrForm, SaleorderitemEntity.class);
entity.setId(mainId);
saleorderitemService.save(entity);
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for(Salesorder_item0Entity entitys : Salesorder_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesorder_item0Service.save(entitys);
}
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSourceNo(entity.getDocumentNo());
receiptoutsoitemService.save(entitys);
}
List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
for(CollectionsoitemEntity entitys : CollectionsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionsoitemService.save(entitys);
}
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
arinvoices_item0soitemService.save(entitys);
}
List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesbacksoitemService.save(entitys);
}
List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
for(PaymentsoitemEntity entitys : PaymentsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entity.getDocumentNo());
paymentsoitemService.save(entitys);
}
return ActionResult.success("创建成功");
}
/**
* 模板下载
*
* @return
*/
@ApiOperation("模板下载")
@GetMapping("/templateDownload")
public ActionResult<DownloadVO> TemplateDownload(){
UserInfo userInfo=userProvider.get();
DownloadVO vo=DownloadVO.builder().build();
try{
vo.setName("职员信息.xlsx");
vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
}catch(Exception e){
log.error("信息导出Excel错误:{}" ,e.getMessage());
}
return ActionResult.success(vo);
}
/**
* 导出Excel
*
* @return
*/
@ApiOperation("导出Excel")
@GetMapping("/Actions/Export")
public ActionResult Export(SaleorderPaginationExportModel saleorderPaginationExportModel) throws IOException {
if (StringUtil.isEmpty(saleorderPaginationExportModel.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
SaleorderPagination saleorderPagination=JsonUtil.getJsonToBean(saleorderPaginationExportModel, SaleorderPagination.class);
List<SaleorderitemEntity> list= saleorderitemService.getTypeList(saleorderPagination,saleorderPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<SaleorderListVO> listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class);
for(SaleorderListVO saleorderVO:listVO){
}
//转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
String[]keys=!StringUtil.isEmpty(saleorderPaginationExportModel.getSelectKey())?saleorderPaginationExportModel.getSelectKey().split(","):new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
return ActionResult.success(vo);
}
//导出表格
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "contractNo" :
entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "num" :
entitys.add(new ExcelExportEntity("数量" ,"num"));
break;
case "price" :
entitys.add(new ExcelExportEntity("金额" ,"price"));
break;
case "notPrice" :
entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
case "costomerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"costomerName"));
break;
case "amountCollected" :
entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected"));
break;
case "invoiceNum" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum"));
break;
case "invoiceAmount" :
entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
break;
case "sourceSystem" :
entitys.add(new ExcelExportEntity("来源系统" ,"sourceSystem"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
}
String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
String fileName = configValueUtil.getTemporaryFilePath() + name;
@Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
workbook.write(output);
//上传文件
UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
vo.setName(name);
vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
* 批量删除
*
* @param ids
* @return
*/
@DeleteMapping("/batchRemove/{ids}")
@Transactional
public ActionResult batchRemove(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
int i =0;
for (String allId : idList){
this.delete(allId);
i++;
}
if (i == 0 ){
return ActionResult.fail("删除失败");
}
return ActionResult.success("删除成功");
}
/**
* 信息
*
* @param id
* @return
*/
@GetMapping("/{id}")
public ActionResult<SaleorderInfoVO> info(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
SaleorderInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderInfoVO.class);
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
//子表
List<Salesorder_item0Entity> Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
}
vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class ));
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id);
for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){
}
vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class ));
List<CollectionsoitemEntity> CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id);
for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){
}
vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class ));
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id);
for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){
}
vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class ));
List<SalesbacksoitemEntity> SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id);
for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){
}
vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class ));
List<PaymentsoitemEntity> PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id);
for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){
}
vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class ));
//副表
return ActionResult.success(vo);
}
/**
* 表单信息(详情页)
*
* @param id
* @return
*/
@GetMapping("/detail/{id}")
public ActionResult<SaleorderInfoVO> detailInfo(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
SaleorderInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderInfoVO.class);
//子表数据转换
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
Map<String,Object> vehicleIdMap = new HashMap<>();
// jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("391151974030035653","vehicle_id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
}
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
List<ReceiptoutsoitemModel> jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutsoitemModel.class);
for(ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList){
}
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(id);
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionsoitemModel.class);
for(CollectionsoitemModel jg_collectionModel : jg_collectionModelList){
}
vo.setCollectionsoitemList(jg_collectionModelList);
List<Arinvoices_item0soitemEntity> jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(id);
List<Arinvoices_item0soitemModel> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0soitemModel.class);
for(Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
}
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
}
vo.setSalesbacksoitemList(jg_salesbackModelList);
List<PaymentsoitemEntity> jg_paymentList = saleorderitemService.GetPaymentsoitemList(id);
List<PaymentsoitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class);
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
vo.setPaymentsoitemList(jg_paymentModelList);
//附表数据转换
//添加到详情表单对象中
Map<String,Object> contractNameMap = new HashMap<>();
vo.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",vo.getContractName(),contractNameMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
return ActionResult.success(vo);
}
/**
* 更新
*
* @param id
* @return
*/
@PutMapping("/{id}")
@Transactional
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SaleorderUpForm saleorderUpForm) throws DataException {
UserInfo userInfo=userProvider.get();
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderUpForm, SaleorderitemEntity.class);
subentity.setCreatorUserName(entity.getCreatorUserName());
saleorderitemService.update(id, subentity);
QueryWrapper<Salesorder_item0Entity> Salesorder_item0queryWrapper = new QueryWrapper<>();
Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId());
salesorder_item0Service.remove(Salesorder_item0queryWrapper);
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for(Salesorder_item0Entity entitys : Salesorder_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesorder_item0Service.save(entitys);
}
QueryWrapper<ReceiptoutsoitemEntity> ReceiptoutsoitemqueryWrapper = new QueryWrapper<>();
ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo());
receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper);
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSourceNo(entity.getDocumentNo());
receiptoutsoitemService.save(entitys);
}
QueryWrapper<CollectionsoitemEntity> CollectionsoitemqueryWrapper = new QueryWrapper<>();
CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo());
collectionsoitemService.remove(CollectionsoitemqueryWrapper);
List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
for(CollectionsoitemEntity entitys : CollectionsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionsoitemService.save(entitys);
}
QueryWrapper<Arinvoices_item0soitemEntity> Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>();
Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo());
arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper);
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
arinvoices_item0soitemService.save(entitys);
}
QueryWrapper<SalesbacksoitemEntity> SalesbacksoitemqueryWrapper = new QueryWrapper<>();
SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId());
salesbacksoitemService.remove(SalesbacksoitemqueryWrapper);
List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesbacksoitemService.save(entitys);
}
QueryWrapper<PaymentsoitemEntity> PaymentsoitemqueryWrapper = new QueryWrapper<>();
PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo());
paymentsoitemService.remove(PaymentsoitemqueryWrapper);
List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
for(PaymentsoitemEntity entitys : PaymentsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entity.getDocumentNo());
paymentsoitemService.save(entitys);
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
*
* @param id
* @return
*/
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
saleorderitemService.delete(entity);
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
salesorder_item0Service.remove(queryWrapperSalesorder_item0);
QueryWrapper<ReceiptoutsoitemEntity> queryWrapperReceiptoutsoitem=new QueryWrapper<>();
queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo());
receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem);
QueryWrapper<CollectionsoitemEntity> queryWrapperCollectionsoitem=new QueryWrapper<>();
queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo());
collectionsoitemService.remove(queryWrapperCollectionsoitem);
QueryWrapper<Arinvoices_item0soitemEntity> queryWrapperArinvoices_item0soitem=new QueryWrapper<>();
queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo());
arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem);
QueryWrapper<SalesbacksoitemEntity> queryWrapperSalesbacksoitem=new QueryWrapper<>();
queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId());
salesbacksoitemService.remove(queryWrapperSalesbacksoitem);
QueryWrapper<PaymentsoitemEntity> queryWrapperPaymentsoitem=new QueryWrapper<>();
queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo());
paymentsoitemService.remove(queryWrapperPaymentsoitem);
}
return ActionResult.success("删除成功");
}
}

833
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -1,833 +0,0 @@
package jnpf.saleorder.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
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.arinvoices.entity.ArinvoicesEntity;
import jnpf.arinvoices.service.ArinvoicesService;
import jnpf.base.ActionResult;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.collection.entity.Collection_item0Entity;
import jnpf.collection.service.Collection_item0Service;
import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException;
import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.receiptout.entity.ReceiptoutEntity;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.receiptout.service.ReceiptoutService;
import jnpf.receiptout.service.Receiptout_item0Service;
import jnpf.reservoirarea.entity.ReservoirareaEntity;
import jnpf.reservoirarea.service.ReservoirareaService;
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.saleorder.model.saleorderitem.*;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import jnpf.util.*;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.Salesorder_item0Service;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import jnpf.saleorder.service.ReceiptoutsoitemService;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import jnpf.saleorder.service.Arinvoices_item0soitemService;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import jnpf.saleorder.service.CollectionsoitemService;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import jnpf.saleorder.service.SalesbacksoitemService;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import jnpf.saleorder.service.PaymentsoitemService;
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 jnpf.util.GeneraterSwapUtil;
import java.util.*;
import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum;
/**
*
* saleorder
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22
*/
@Slf4j
@RestController
@Api(tags = "saleorder" , value = "saleorder")
@RequestMapping("/api/saleorder/Saleorderitem")
public class SaleorderitemController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private ConfigValueUtil configValueUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private SaleorderitemService saleorderitemService;
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private ReceiptoutsoitemService receiptoutsoitemService;
@Autowired
private Arinvoices_item0soitemService arinvoices_item0soitemService;
@Autowired
private CollectionsoitemService collectionsoitemService;
@Autowired
private SalesbacksoitemService salesbacksoitemService;
@Autowired
private PaymentsoitemService paymentsoitemService;
@Autowired
private Receiptout_item0Service receiptout_item0Service;
@Autowired
private PoundlistService poundlistService;
@Autowired
private MaterialService materialService;
@Autowired
private ReservoirareaService reservoirareaService;
@Autowired
private ReceiptoutService receiptoutService;
@Autowired
private ArinvoicesService arinvoicesService;
@Autowired
private Collection_item0Service collection_item0Service;
/**
* 发货
*
* @param ids
* @return
*/
@PostMapping("/delivery/{ids}")
public ActionResult delivery(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"0");
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList){
QueryWrapper<MaterialEntity> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.lambda().eq(MaterialEntity::getId,entity.getMaterialId());
MaterialEntity materialEntity = materialService.getOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(materialEntity)) {
entity.setReservoirareaId(materialEntity.getOutArea());
QueryWrapper<ReservoirareaEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(ReservoirareaEntity::getId,materialEntity.getOutArea());
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getOne(queryWrapper3);
entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
}
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
}
saleorderitemEntity.setList(dList);
list.add(saleorderitemEntity);
}else{
return ActionResult.fail("数据状态不能发货");
}
}
return ActionResult.success(list);
}
/**
* 发票录入
*
* @param ids
* @return
*/
@PostMapping("/invoiceentry/{ids}")
public ActionResult invoiceEntry(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList) {
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"1");
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList){
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
}
saleorderitemEntity.setList(dList);
list.add(saleorderitemEntity);
}else{
return ActionResult.fail("数据状态不能发票录入");
}
}
return ActionResult.success(list);
}
/**
* 归档
*
* @param ids
* @return
*/
@PostMapping("/archive/{ids}")
public ActionResult archive(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
for (String id : idList) {
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(sale)){
if (sale.getStatus().equals("3")){
return ActionResult.fail("该数据已归档");
}
if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){
sale.setStatus("3");
saleorderitemService.updateById(sale);
}else{
return ActionResult.fail("发票金额、金额、已付款金额不一致");
}
}else {
return ActionResult.fail("未找到该数据");
}
}
return ActionResult.success("归档成功");
}
/**
* 退货
*
* @param ids
* @return
*/
@PostMapping("/materialback/{ids}")
public ActionResult materialBack(@PathVariable("ids") String ids) {
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
if (saleorderitemEntity.getStatus().equals("0")){
return ActionResult.fail("未发货，无需退货");
}
if (saleorderitemEntity.getStatus().equals("3")){
return ActionResult.fail("已归档，无法退货");
}
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList){
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
}
saleorderitemEntity.setList(dList);
list.add(saleorderitemEntity);
}else{
return ActionResult.fail("未找到该数据");
}
}
return ActionResult.success(list);
}
/**
* 回款
*
* @param ids
* @return
*/
@PostMapping("/collection/{ids}")
public ActionResult collection(@PathVariable("ids") String ids) {
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"2");
SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(sale)){
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, sale.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList){
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
}
sale.setList(dList);
list.add(sale);
}else{
return ActionResult.fail("数据状态无法回款");
}
}
return ActionResult.success(list);
}
/**
* 列表
*
* @param saleorderitemPagination
* @return
*/
@PostMapping("/getList")
public ActionResult list(@RequestBody SaleorderitemPagination saleorderitemPagination)throws IOException{
List<SaleorderitemEntity> list= saleorderitemService.getList(saleorderitemPagination);
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractCodeMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
Map<String,Object> costomerCodeMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
}
List<SaleorderitemListVO> listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class);
for(SaleorderitemListVO saleorderitemVO:listVO){
}
PageListVO vo=new PageListVO();
vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(saleorderitemPagination,PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
* @param saleorderitemCrForm
* @return
*/
@PostMapping
@Transactional
public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
saleorderitemCrForm.setCreatorUserName(userInfo.getUserId());
saleorderitemCrForm.setCreatorTime(DateUtil.getNow());
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class);
entity.setId(mainId);
saleorderitemService.save(entity);
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for(Salesorder_item0Entity entitys : Salesorder_item0List){
PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId());
poundlistEntity.setSalesStatus("0");
poundlistService.updateById(poundlistEntity);
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesorder_item0Service.save(entitys);
}
/* List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSourceNo(entity.getDocumentNo());
receiptoutsoitemService.save(entitys);
}
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
arinvoices_item0soitemService.save(entitys);
}
List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
for(CollectionsoitemEntity entitys : CollectionsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionsoitemService.save(entitys);
}
List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesbacksoitemService.save(entitys);
}
List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderitemCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
for(PaymentsoitemEntity entitys : PaymentsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entity.getDocumentNo());
paymentsoitemService.save(entitys);
}*/
return ActionResult.success("创建成功");
}
/**
* 模板下载
*
* @return
*/
@ApiOperation("模板下载")
@GetMapping("/templateDownload")
public ActionResult<DownloadVO> TemplateDownload(){
UserInfo userInfo=userProvider.get();
DownloadVO vo=DownloadVO.builder().build();
try{
vo.setName("职员信息.xlsx");
vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
}catch(Exception e){
log.error("信息导出Excel错误:{}" ,e.getMessage());
}
return ActionResult.success(vo);
}
/**
* 导出Excel
*
* @return
*/
@ApiOperation("导出Excel")
@GetMapping("/Actions/Export")
public ActionResult Export(SaleorderitemPaginationExportModel saleorderitemPaginationExportModel) throws IOException {
if (StringUtil.isEmpty(saleorderitemPaginationExportModel.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
SaleorderitemPagination saleorderitemPagination=JsonUtil.getJsonToBean(saleorderitemPaginationExportModel, SaleorderitemPagination.class);
List<SaleorderitemEntity> list= saleorderitemService.getTypeList(saleorderitemPagination,saleorderitemPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractCodeMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
Map<String,Object> costomerCodeMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
}
List<SaleorderitemListVO> listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class);
for(SaleorderitemListVO saleorderitemVO:listVO){
}
//转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
String[]keys=!StringUtil.isEmpty(saleorderitemPaginationExportModel.getSelectKey())?saleorderitemPaginationExportModel.getSelectKey().split(","):new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
return ActionResult.success(vo);
}
//导出表格
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "contractCode" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractCode"));
break;
case "costomerCode" :
entitys.add(new ExcelExportEntity("客户名称" ,"costomerCode"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "contractNo" :
entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "num" :
entitys.add(new ExcelExportEntity("重量" ,"num"));
break;
case "price" :
entitys.add(new ExcelExportEntity("金额" ,"price"));
break;
case "notPrice" :
entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
case "amountCollected" :
entitys.add(new ExcelExportEntity("已回款金额" ,"amountCollected"));
break;
case "invoiceNum" :
entitys.add(new ExcelExportEntity("发票数量" ,"invoiceNum"));
break;
case "invoiceAmount" :
entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
case "erpNo" :
entitys.add(new ExcelExportEntity("ERP订单号" ,"erpNo"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("制单时间" ,"creatorTime"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
}
String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
String fileName = configValueUtil.getTemporaryFilePath() + name;
@Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
workbook.write(output);
//上传文件
UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
vo.setName(name);
vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
* 批量删除
*
* @param ids
* @return
*/
@DeleteMapping("/batchRemove/{ids}")
@Transactional
public ActionResult batchRemove(@PathVariable("ids") String ids){
String[] idList = ids.split(",");
int i =0;
for (String allId : idList){
this.delete(allId);
i++;
}
if (i == 0 ){
return ActionResult.fail("删除失败");
}
return ActionResult.success("删除成功");
}
/**
* 信息
*
* @param id
* @return
*/
@GetMapping("/{id}")
public ActionResult<SaleorderitemInfoVO> info(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
SaleorderitemInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderitemInfoVO.class);
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
vo.setCreatorTime(vo.getCreatorTime());
//子表
List<Salesorder_item0Entity> Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
}
vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class ));
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id);
for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){
QueryWrapper<Receiptout_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutsoitemEntity.getId());
List<Receiptout_item0Entity> list = receiptout_item0Service.list(queryWrapper);
}
vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class ));
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id);
for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){
}
vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class ));
List<CollectionsoitemEntity> CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id);
for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){
}
vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class ));
List<SalesbacksoitemEntity> SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id);
for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){
}
vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class ));
List<PaymentsoitemEntity> PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id);
for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){
}
vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class ));
//副表
return ActionResult.success(vo);
}
/**
* 表单信息(详情页)
*
* @param id
* @return
*/
@GetMapping("/detail/{id}")
public ActionResult<SaleorderitemInfoVO> detailInfo(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
SaleorderitemInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderitemInfoVO.class);
//子表数据转换
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
Map<String,Object> vehicleIdMap = new HashMap<>();
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
Map<String,Object> materialIdMap = new HashMap<>();
jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
}
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
if (jg_receiptoutList.size()>0) {
List<Receiptout_item0Entity> list = saleorderitemService.getReceiptout(jg_receiptoutList.get(0).getId());
List<ReceiptoutsoitemModel> jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class);
for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) {
jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo());
jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime());
Map<String,Object> vehicleIdMap = new HashMap<>();
jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap));
Map<String,Object> materialIdMap = new HashMap<>();
jg_receiptoutModel.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptoutModel.getMaterialId(),materialIdMap));
Map<String,Object> reservoirareaIdMap = new HashMap<>();
jg_receiptoutModel.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptoutModel.getReservoirareaId(),reservoirareaIdMap));
Map<String,Object> warehouseMap = new HashMap<>();
jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap));
}
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
}
QueryWrapper<ArinvoicesEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id);
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
List<Arinvoices_item0soitemEntity> jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId());
List<Arinvoices_item0soitemModel> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class);
for (Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList) {
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
}
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
}
QueryWrapper<Collection_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id);
Collection_item0Entity collection_item0Entity = collection_item0Service.getOne(queryWrapper1);
if (ObjectUtils.isNotEmpty(collection_item0Entity)) {
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity.getCollectionId());
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList, CollectionsoitemModel.class);
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
}
vo.setCollectionsoitemList(jg_collectionModelList);
}
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
}
vo.setSalesbacksoitemList(jg_salesbackModelList);
List<PaymentsoitemEntity> jg_paymentList = saleorderitemService.GetPaymentsoitemList(id);
List<PaymentsoitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class);
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
vo.setPaymentsoitemList(jg_paymentModelList);
//附表数据转换
//添加到详情表单对象中
Map<String,Object> contractCodeMap = new HashMap<>();
vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap));
Map<String,Object> costomerCodeMap = new HashMap<>();
vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",vo.getCustomerId(),costomerCodeMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
vo.setCreatorTime(vo.getCreatorTime());
return ActionResult.success(vo);
}
/**
* 更新
*
* @param id
* @return
*/
@PutMapping("/{id}")
@Transactional
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SaleorderitemUpForm saleorderitemUpForm) throws DataException {
UserInfo userInfo=userProvider.get();
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderitemUpForm, SaleorderitemEntity.class);
subentity.setCreatorUserName(entity.getCreatorUserName());
subentity.setCreatorTime(entity.getCreatorTime());
saleorderitemService.update(id, subentity);
QueryWrapper<Salesorder_item0Entity> Salesorder_item0queryWrapper = new QueryWrapper<>();
Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId());
salesorder_item0Service.remove(Salesorder_item0queryWrapper);
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for(Salesorder_item0Entity entitys : Salesorder_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesorder_item0Service.save(entitys);
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败，数据不存在");
}
// QueryWrapper<ReceiptoutsoitemEntity> ReceiptoutsoitemqueryWrapper = new QueryWrapper<>();
// ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo());
// receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper);
// List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
// for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setSourceNo(entity.getDocumentNo());
// receiptoutsoitemService.save(entitys);
// }
// QueryWrapper<Arinvoices_item0soitemEntity> Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>();
// Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo());
// arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper);
// List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
// for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setSalesOrderNo(entity.getDocumentNo());
// arinvoices_item0soitemService.save(entitys);
// }
// QueryWrapper<CollectionsoitemEntity> CollectionsoitemqueryWrapper = new QueryWrapper<>();
// CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo());
// collectionsoitemService.remove(CollectionsoitemqueryWrapper);
// List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
// for(CollectionsoitemEntity entitys : CollectionsoitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setSalesOrderNo(entity.getDocumentNo());
// collectionsoitemService.save(entitys);
// }
// QueryWrapper<SalesbacksoitemEntity> SalesbacksoitemqueryWrapper = new QueryWrapper<>();
// SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId());
// salesbacksoitemService.remove(SalesbacksoitemqueryWrapper);
// List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
// for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setSalesOrderId(entity.getId());
// salesbacksoitemService.save(entitys);
// }
// QueryWrapper<PaymentsoitemEntity> PaymentsoitemqueryWrapper = new QueryWrapper<>();
// PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo());
// paymentsoitemService.remove(PaymentsoitemqueryWrapper);
// List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderitemUpForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
// for(PaymentsoitemEntity entitys : PaymentsoitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setPaymentno(entity.getDocumentNo());
// paymentsoitemService.save(entitys);
// }
}
/**
* 删除
*
* @param id
* @return
*/
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
saleorderitemService.delete(entity);
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
salesorder_item0Service.remove(queryWrapperSalesorder_item0);
QueryWrapper<ReceiptoutsoitemEntity> queryWrapperReceiptoutsoitem=new QueryWrapper<>();
queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo());
receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem);
QueryWrapper<Arinvoices_item0soitemEntity> queryWrapperArinvoices_item0soitem=new QueryWrapper<>();
queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo());
arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem);
QueryWrapper<CollectionsoitemEntity> queryWrapperCollectionsoitem=new QueryWrapper<>();
queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo());
collectionsoitemService.remove(queryWrapperCollectionsoitem);
QueryWrapper<SalesbacksoitemEntity> queryWrapperSalesbacksoitem=new QueryWrapper<>();
queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId());
salesbacksoitemService.remove(queryWrapperSalesbacksoitem);
QueryWrapper<PaymentsoitemEntity> queryWrapperPaymentsoitem=new QueryWrapper<>();
queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo());
paymentsoitemService.remove(queryWrapperPaymentsoitem);
}
return ActionResult.success("删除成功");
}
}

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java
Unescape View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_arinvoices_item0") @TableName("jg_arinvoices_item0")

74
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java
Unescape View File

@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_collection") @TableName("jg_collection")
@ -26,6 +26,36 @@ public class CollectionsoitemEntity {
@TableId("ID") @TableId("ID")
private String id; private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("ORGNIZE_ID") @TableField("ORGNIZE_ID")
private String orgnizeId; private String orgnizeId;
@ -62,15 +92,9 @@ public class CollectionsoitemEntity {
@TableField("PAYMENT_TYPE") @TableField("PAYMENT_TYPE")
private String paymentType; private String paymentType;
@TableField("VOUCHER")
private String voucher;
@TableField("SETTLEMENT_TYPE") @TableField("SETTLEMENT_TYPE")
private String settlementType; private String settlementType;
@TableField("IS_COLLECTION")
private String isCollection;
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@ -80,40 +104,4 @@ public class CollectionsoitemEntity {
@TableField("COLLECTION_BANK") @TableField("COLLECTION_BANK")
private String collectionBank; private String collectionBank;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("CUSTOMER_ID")
private String customerId;
@TableField("CONTRACT_ID")
private String contractId;
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java
Unescape View File

@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_payment") @TableName("jg_payment")
@ -114,7 +114,4 @@ public class PaymentsoitemEntity {
@TableField("PAYMENTBANK") @TableField("PAYMENTBANK")
private String paymentbank; private String paymentbank;
@TableField("IS_PAY")
private String isPay;
} }

9
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java
Unescape View File

@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_receiptout") @TableName("jg_receiptout")
@ -96,11 +96,4 @@ public class ReceiptoutsoitemEntity {
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@TableField("SALES_ID")
private String salesId;
@TableField("CUSTOMER_ID")
private String customerId;
} }

31
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
Unescape View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import jnpf.poundlist.entity.PoundlistEntity;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -19,8 +18,6 @@ import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -30,11 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_salesorder") @TableName("jg_salesorder")
public class SaleorderitemEntity { public class SaleorderitemEntity {
@TableId("ID") @TableId("ID")
private String id; private String id;
@ -81,11 +78,11 @@ public class SaleorderitemEntity {
@TableField("ERP_NO") @TableField("ERP_NO")
private String erpNo; private String erpNo;
@TableField("SOURCE_PO_ID") @TableField("SOURCE_PO_NO")
private String sourcePoId; private String sourcePoNo;
// @TableField("CONTRACT_CODE") @TableField("CONTRACT_CODE")
// private String contractCode; private String contractCode;
@TableField("CONTRACT_NAME") @TableField("CONTRACT_NAME")
private String contractName; private String contractName;
@ -93,8 +90,8 @@ public class SaleorderitemEntity {
@TableField("CONTRACT_NO") @TableField("CONTRACT_NO")
private String contractNo; private String contractNo;
// @TableField("COSTOMER_CODE") @TableField("COSTOMER_CODE")
// private String costomerCode; private String costomerCode;
@TableField("COSTOMER_NAME") @TableField("COSTOMER_NAME")
private String costomerName; private String costomerName;
@ -156,16 +153,4 @@ public class SaleorderitemEntity {
@TableField("OVERDUE_INTEREST") @TableField("OVERDUE_INTEREST")
private BigDecimal overdueInterest; private BigDecimal overdueInterest;
@TableField("SOURCE_PO_NO")
private String sourcePoNo;
@TableField(exist = false)
private List<Salesorder_item0Entity> list;
@TableField("CONTRACT_ID")
private String contractId;
@TableField("CUSTOMER_ID")
private String customerId;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
Unescape View File

@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_salesback") @TableName("jg_salesback")

35
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
Unescape View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import jnpf.poundlist.entity.PoundlistEntity;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -13,8 +12,6 @@ import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -24,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
@TableName("jg_salesorder_item0") @TableName("jg_salesorder_item0")
@ -75,8 +72,8 @@ public class Salesorder_item0Entity {
@TableField("POUNDLIST_ID") @TableField("POUNDLIST_ID")
private String poundlistId; private String poundlistId;
@TableField("LICENSE_NUM") // @TableField("LICENSE_NUM")
private String licenseNum; // private String licenseNum;
@TableField("MATERIAL_CODE") @TableField("MATERIAL_CODE")
private String materialCode; private String materialCode;
@ -90,8 +87,8 @@ public class Salesorder_item0Entity {
@TableField("POUND_DATE") @TableField("POUND_DATE")
private Date poundDate; private Date poundDate;
@TableField("BUSINESS_ID") @TableField("POUND_USER")
private String businessId; private String poundUser;
@TableField("POUND_TYPE") @TableField("POUND_TYPE")
private String poundType; private String poundType;
@ -126,29 +123,7 @@ public class Salesorder_item0Entity {
@TableField("VEHICLE_PICTURES") @TableField("VEHICLE_PICTURES")
private String vehiclePictures; private String vehiclePictures;
@TableField("REMARK")
private String remark;
@TableField("VEHICLE_ID") @TableField("VEHICLE_ID")
private String vehicleId; private String vehicleId;
@TableField("MATERIAL_ID")
private String materialId;
@TableField("CUSTOMER_ID")
private String customerId;
/** 库区id */
@TableField(exist = false)
private String reservoirareaId;
/** 仓库id */
@TableField(exist = false)
private String warehouseId;
@TableField(exist = false)
private PoundlistEntity poundEntity;
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface Arinvoices_item0soitemMapper extends BaseMapper<Arinvoices_item0soitemEntity> { public interface Arinvoices_item0soitemMapper extends BaseMapper<Arinvoices_item0soitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface CollectionsoitemMapper extends BaseMapper<CollectionsoitemEntity> { public interface CollectionsoitemMapper extends BaseMapper<CollectionsoitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface PaymentsoitemMapper extends BaseMapper<PaymentsoitemEntity> { public interface PaymentsoitemMapper extends BaseMapper<PaymentsoitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface ReceiptoutsoitemMapper extends BaseMapper<ReceiptoutsoitemEntity> { public interface ReceiptoutsoitemMapper extends BaseMapper<ReceiptoutsoitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> { public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface SalesbacksoitemMapper extends BaseMapper<SalesbacksoitemEntity> { public interface SalesbacksoitemMapper extends BaseMapper<SalesbacksoitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
public interface Salesorder_item0Mapper extends BaseMapper<Salesorder_item0Entity> { public interface Salesorder_item0Mapper extends BaseMapper<Salesorder_item0Entity> {

18
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.saleorder.model.saleorderitem; package jnpf.saleorder.model.saleorder;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
@Data @Data
public class Arinvoices_item0soitemModel { public class Arinvoices_item0soitemModel {
@ -26,10 +26,14 @@ public class Arinvoices_item0soitemModel {
@JsonProperty("invoiceCode") @JsonProperty("invoiceCode")
private String invoiceCode; private String invoiceCode;
/** 金额 **/ /** 发票金额 **/
@JsonProperty("involceAmount") @JsonProperty("involceAmount")
private String involceAmount; private String involceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 税率 **/ /** 税率 **/
@JsonProperty("taxRate") @JsonProperty("taxRate")
private String taxRate; private String taxRate;
@ -46,14 +50,14 @@ public class Arinvoices_item0soitemModel {
@JsonProperty("invoiceStatus") @JsonProperty("invoiceStatus")
private String invoiceStatus; private String invoiceStatus;
/** 开票日期 **/
@JsonProperty("invoiceDate")
private Long invoiceDate;
/** 开票人 **/ /** 开票人 **/
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 发票文件 **/ /** 开票日期 **/
@JsonProperty("invoiceDate")
private Long invoiceDate;
/** 发票附件 **/
@JsonProperty("attachMent") @JsonProperty("attachMent")
private String attachMent; private String attachMent;

21
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.saleorder.model.saleorderitem; package jnpf.saleorder.model.saleorder;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -13,33 +13,22 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
@Data @Data
public class CollectionsoitemModel { public class CollectionsoitemModel {
/** 收款单号 **/ /** 收款类型 **/
@JsonProperty("documentNo") @JsonProperty("paymentType")
private String documentNo; private String paymentType;
/** 收款时间 **/
@JsonProperty("businessDate")
private Long businessDate;
/** 收款金额 **/ /** 收款金额 **/
@JsonProperty("amountCollected") @JsonProperty("amountCollected")
private String amountCollected; private String amountCollected;
/** 收款方式 **/
@JsonProperty("paymentType")
private String paymentType;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 创建人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
} }

12
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.saleorder.model.saleorderitem; package jnpf.saleorder.model.saleorder;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权: LINKAGE-BOOT * 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-22 * 日期： 2023-02-03
*/ */
@Data @Data
public class PaymentsoitemModel { public class PaymentsoitemModel {
@ -22,6 +22,10 @@ public class PaymentsoitemModel {
@JsonProperty("documentno") @JsonProperty("documentno")
private String documentno; private String documentno;
/** 付款方式 **/
@JsonProperty("settlementtype")
private String settlementtype;
/** 付款日期 **/ /** 付款日期 **/
@JsonProperty("duedate") @JsonProperty("duedate")
private Long duedate; private Long duedate;
@ -29,10 +33,6 @@ public class PaymentsoitemModel {
@JsonProperty("paymentamount") @JsonProperty("paymentamount")
private String paymentamount; private String paymentamount;
/** 付款方式 **/
@JsonProperty("settlementtype")
private String settlementtype;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;

37
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java
Unescape View File

@ -0,0 +1,37 @@
package jnpf.saleorder.model.saleorder;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
*
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
@Data
public class ReceiptoutsoitemModel {
/** 出库单号 **/
@JsonProperty("documentNo")
private String documentNo;
/** 出库日期 **/
@JsonProperty("issueDate")
private Long issueDate;
/** 出库数量 **/
@JsonProperty("num")
private String num;
/** 出库金额 **/
@JsonProperty("amount")
private String amount;
}

77
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemCrForm.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java
Unescape View File

@ -1,18 +1,14 @@
package jnpf.saleorder.model.saleorderitem; package jnpf.saleorder.model.saleorder;
import com.baomidou.mybatisplus.annotation.TableField; import jnpf.saleorder.model.saleorder.Salesorder_item0Model;
import com.fasterxml.jackson.annotation.JsonFormat; import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel;
import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model; import jnpf.saleorder.model.saleorder.CollectionsoitemModel;
import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel; import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel;
import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel; import jnpf.saleorder.model.saleorder.SalesbacksoitemModel;
import jnpf.saleorder.model.saleorderitem.CollectionsoitemModel; import jnpf.saleorder.model.saleorder.PaymentsoitemModel;
import jnpf.saleorder.model.saleorderitem.SalesbacksoitemModel;
import jnpf.saleorder.model.saleorderitem.PaymentsoitemModel;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List; import java.util.List;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -24,22 +20,22 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-22 * @日期： 2023-02-03
*/ */
@Data @Data
public class SaleorderitemCrForm { public class SaleorderCrForm {
/** 单据编号 **/ /** 单据编号 **/
@JsonProperty("documentNo") @JsonProperty("documentNo")
private String documentNo; private String documentNo;
// /** 合同名称 **/ /** 合同编码 **/
// @JsonProperty("contractCode") @JsonProperty("contractCode")
// private String contractCode; private String contractCode;
//
// /** 客户名称 **/ /** 合同名称 **/
// @JsonProperty("costomerCode") @JsonProperty("contractName")
// private String costomerCode; private String contractName;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
@ -51,24 +47,28 @@ public class SaleorderitemCrForm {
/** 垫资金额 **/ /** 垫资金额 **/
@JsonProperty("advanceAmount") @JsonProperty("advanceAmount")
private Integer advanceAmount; private String advanceAmount;
/** 重量 **/ /** 数量 **/
@JsonProperty("num") @JsonProperty("num")
private Integer num; private String num;
/** 金额 **/ /** 金额 **/
@JsonProperty("price") @JsonProperty("price")
private Integer price; private String price;
/** 不含税金额 **/ /** 不含税金额 **/
@JsonProperty("notPrice") @JsonProperty("notPrice")
private Integer notPrice; private String notPrice;
/** 备注信息 **/ /** 备注信息 **/
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 客户名称 **/
@JsonProperty("costomerName")
private String costomerName;
/** 已回款金额 **/ /** 已回款金额 **/
@JsonProperty("amountCollected") @JsonProperty("amountCollected")
private String amountCollected; private String amountCollected;
@ -81,22 +81,18 @@ public class SaleorderitemCrForm {
@JsonProperty("invoiceAmount") @JsonProperty("invoiceAmount")
private String invoiceAmount; private String invoiceAmount;
/** 来源系统 **/
@JsonProperty("sourceSystem")
private String sourceSystem;
/** 单据状态 **/ /** 单据状态 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
/** ERP订单号 **/
@JsonProperty("erpNo")
private String erpNo;
/** 制单人 **/ /** 制单人 **/
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 制单时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("salesorder_item0List") @JsonProperty("salesorder_item0List")
private List<Salesorder_item0Model> salesorder_item0List; private List<Salesorder_item0Model> salesorder_item0List;
@ -104,24 +100,17 @@ public class SaleorderitemCrForm {
@JsonProperty("receiptoutsoitemList") @JsonProperty("receiptoutsoitemList")
private List<ReceiptoutsoitemModel> receiptoutsoitemList; private List<ReceiptoutsoitemModel> receiptoutsoitemList;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("arinvoices_item0soitemList")
private List<Arinvoices_item0soitemModel> arinvoices_item0soitemList;
/** 子表数据 **/
@JsonProperty("collectionsoitemList") @JsonProperty("collectionsoitemList")
private List<CollectionsoitemModel> collectionsoitemList; private List<CollectionsoitemModel> collectionsoitemList;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("arinvoices_item0soitemList")
private List<Arinvoices_item0soitemModel> arinvoices_item0soitemList;
/** 子表数据 **/
@JsonProperty("salesbacksoitemList") @JsonProperty("salesbacksoitemList")
private List<SalesbacksoitemModel> salesbacksoitemList; private List<SalesbacksoitemModel> salesbacksoitemList;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("paymentsoitemList") @JsonProperty("paymentsoitemList")
private List<PaymentsoitemModel> paymentsoitemList; private List<PaymentsoitemModel> paymentsoitemList;
/** 合同id**/
@TableField("contractId")
private String contractId;
/** 客户id**/
@TableField("customerId")
private String customerId;
} }

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save