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

归档优化

Browse Source
product
杨世强 2 years ago
parent d9b4005217
commit ec480b4f05
3 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -24,6 +24,7 @@ import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.SaleorderitemService;
@ -58,6 +59,7 @@ import jnpf.util.GeneraterSwapUtil;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum;
@ -152,7 +154,6 @@ public class ArinvoicesController {
UserInfo userInfo=userProvider.get();
arinvoicesCrForm.setCreatorUserName(userInfo.getUserId());
arinvoicesCrForm.setCreatorTime(DateUtil.getNow());
// arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class);
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId());
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
@ -161,23 +162,36 @@ public class ArinvoicesController {
saleorderitemEntity.setInvoiceAmount(new BigDecimal(arinvoicesCrForm.getInvoiceAmount()));
saleorderitemService.updateById(saleorderitemEntity);
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.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("2");//修改磅单状态
if (arinvoicesCrForm.getAmount() != null && arinvoicesCrForm.getInvoiceAmount() != null) {
BigDecimal a = new BigDecimal(arinvoicesCrForm.getInvoiceAmount());
BigDecimal b = new BigDecimal(arinvoicesCrForm.getAmount());
if (a.compareTo(b) > -1) {
poundlistEntity.setIsExpense("1");//修改销项票状态
poundlistEntity.setOutputDate(new Date());//修改销项票日期
if (saleorderitemEntity.getPrice().compareTo(saleorderitemEntity.getInvoiceAmount()) == 0){
QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistEntityList) {
poundlistEntity.setIsInvoicing("1");
poundlistEntity.setInputDate(new Date());
}
poundlistService.updateBatchById(poundlistEntityList);
}else {
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1);
if (salesorder_item0EntityList != null && salesorder_item0EntityList.size() > 0) {
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList) {
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
poundlistEntity.setSalesStatus("2");//修改磅单状态
if (arinvoicesCrForm.getAmount() != null && arinvoicesCrForm.getInvoiceAmount() != null) {
BigDecimal a = new BigDecimal(arinvoicesCrForm.getInvoiceAmount());
BigDecimal b = new BigDecimal(arinvoicesCrForm.getAmount());
if (a.compareTo(b) > -1) {
poundlistEntity.setIsExpense("1");//修改销项票状态
poundlistEntity.setOutputDate(new Date());//修改销项票日期
}
}
poundlistService.updateById(poundlistEntity);
}
poundlistService.updateById(poundlistEntity);
}
}
}
@ -189,13 +203,13 @@ public class ArinvoicesController {
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);
for(Arinvoices_item0Entity entitys : Arinvoices_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId());
arinvoices_item0Service.save(entitys);
}
}
@ -472,7 +486,7 @@ public class ArinvoicesController {
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1);
if (salesorder_item0EntityList.size() > 0) {
if (salesorder_item0EntityList!=null && salesorder_item0EntityList.size() > 0) {
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList) {
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)) {

4
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -715,6 +715,10 @@ public class PurchaseorderController {
List<Purchaseorder_item0Entity> purchaseorder_item0EntityList = purchaseorderitemService.GetPurchaseorder_item0List(id);
for (Purchaseorder_item0Entity purchaseorder_item0Entity : purchaseorder_item0EntityList) {
PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId());
if (StringUtil.isEmpty(poundlistEntity.getIsPay()) && poundlistEntity.getPayDate()==null){
poundlistEntity.setIsPay("1");
poundlistEntity.setPayDate(new Date());
}
poundlistEntity.setPurchaseStatus("3");
poundlistService.updateById(poundlistEntity);
}

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

@ -380,10 +380,14 @@ public class SaleorderitemController {
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){
if (salesorder_item0EntityList !=null && salesorder_item0EntityList.size()>0){
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)){
if (StringUtil.isEmpty(poundlistEntity.getIsCollection()) && poundlistEntity.getPaymentDate() == null){
poundlistEntity.setIsCollection("1");
poundlistEntity.setPaymentDate(new Date());
}
poundlistEntity.setSalesStatus("3");//修改磅单状态
poundlistService.updateById(poundlistEntity);
}

Write Preview
Loading…
Cancel
Save