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

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 1530044edf 3e450497ab
commit 19a7b1d329
15 changed files with 263 additions and 177 deletions
Show Stats Download Patch File Download Diff File

33
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
Unescape View File

@ -69,10 +69,10 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
@Override
public List<ArinvoicesEntity> getList(ArinvoicesPagination arinvoicesPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int arinvoicesNum =0;
@ -179,16 +179,23 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Page<ArinvoicesEntity> page=new Page<>(arinvoicesPagination.getCurrentPage(), arinvoicesPagination.getPageSize());
//加权限
IPage<ArinvoicesEntity> IPage = this.page(page, arinvoicesQueryWrapper);
List<ArinvoicesEntity> list = IPage.getRecords();
Optional<ArinvoicesEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ArinvoicesEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<ArinvoicesEntity> IPage = this.page(page, arinvoicesQueryWrapper);
// List<ArinvoicesEntity> list = IPage.getRecords();
// Optional<ArinvoicesEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(ArinvoicesEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// arinvoicesPagination.setDepartmentId(detpartment);
// }else {
// arinvoicesPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
arinvoicesPagination.setDepartmentId(detpartment);
}else {
arinvoicesPagination.setDepartmentId(deId);
}
IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());

35
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
Unescape View File

@ -77,10 +77,10 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
// if (!userProvider.get().getIsAdministrator()) {
// orgnize = userProvider.getOrganizeId(userId);
// }
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int collectionNum =0;
@ -157,17 +157,24 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
Page<CollectionEntity> page=new Page<>(collectionPagination.getCurrentPage(), collectionPagination.getPageSize());
//加权限
IPage<CollectionEntity> IPage = this.page(page, collectionQueryWrapper);
List<CollectionEntity> list = IPage.getRecords();
Optional<CollectionEntity> firstElement = list.stream().findFirst();
String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(CollectionEntity::getDepartmentId)
.orElse(null);
// collectionPagination.setOrgnizeId(OrgnId);
if (department_id==null){
// IPage<CollectionEntity> IPage = this.page(page, collectionQueryWrapper);
// List<CollectionEntity> list = IPage.getRecords();
// Optional<CollectionEntity> firstElement = list.stream().findFirst();
// String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(CollectionEntity::getDepartmentId)
// .orElse(null);
//// collectionPagination.setOrgnizeId(OrgnId);
// if (department_id==null){
// collectionPagination.setDepartmentId(detpartment);
// }else {
// collectionPagination.setDepartmentId(department_id);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
collectionPagination.setDepartmentId(detpartment);
}else {
collectionPagination.setDepartmentId(department_id);
}
IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());

34
SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
Unescape View File

@ -76,10 +76,10 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
@Override
public List<InvoicesEntity> getList(InvoicesPagination invoicesPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int invoicesNum =0;
@ -171,19 +171,25 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
Page<InvoicesEntity> page=new Page<>(invoicesPagination.getCurrentPage(), invoicesPagination.getPageSize());
//加权限
IPage<InvoicesEntity> IPage = this.page(page, invoicesQueryWrapper);
List<InvoicesEntity> list = IPage.getRecords();
Optional<InvoicesEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(InvoicesEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<InvoicesEntity> IPage = this.page(page, invoicesQueryWrapper);
// List<InvoicesEntity> list = IPage.getRecords();
// Optional<InvoicesEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(InvoicesEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// invoicesPagination.setDepartmentId(detpartment);
// }else {
// invoicesPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
invoicesPagination.setDepartmentId(detpartment);
}else {
invoicesPagination.setDepartmentId(deId);
}
IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());

40
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
Unescape View File

