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

Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

Browse Source
product
mhsnet 2 years ago
parent 1a2f071328 61002236b1
commit 84168b38af
6 changed files with 53 additions and 23 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)) {

11
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
Unescape View File

@ -146,7 +146,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
@ -157,7 +157,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
@ -215,6 +215,13 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
}
}
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
String organized=null;
if (!userProvider.get().getIsAdministrator()) {
organized = userProvider.getOrganizeId(userId);
}
if (StringUtil.isNotNull(organized)) {
materialPagination.setOrgnizeId(organized);
}
IPage<MaterialEntity> userIPage= materialMapper.queryMaterial(page,materialPagination, materialQueryWrapper);
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

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

1
SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml
Unescape View File

@ -110,6 +110,7 @@
<select id="queryMaterial" resultType="jnpf.materialvo.entity.MaterialEntity">
SELECT
a.*,
a.primary_unit_of_measure primaryUnitOmeasure,
b.areaname inAreaName,
c.areaname outAreaName
FROM

2
SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue
Unescape View File

@ -106,7 +106,7 @@
this.listQuery.menuId = '380611389670053189'
let listQuery = this.listQuery
request({
url: `/api/example/Material/getList`,
url: `/api/example/Material/getListPC`,
method: 'post',
data: listQuery
}).then(res => {

Write Preview
Loading…
Cancel
Save