|
|
|
@ -1,53 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package jnpf.receiptin.controller;
|
|
|
|
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.receiptin.entity.ReceiptinEntity;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
import jnpf.receiptin.model.receiptin.*;
|
|
|
|
|
import jnpf.receiptin.service.ReceiptinService;
|
|
|
|
|
import jnpf.receiptin.model.receiptin.ReceiptinPagination;
|
|
|
|
|
import jnpf.receiptin.entity.*;
|
|
|
|
|
import jnpf.receiptin.entity.Receiptin_item0Entity;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import jnpf.base.util.*;
|
|
|
|
|
import jnpf.base.vo.ListVO;
|
|
|
|
|
import jnpf.util.context.SpringContext;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
import jnpf.receiptin.entity.ReceiptinEntity;
|
|
|
|
|
import jnpf.receiptin.service.ReceiptinService;
|
|
|
|
|
import jnpf.receiptin.entity.Receiptin_item0Entity;
|
|
|
|
|
import jnpf.receiptin.service.Receiptin_item0Service;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.io.FileNotFoundException;
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* 出库单
|
|
|
|
|
* receiptin
|
|
|
|
|
* @版本: V3.2.0
|
|
|
|
|
* @版权: LINKAGE-BOOT
|
|
|
|
|
* @作者: LINKAGE-BOOT研发团队
|
|
|
|
|
* @日期: 2023-01-11
|
|
|
|
|
* @日期: 2023-02-08
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RestController
|
|
|
|
|
@Api(tags = "出库单" , value = "出库单")
|
|
|
|
|
@RequestMapping("/api/example/Receiptin")
|
|
|
|
|
@Api(tags = "receiptin" , value = "receiptin")
|
|
|
|
|
@RequestMapping("/api/receiptin/Receiptin")
|
|
|
|
|
public class ReceiptinController {
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@ -62,6 +75,8 @@ public class ReceiptinController {
|
|
|
|
|
@Autowired
|
|
|
|
|
private ReceiptinService receiptinService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private Receiptin_item0Service receiptin_item0Service;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -76,15 +91,9 @@ public class ReceiptinController {
|
|
|
|
|
List<ReceiptinEntity> list= receiptinService.getList(receiptinPagination);
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(ReceiptinEntity entity:list){
|
|
|
|
|
Map<String,Object> soucenoMap = new HashMap<>();
|
|
|
|
|
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
|
|
|
|
|
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
|
|
|
|
|
}
|
|
|
|
|
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
|
|
|
|
|
for(ReceiptinListVO receiptinVO:listVO){
|
|
|
|
@ -110,16 +119,31 @@ public class ReceiptinController {
|
|
|
|
|
public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException {
|
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
receiptinCrForm.setDocumentno(generaterSwapUtil.getBillNumber("rukudanhao", false));
|
|
|
|
|
receiptinCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
receiptinCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
receiptinCrForm.setCreatorUserId(userInfo.getUserId());
|
|
|
|
|
receiptinCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId());
|
|
|
|
|
if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){
|
|
|
|
|
receiptinCrForm.setDepartmentId(userInfo.getPositionIds()[0]);
|
|
|
|
|
}
|
|
|
|
|
ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
receiptinService.save(entity);
|
|
|
|
|
List<Receiptin_item0Entity> Receiptin_item0List = JsonUtil.getJsonToList(receiptinCrForm.getReceiptin_item0List(),Receiptin_item0Entity.class);
|
|
|
|
|
for(Receiptin_item0Entity entitys : Receiptin_item0List){
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setReceiptinId(entity.getId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
receiptin_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
@ -160,15 +184,9 @@ public class ReceiptinController {
|
|
|
|
|
List<ReceiptinEntity> list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType());
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(ReceiptinEntity entity:list){
|
|
|
|
|
Map<String,Object> soucenoMap = new HashMap<>();
|
|
|
|
|
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
|
|
|
|
|
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
|
|
|
|
|
}
|
|
|
|
|
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
|
|
|
|
|
for(ReceiptinListVO receiptinVO:listVO){
|
|
|
|
@ -191,30 +209,30 @@ public class ReceiptinController {
|
|
|
|
|
case "documentno" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据编号" ,"documentno"));
|
|
|
|
|
break;
|
|
|
|
|
case "suppliername" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("客户名称" ,"suppliername"));
|
|
|
|
|
case "type" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
|
|
|
|
|
break;
|
|
|
|
|
case "receiptamount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库金额" ,"receiptamount"));
|
|
|
|
|
case "souceno" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
|
|
|
|
|
break;
|
|
|
|
|
case "receiptnum" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库数量" ,"receiptnum"));
|
|
|
|
|
case "receiptamount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount"));
|
|
|
|
|
break;
|
|
|
|
|
case "currency" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("币别" ,"currency"));
|
|
|
|
|
break;
|
|
|
|
|
case "warehousingdate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("出库日期" ,"warehousingdate"));
|
|
|
|
|
break;
|
|
|
|
|
case "souceno" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
|
|
|
|
|
case "receiptnum" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum"));
|
|
|
|
|
break;
|
|
|
|
|
case "type" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("业务类型" ,"type"));
|
|
|
|
|
case "suppliername" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername"));
|
|
|
|
|
break;
|
|
|
|
|
case "remark" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("备注" ,"remark"));
|
|
|
|
|
break;
|
|
|
|
|
case "warehousingdate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("入库日期" ,"warehousingdate"));
|
|
|
|
|
break;
|
|
|
|
|
case "status" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据状态" ,"status"));
|
|
|
|
|
break;
|
|
|
|
@ -224,24 +242,6 @@ public class ReceiptinController {
|
|
|
|
|
case "creatorUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorUserId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建人id" ,"creatorUserId"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyUserId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人id" ,"lastModifyUserId"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyTime" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
|
|
|
|
|
break;
|
|
|
|
|
case "orgnizeId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("组织id" ,"orgnizeId"));
|
|
|
|
|
break;
|
|
|
|
|
case "departmentId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("部门id" ,"departmentId"));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -309,19 +309,12 @@ public class ReceiptinController {
|
|
|
|
|
vo.setCreatorTime(vo.getCreatorTime());
|
|
|
|
|
}
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
|
|
|
|
|
if(vo.getLastModifyTime()!=null){
|
|
|
|
|
vo.setLastModifyTime(vo.getLastModifyTime());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
|
|
|
|
|
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
|
|
|
|
|
|
|
|
|
|
//子表
|
|
|
|
|
List<Receiptin_item0Entity> Receiptin_item0List = receiptinService.GetReceiptin_item0List(id);
|
|
|
|
|
for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List){
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptin_item0List(JsonUtil.getJsonToList(Receiptin_item0List,Receiptin_item0Model.class ));
|
|
|
|
|
//副表
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
@ -338,19 +331,22 @@ public class ReceiptinController {
|
|
|
|
|
ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class);
|
|
|
|
|
|
|
|
|
|
//子表数据转换
|
|
|
|
|
List<Receiptin_item0Entity> jg_receiptin_item0List = receiptinService.GetReceiptin_item0List(id);
|
|
|
|
|
List<Receiptin_item0Model> jg_receiptin_item0ModelList = JsonUtil.getJsonToList(jg_receiptin_item0List,Receiptin_item0Model.class);
|
|
|
|
|
for(Receiptin_item0Model jg_receiptin_item0Model : jg_receiptin_item0ModelList){
|
|
|
|
|
Map<String,Object> licensenoMap = new HashMap<>();
|
|
|
|
|
jg_receiptin_item0Model.setLicenseno(generaterSwapUtil.getPopupSelectValue("392933121244325765","license_num","license_num",jg_receiptin_item0Model.getLicenseno(),licensenoMap));
|
|
|
|
|
Map<String,Object> reservoirareaIdMap = new HashMap<>();
|
|
|
|
|
jg_receiptin_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptin_item0Model.getReservoirareaId(),reservoirareaIdMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptin_item0List(jg_receiptin_item0ModelList);
|
|
|
|
|
|
|
|
|
|
//附表数据转换
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
Map<String,Object> soucenoMap = new HashMap<>();
|
|
|
|
|
vo.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",vo.getSouceno(),soucenoMap));
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
|
|
|
|
|
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
|
|
|
|
|
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
|
|
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
@ -370,16 +366,34 @@ public class ReceiptinController {
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
ReceiptinEntity entity= receiptinService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
receiptinUpForm.setLastModifyUserName(userInfo.getUserId());
|
|
|
|
|
receiptinUpForm.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
|
receiptinUpForm.setLastModifyTime(DateUtil.getNow());
|
|
|
|
|
receiptinUpForm.setOrgnizeId(entity.getOrgnizeId());
|
|
|
|
|
receiptinUpForm.setDepartmentId(entity.getDepartmentId());
|
|
|
|
|
ReceiptinEntity subentity=JsonUtil.getJsonToBean(receiptinUpForm, ReceiptinEntity.class);
|
|
|
|
|
subentity.setCreatorTime(entity.getCreatorTime());
|
|
|
|
|
subentity.setCreatorUserName(entity.getCreatorUserName());
|
|
|
|
|
subentity.setCreatorUserId(entity.getCreatorUserId());
|
|
|
|
|
receiptinService.update(id, subentity);
|
|
|
|
|
|
|
|
|
|
QueryWrapper<Receiptin_item0Entity> Receiptin_item0queryWrapper = new QueryWrapper<>();
|
|
|
|
|
Receiptin_item0queryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, entity.getId());
|
|
|
|
|
receiptin_item0Service.remove(Receiptin_item0queryWrapper);
|
|
|
|
|
|
|
|
|
|
List<Receiptin_item0Entity> Receiptin_item0List = JsonUtil.getJsonToList(receiptinUpForm.getReceiptin_item0List(),Receiptin_item0Entity.class);
|
|
|
|
|
for(Receiptin_item0Entity entitys : Receiptin_item0List){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setReceiptinId(entity.getId());
|
|
|
|
|
receiptin_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
@ -400,6 +414,9 @@ public class ReceiptinController {
|
|
|
|
|
ReceiptinEntity entity= receiptinService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
receiptinService.delete(entity);
|
|
|
|
|
QueryWrapper<Receiptin_item0Entity> queryWrapperReceiptin_item0=new QueryWrapper<>();
|
|
|
|
|
queryWrapperReceiptin_item0.lambda().eq(Receiptin_item0Entity::getReceiptinId,entity.getId());
|
|
|
|
|
receiptin_item0Service.remove(queryWrapperReceiptin_item0);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|