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

修改

Browse Source
product
杨世强 2 years ago
parent d91ced5fca
commit 8c1f4a9a7f
10 changed files with 212 additions and 73 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

@ -15,8 +15,13 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
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 jnpf.arinvoices.model.arinvoices.*;
import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination;
@ -40,6 +45,8 @@ import javax.validation.Valid;
import java.io.FileOutputStream;
import java.io.IOException;
import jnpf.util.GeneraterSwapUtil;
import java.math.BigDecimal;
import java.util.*;
import jnpf.util.file.UploadUtil;
@ -77,6 +84,10 @@ public class ArinvoicesController {
private Arinvoices_item0Service arinvoices_item0Service;
@Autowired
private SaleorderitemService saleorderitemService;
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private PoundlistService poundlistService;
@ -120,13 +131,33 @@ public class ArinvoicesController {
@PostMapping
@Transactional
public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException {
if (arinvoicesCrForm.getAmount() != null && arinvoicesCrForm.getInvoiceAmount()!=null){
if (arinvoicesCrForm.getAmount().compareTo(arinvoicesCrForm.getInvoiceAmount()) == -1){
return ActionResult.fail("发票金额不能大于金额");
}
}
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class);
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId());
saleorderitemEntity.setStatus("2");
saleorderitemEntity.setStatus("2");//修改销售订单状态
saleorderitemEntity.setInvoiceNum(new BigDecimal(arinvoicesCrForm.getInvoiceQuantity()));
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");//修改磅单状态
poundlistEntity.setIsExpense("1");//修改销项票状态
poundlistService.updateById(poundlistEntity);
}
}
}
entity.setId(mainId);
arinvoicesService.save(entity);
List<Arinvoices_item1Entity> Arinvoices_item1List = JsonUtil.getJsonToList(arinvoicesCrForm.getArinvoices_item1List(),Arinvoices_item1Entity.class);
@ -382,20 +413,10 @@ public class ArinvoicesController {
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<>();
Arinvoices_item0queryWrapper.lambda().eq(Arinvoices_item0Entity::getArinvoicesId, entity.getId());
arinvoices_item0Service.remove(Arinvoices_item0queryWrapper);
@ -403,15 +424,6 @@ public class ArinvoicesController {
List<Arinvoices_item0Entity> Arinvoices_item0List = JsonUtil.getJsonToList(arinvoicesUpForm.getArinvoices_item0List(),Arinvoices_item0Entity.class);
for(Arinvoices_item0Entity entitys : Arinvoices_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setArinvoicesId(entity.getId());
arinvoices_item0Service.save(entitys);

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

@ -11,6 +11,8 @@ 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;
@ -119,4 +121,10 @@ public class ArinvoicesEntity {
@TableField("CONTRACT_ID")
private String contractId;
@TableField(exist = false)
List<Arinvoices_item0Entity> list0;
@TableField(exist = false)
List<Arinvoices_item1Entity> list1;
}

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

@ -152,7 +152,7 @@ public class CollectionController {
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;
BigDecimal sum = new BigDecimal(0);
SaleorderitemEntity saleordercetEntity = saleorderitemService.getById(collection_item0Entity.getSalesorderId());//查询销售订单信息
if (saleordercetEntity.getAmountCollected() == null) {
saleordercetEntity.setAmountCollected(new BigDecimal(0));
@ -162,7 +162,7 @@ public class CollectionController {
}
if (saleordercetEntity.getAmountCollected() != null && collection_item0Entity.getAmount() != null) {
sum = saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount());
if (saleordercetEntity.getAmountCollected().compareTo(saleordercetEntity.getPrice()) > 0) {
if (sum.compareTo(saleordercetEntity.getPrice()) > 0) {
return ActionResult.fail("总回款金额大于金额");
}
// saleordercetEntity.setAmountCollected(sum);
@ -206,7 +206,7 @@ public class CollectionController {
poundlistEntity.setPaymentDate(new Date());
}
saleordercetEntity.setAmountCollected(sum);
saleordercetEntity.setStatus("3");
// saleordercetEntity.setStatus("3");
saleorderitemService.updateById(saleordercetEntity);
poundlistService.updateById(poundlistEntity);
collectionEntity.setStatus("2");

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

@ -135,6 +135,8 @@ public class PoundlistController {
entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
Map<String,Object> purchaseIdMap = new HashMap<>();
entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("397408984857931205","id","contract_name",entity.getPurchaseId(),purchaseIdMap));
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("382494924156735557","id","supplier_name",entity.getSupplierId(),supplierIdMap));
}
List<PoundlistListVO> listVO=JsonUtil.getJsonToList(list,PoundlistListVO.class);
for(PoundlistListVO poundlistVO:listVO){

4
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
Unescape View File

@ -172,4 +172,8 @@ public class PoundlistListVO{
/** 税率 **/
@JsonProperty("rate")
private String rate;
/** 采购单格 **/
@JsonProperty("supplierId")
private String supplierId;
}

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

@ -15,8 +15,13 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
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 jnpf.base.entity.ProvinceEntity;
import jnpf.receiptout.model.receiptout.*;
@ -81,6 +86,10 @@ public class ReceiptoutController {
private Receiptout_item0Service receiptout_item0Service;
@Autowired
private SaleorderitemService saleorderitemService;
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private PoundlistService poundlistService;
/**
* 销售订单出货，出库单创建
@ -100,8 +109,20 @@ public class ReceiptoutController {
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSalesId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
saleorderitemEntity.setStatus("1");
saleorderitemEntity.setStatus("1");//修改销售订单状态
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("1");//修改磅单状态
poundlistService.updateById(poundlistEntity);
}
}
}
entity.setId(mainId);
entity.setIssueDate(new Date());
receiptoutService.save(entity);

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

@ -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);

9
SC-web/src/views/scm/basicInformation/collection/index.vue
Unescape View File

@ -240,15 +240,12 @@
"fullName": "已保存",
"id": "0"
}, {
"fullName": "审批中",
"fullName": "已提交",
"id": "1"
}, {
"fullName": "已审批",
"fullName": "已认款",
"id": "2"
}, {
"fullName": "已付款",
"id": "3"
}],
}, ],
statusProps: {
"label": "fullName",
"value": "id"

30
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -456,6 +456,36 @@
this.dataForm.quantity = num;
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
init2(list2) {
debugger
this.visible = true;
let amount = 0;
let num = 0;
this.dataForm = list2
// this.dataForm.contractId = list.contractId;
// this.dataForm.customerId = list.customerId;
// this.dataForm.salesOrderId = list.id;
this.dataForm.arinvoices_item1List = list2.list1;
this.dataForm.arinvoices_item0List = list2.list0;
// for (let i = 0;i<list.list1.length;i++){
// this.dataForm.arinvoices_item1List[i].quantity = list.list1[i].settlement;
// this.dataForm.arinvoices_item1List[i].amount = list.list1[i].price;
// this.dataForm.arinvoices_item1List[i].taxRate = list.list1[i].rate;
// this.dataForm.arinvoices_item1List[i].amountNotTax = list.list1[i].noPrice;
// this.dataForm.arinvoices_item1List[i].unit = list.list1[i].poundEntity.unit;
// amount = amount + list.list1[i].price;
// num = num + list.list1[i].quantity;
// // this.dataForm.arinvoices_item1List[i].taxAmount = list[0].list[i].price*list[0].list[i].rate
// this.taxRateOptions.find((item) => {
// if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) {
// this.dataForm.arinvoices_item1List[i].taxAmount = this.dataForm.arinvoices_item1List[i].amount*item.fullName/100
// }
// })
// }
// this.dataForm.amount = amount;
// this.dataForm.quantity = num;
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
// 表单提交
dataFormSubmit() {
this.$refs['elForm'].validate((valid) => {

58
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -235,25 +235,45 @@ width="150" >
url: `/api/saleorder/Saleorderitem/invoiceentry/${ids}`,
method: 'post'
}).then(res => {
const list = [];
for (let i = 0; i < res.data.length; i++) {
// res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
// 10) : '';
let _data = res.data[i]
list.push(_data)
}
if (list.length>0) {
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm2.init(list)
})
}else{
this.$message({
message: '未找到符合条件数据',
type: 'error',
duration: 1000
})
}
if (res.data instanceof Array) {
const list = [];
for (let i = 0; i < res.data.length; i++) {
// res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
// 10) : '';
let _data = res.data[i]
list.push(_data)
}
if (list.length > 0) {
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm2.init(list)
})
} else {
this.$message({
message: '未找到符合条件数据',
type: 'error',
duration: 1000
})
}
}else if (res.data instanceof Object){
debugger
let list2 = {};
list2 = res.data
debugger
if (list2 != null){
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm2.init2(list2)
debugger
})
}else{
this.$message({
message: '未找到符合条件数据',
type: 'error',
duration: 1000
})
}
}
})
},
collection(){

Write Preview
Loading…
Cancel
Save