@ -80,10 +80,10 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
@Override
public List<PoundlistEntity> getList(PoundlistPagination poundlistPagination) {
String userId = userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList = new ArrayList();
int total = 0;
int poundlistNum = 0;
@ -139,21 +139,27 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
}
Page<PoundlistEntity> page = new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize());
QueryWrapper<UserGetUserEntity> userWrapper = new QueryWrapper<>();
// String busid=null ;
// userWrapper.eq(busid,poundlistPagination.getBusinessId());
/*************************************************************************/
IPage<PoundlistEntity> userIPage = this.page(page, poundlistQueryWrapper);
List<PoundlistEntity> list = userIPage.getRecords();
Optional<PoundlistEntity> firstElement = list.stream().findFirst();
String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(PoundlistEntity::getDepartmentId)
.orElse(null);
if (department_id==null){
/*************************************************************************/
// IPage<PoundlistEntity> userIPage = this.page(page, poundlistQueryWrapper);
// List<PoundlistEntity> list = userIPage.getRecords();
// Optional<PoundlistEntity> firstElement = list.stream().findFirst();
// String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(PoundlistEntity::getDepartmentId)
// .orElse(null);
//
// if (department_id==null){
// poundlistPagination.setDepartmentId(detpartment);
// }else {
// poundlistPagination.setDepartmentId(department_id);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
poundlistPagination.setDepartmentId(detpartment);
}else {
poundlistPagination.setDepartmentId(department_id);
}
/*************************************************************************/

33
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
Unescape View File

@ -68,10 +68,10 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
@Override
public List<PurchasebackEntity> getList(PurchasebackPagination purchasebackPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int purchasebackNum =0;
@ -156,16 +156,23 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
Page<PurchasebackEntity> page=new Page<>(purchasebackPagination.getCurrentPage(), purchasebackPagination.getPageSize());
//加权限
IPage<PurchasebackEntity> IPage = this.page(page, purchasebackQueryWrapper);
List<PurchasebackEntity> list = IPage.getRecords();
Optional<PurchasebackEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(PurchasebackEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<PurchasebackEntity> IPage = this.page(page, purchasebackQueryWrapper);
// List<PurchasebackEntity> list = IPage.getRecords();
// Optional<PurchasebackEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(PurchasebackEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// purchasebackPagination.setDepartmentId(detpartment);
// }else {
// purchasebackPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
purchasebackPagination.setDepartmentId(detpartment);
}else {
purchasebackPagination.setDepartmentId(deId);
}
IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());

34
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -776,10 +776,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
@Override
public List<PurchaseorderitemEntity> getList(PurchaseorderPagination purchaseorderPagination) {
String userId = userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList = new ArrayList();
int total = 0;
int purchaseorderNum = 0;
@ -925,17 +925,25 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
}
Page<PurchaseorderitemEntity> page = new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
//加权限
IPage<PurchaseorderitemEntity> IPage = this.page(page, purchaseorderQueryWrapper);
List<PurchaseorderitemEntity> list = IPage.getRecords();
Optional<PurchaseorderitemEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(PurchaseorderitemEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<PurchaseorderitemEntity> IPage = this.page(page, purchaseorderQueryWrapper);
// List<PurchaseorderitemEntity> list = IPage.getRecords();
// Optional<PurchaseorderitemEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(PurchaseorderitemEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// purchaseorderPagination.setDepartmentId(detpartment);
// }else {
// purchaseorderPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
purchaseorderPagination.setDepartmentId(detpartment);
}else {
purchaseorderPagination.setDepartmentId(deId);
}
IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());

33
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
Unescape View File

@ -68,10 +68,10 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
@Override
public List<ReceiptinEntity> getList(ReceiptinPagination receiptinPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int receiptinNum =0;
@ -145,16 +145,23 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
Page<ReceiptinEntity> page=new Page<>(receiptinPagination.getCurrentPage(), receiptinPagination.getPageSize());
//加权限
IPage<ReceiptinEntity> IPage = this.page(page, receiptinQueryWrapper);
List<ReceiptinEntity> list = IPage.getRecords();
Optional<ReceiptinEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ReceiptinEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<ReceiptinEntity> IPage = this.page(page, receiptinQueryWrapper);
// List<ReceiptinEntity> list = IPage.getRecords();
// Optional<ReceiptinEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(ReceiptinEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// receiptinPagination.setDepartmentId(detpartment);
// }else {
// receiptinPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
receiptinPagination.setDepartmentId(detpartment);
}else {
receiptinPagination.setDepartmentId(deId);
}
IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
return receiptinPagination.setData(userIPage.getRecords(),userIPage.getTotal());

33
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
Unescape View File

