|
|
@ -25,6 +25,10 @@ import jnpf.materialvo.service.MaterialService;
|
|
|
|
import jnpf.mobilePort.utils.FileCopy;
|
|
|
|
import jnpf.mobilePort.utils.FileCopy;
|
|
|
|
import jnpf.payment.model.payment.PaymentListVO;
|
|
|
|
import jnpf.payment.model.payment.PaymentListVO;
|
|
|
|
import jnpf.payment.service.PaymentService;
|
|
|
|
import jnpf.payment.service.PaymentService;
|
|
|
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocEntity;
|
|
|
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
|
|
|
|
|
|
|
|
import jnpf.paymentdoc.service.PaymentdocItem0Service;
|
|
|
|
|
|
|
|
import jnpf.paymentdoc.service.PaymentdocService;
|
|
|
|
import jnpf.permission.service.UserService;
|
|
|
|
import jnpf.permission.service.UserService;
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
@ -141,6 +145,10 @@ public class PurchaseorderController {
|
|
|
|
private Receiptin_item0Service receiptin_item0Service;
|
|
|
|
private Receiptin_item0Service receiptin_item0Service;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private VehicleService vehicleService;
|
|
|
|
private VehicleService vehicleService;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private PaymentdocItem0Service paymentdocItem0Service;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private PaymentdocService paymentdocService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 归档
|
|
|
|
* 归档
|
|
|
@ -677,6 +685,32 @@ public class PurchaseorderController {
|
|
|
|
vo.setInvoicesitemEntity(invoicesitemList.get(0));
|
|
|
|
vo.setInvoicesitemEntity(invoicesitemList.get(0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<PaymentdocItem0Entity> docItem0Wrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
docItem0Wrapper.lambda().eq(PaymentdocItem0Entity::getPurchaseorderId, id);
|
|
|
|
|
|
|
|
List<PaymentdocItem0Entity> paymentdocItem0EntityList = paymentdocItem0Service.list(docItem0Wrapper);
|
|
|
|
|
|
|
|
List<PaymentdocEntity> PaymentdocEntity11 = new ArrayList<>();
|
|
|
|
|
|
|
|
if ( paymentdocItem0EntityList != null) {
|
|
|
|
|
|
|
|
for (int i=0;i<paymentdocItem0EntityList.size();i++){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<PaymentdocEntity> docWrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
docWrapper.lambda().eq(PaymentdocEntity::getId,paymentdocItem0EntityList.get(i).getPaymentdocId());
|
|
|
|
|
|
|
|
// PaymentdocEntity paymentdocEntity1=new PaymentdocEntity();
|
|
|
|
|
|
|
|
// paymentdocEntity1= (PaymentdocEntity) paymentdocService.list(docWrapper);
|
|
|
|
|
|
|
|
List<PaymentdocEntity> paymentdocEntityList = paymentdocService.list(docWrapper);
|
|
|
|
|
|
|
|
PaymentdocEntity11.addAll(paymentdocEntityList);
|
|
|
|
|
|
|
|
// paymentdocItem0Entity.setPaymentdocEntities(paymentdocEntityList);
|
|
|
|
|
|
|
|
// vo.setPaymentdocEntity(JsonUtil.getJsonToList(paymentdocEntityList, PaymentdocEntity.class));
|
|
|
|
|
|
|
|
// vo.setPaymentdocItem0EntityList(paymentdocItem0Entity);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
vo.setPaymentdocEntityList(PaymentdocEntity11);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// else {
|
|
|
|
|
|
|
|
// vo.setPaymentdocEntity(new PaymentdocEntity());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
|
|
|
|
receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
|
|
|
|
receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
|
|
|
|
ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
|
|
|
|
ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
|
|
|
@ -700,6 +734,8 @@ public class PurchaseorderController {
|
|
|
|
purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id);
|
|
|
|
purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id);
|
|
|
|
List<PurchasebackEntity> PurchasebackList = purchasebackService.list(purchasebackWrapper);
|
|
|
|
List<PurchasebackEntity> PurchasebackList = purchasebackService.list(purchasebackWrapper);
|
|
|
|
vo.setPurchasebackList(PurchasebackList);
|
|
|
|
vo.setPurchasebackList(PurchasebackList);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
|
|
|
|
List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
|
|
|
|
for (CollectionpoEntity collectionpoEntity : CollectionitemList) {
|
|
|
|
for (CollectionpoEntity collectionpoEntity : CollectionitemList) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|