|
|
|
@ -9,7 +9,11 @@ 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.entity.Arinvoices_item0Entity;
|
|
|
|
|
import jnpf.arinvoices.entity.Arinvoices_item1Entity;
|
|
|
|
|
import jnpf.arinvoices.service.ArinvoicesService;
|
|
|
|
|
import jnpf.arinvoices.service.Arinvoices_item0Service;
|
|
|
|
|
import jnpf.arinvoices.service.Arinvoices_item1Service;
|
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
@ -76,6 +80,8 @@ import java.io.FileNotFoundException;
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
@ -133,6 +139,10 @@ public class SaleorderitemController {
|
|
|
|
|
private ArinvoicesService arinvoicesService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Collection_item0Service collection_item0Service;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Arinvoices_item0Service arinvoices_item0Service;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Arinvoices_item1Service arinvoices_item1Service;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -188,29 +198,45 @@ public class SaleorderitemController {
|
|
|
|
|
@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);
|
|
|
|
|
QueryWrapper<ArinvoicesEntity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper2.lambda().eq(ArinvoicesEntity::getSalesOrderId, id);
|
|
|
|
|
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper2);
|
|
|
|
|
if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
|
|
|
|
|
QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
|
|
|
|
|
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
|
|
|
|
|
arinvoicesEntity.setList0(list0);
|
|
|
|
|
arinvoicesEntity.setList1(list1);
|
|
|
|
|
return ActionResult.success(arinvoicesEntity);
|
|
|
|
|
}else {
|
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
|
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);
|
|
|
|
|
return ActionResult.success(list);
|
|
|
|
|
} else {
|
|
|
|
|
return ActionResult.fail("数据状态不能发票录入");
|
|
|
|
|
}
|
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("数据状态不能发票录入");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success(list);
|
|
|
|
|
return ActionResult.fail("请选择一条数据");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -230,9 +256,24 @@ public class SaleorderitemController {
|
|
|
|
|
if (sale.getStatus().equals("3")){
|
|
|
|
|
return ActionResult.fail("该数据已归档");
|
|
|
|
|
}
|
|
|
|
|
if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){
|
|
|
|
|
if (sale.getAmountCollected() == null) {
|
|
|
|
|
sale.setAmountCollected(new BigDecimal(0));
|
|
|
|
|
}
|
|
|
|
|
if (sale.getStatus().equals("2") && sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){
|
|
|
|
|
sale.setStatus("3");
|
|
|
|
|
saleorderitemService.updateById(sale);
|
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,sale.getId());
|
|
|
|
|
List<Salesorder_item0Entity> salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
|
if (salesorder_item0EntityList.size()>0){
|
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
|
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(poundlistEntity)){
|
|
|
|
|
poundlistEntity.setSalesStatus("3");//修改磅单状态
|
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("发票金额、金额、已付款金额不一致");
|
|
|
|
|
}
|
|
|
|
@ -669,10 +710,14 @@ public class SaleorderitemController {
|
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
|
List<Collection_item0Entity> collection_item0Entity = collection_item0Service.list(queryWrapper1);
|
|
|
|
|
List<CollectionsoitemEntity> collectionsoitemEntityList = new ArrayList<>();
|
|
|
|
|
if (collection_item0Entity.size()>0) {
|
|
|
|
|
for (Collection_item0Entity collection_item0Entity1 : collection_item0Entity) {
|
|
|
|
|
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity1.getCollectionId());
|
|
|
|
|
collectionsoitemEntityList.addAll(jg_collectionList);
|
|
|
|
|
}
|
|
|
|
|
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class);
|
|
|
|
|
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
|
|
|
|
|
}
|
|
|
|
|
vo.setCollectionsoitemList(jg_collectionModelList);
|
|
|
|
|