@ -66,10 +66,10 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
@Override
public List<ReceiptoutEntity> getList(ReceiptoutPagination receiptoutPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int receiptoutNum =0;
@ -158,16 +158,23 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
Page<ReceiptoutEntity> page=new Page<>(receiptoutPagination.getCurrentPage(), receiptoutPagination.getPageSize());
//加权限
IPage<ReceiptoutEntity> IPage = this.page(page, receiptoutQueryWrapper);
List<ReceiptoutEntity> list = IPage.getRecords();
Optional<ReceiptoutEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ReceiptoutEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<ReceiptoutEntity> IPage = this.page(page, receiptoutQueryWrapper);
// List<ReceiptoutEntity> list = IPage.getRecords();
// Optional<ReceiptoutEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(ReceiptoutEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// receiptoutPagination.setDepartmentId(detpartment);
// }else {
// receiptoutPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
receiptoutPagination.setDepartmentId(detpartment);
}else {
receiptoutPagination.setDepartmentId(deId);
}
IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());

33
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -64,10 +64,10 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
@Override
public List<SalebackEntity> getList(SalebackPagination salebackPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int salebackNum =0;
@ -156,16 +156,23 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
Page<SalebackEntity> page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize());
//加权限
IPage<SalebackEntity> IPage = this.page(page, salebackQueryWrapper);
List<SalebackEntity> list = IPage.getRecords();
Optional<SalebackEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(SalebackEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<SalebackEntity> IPage = this.page(page, salebackQueryWrapper);
// List<SalebackEntity> list = IPage.getRecords();
// Optional<SalebackEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(SalebackEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// salebackPagination.setDepartmentId(detpartment);
// }else {
// salebackPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
salebackPagination.setDepartmentId(detpartment);
}else {
salebackPagination.setDepartmentId(deId);
}
IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());

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

@ -756,7 +756,9 @@ public class SaleorderitemController {
// Map<String,Object> materialIdMap = new HashMap<>();
// jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
// }
if (jg_salesorder_item0ModelList!=null && jg_salesorder_item0ModelList.size()>0) {
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
}
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
List<ReceiptoutsoitemModel> jg_receiptoutModelList = new ArrayList<>();
if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) {
@ -775,7 +777,9 @@ public class SaleorderitemController {
// jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap));
}
}
if (jg_receiptoutModelList!=null && jg_receiptoutModelList.size()>0) {
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
}
QueryWrapper<ArinvoicesEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id);
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper);
@ -787,7 +791,9 @@ public class SaleorderitemController {
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
}
}
if (jg_arinvoices_item0ModelList!=null && jg_arinvoices_item0ModelList.size()>0) {
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
}
QueryWrapper<Collection_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id);
List<Collection_item0Entity> collection_item0Entity = collection_item0Service.list(queryWrapper1);
@ -801,17 +807,23 @@ public class SaleorderitemController {
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class);
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
}
if (jg_collectionModelList!=null && jg_collectionModelList.size()>0) {
vo.setCollectionsoitemList(jg_collectionModelList);
}
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
}
if (jg_salesbackModelList!=null && jg_salesbackModelList.size()>0) {
vo.setSalesbacksoitemList(jg_salesbackModelList);
}
List<PaymentsoitemEntity> jg_paymentList = saleorderitemService.GetPaymentsoitemList(id);
List<PaymentsoitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class);
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
if (jg_paymentModelList!=null && jg_paymentModelList.size()>0) {
vo.setPaymentsoitemList(jg_paymentModelList);
}
List<PoundlistEntity> poundlist = saleorderitemService.GetPoundlistList(id);
vo.setPoundlistentityList(poundlist);

32
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
Unescape View File

@ -88,10 +88,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
@Override
public List<SaleorderitemEntity> getList(SaleorderitemPagination saleorderitemPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int saleorderitemNum =0;
@ -274,17 +271,26 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
Page<SaleorderitemEntity> page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize());
//加权限
IPage<SaleorderitemEntity> IPage = this.page(page, saleorderitemQueryWrapper);
List<SaleorderitemEntity> list = IPage.getRecords();
Optional<SaleorderitemEntity> firstElement = list.stream().findFirst();
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(SaleorderitemEntity::getDepartmentId)
.orElse(null);
if (deId==null){
// IPage<SaleorderitemEntity> IPage = this.page(page, saleorderitemQueryWrapper);
// List<SaleorderitemEntity> list = IPage.getRecords();
// Optional<SaleorderitemEntity> firstElement = list.stream().findFirst();
// String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(SaleorderitemEntity::getDepartmentId)
// .orElse(null);
// if (deId==null){
// saleorderitemPagination.setDepartmentId(detpartment);
// }else {
// saleorderitemPagination.setDepartmentId(deId);
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
saleorderitemPagination.setDepartmentId(detpartment);
}else {
saleorderitemPagination.setDepartmentId(deId);
}
IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

36
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
Unescape View File

@ -78,10 +78,10 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
@Override
public List<TradeuploadEntity> getList(TradeuploadPagination tradeuploadPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
// String detpartment = null;
// if (!userProvider.get().getIsAdministrator()) {
// detpartment = userProvider.getDepartmentId(userId);
// }
List<String> AllIdList =new ArrayList();
int total=0;
int tradeuploadNum =0;
@ -143,21 +143,27 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
Page<TradeuploadEntity> page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize());
//加权限
IPage<TradeuploadEntity> IPage = this.page(page, tradeuploadQueryWrapper);
List<TradeuploadEntity> list = IPage.getRecords();
Optional<TradeuploadEntity> firstElement = list.stream().findFirst();
String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(TradeuploadEntity::getDepartmentId)
.orElse(null);
// IPage<TradeuploadEntity> IPage = this.page(page, tradeuploadQueryWrapper);
// List<TradeuploadEntity> list = IPage.getRecords();
// Optional<TradeuploadEntity> firstElement = list.stream().findFirst();
// String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
// .map(TradeuploadEntity::getDepartmentId)
// .orElse(null);
// if (!userProvider.get().getIsAdministrator()) {
// if (department_id==null){
// tradeuploadPagination.setDepartmentId(detpartment);
// }else {
// tradeuploadPagination.setDepartmentId(department_id);
// }
// }
String detpartment=null;
if (!userProvider.get().getIsAdministrator()) {
if (department_id==null){
tradeuploadPagination.setDepartmentId(detpartment);
}else {
tradeuploadPagination.setDepartmentId(department_id);
detpartment = userProvider.getDepartmentId(userId);
}
if (StringUtil.isNotNull(detpartment)) {
tradeuploadPagination.setDepartmentId(detpartment);
}
// tradeuploadPagination.setDepartmentId(detpartment);
IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());

2
SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue
Unescape View File

@ -330,7 +330,7 @@
<el-button @click="visible = false"> 取 消</el-button>
<!-- <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button> -->
</span>
<ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" />
<!-- <ImportForm v-if="importFormVisible" ref="importForm" @importData="importData" /> -->
</el-dialog>
</template>
<script>

34
SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
Unescape View File

@ -413,7 +413,7 @@
<el-table-column prop="invoiceQuantity" label="发票数量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceQuantity"
placeholder="请输入" clearable :style='{"width":"100%"}' @change="invoiceQuantitySum" disabled>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
@ -1187,22 +1187,22 @@
for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
var _list = _dataAll.salesorder_item0List[i];
}
// for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
// var _list = _dataAll.receiptoutsoitemList[i];
// }
// for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
// var _list = _dataAll.arinvoices_item0soitemList[i];
// _list.attachMent = JSON.parse(_list.attachMent)
// }
// for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
// var _list = _dataAll.collectionsoitemList[i];
// }
// for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
// var _list = _dataAll.salesbacksoitemList[i];
// }
// for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
// var _list = _dataAll.paymentsoitemList[i];
// }
for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
var _list = _dataAll.receiptoutsoitemList[i];
}
for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
var _list = _dataAll.arinvoices_item0soitemList[i];
_list.attachMent = JSON.parse(_list.attachMent)
}
for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
var _list = _dataAll.collectionsoitemList[i];
}
for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
var _list = _dataAll.salesbacksoitemList[i];
}
for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
var _list = _dataAll.paymentsoitemList[i];
}
this.dataForm = _dataAll
},
},

2
SC-web/src/views/system/sysConfig/index.vue
Unescape View File

@ -78,7 +78,7 @@
<el-form-item label="登录方式">
<el-select v-model="baseForm.singleLogin" placeholder="请选择">
<el-option label="单一登录" :value="1" />
<el-option label="同时登录" :value="2" />
<!-- <el-option label="同时登录" :value="2" /> -->
</el-select>
</el-form-item>
<el-form-item label="超时登出">

Write Preview
Loading…
Cancel
Save