|
|
|
@ -24,17 +24,27 @@ import jnpf.materialvo.service.MaterialService;
|
|
|
|
|
import jnpf.mobilePort.utils.FileCopy;
|
|
|
|
|
import jnpf.payment.model.payment.PaymentListVO;
|
|
|
|
|
import jnpf.payment.service.PaymentService;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.permission.service.UserService;
|
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
|
|
import jnpf.purchaseback.entity.PurchasebackEntity;
|
|
|
|
|
import jnpf.purchaseback.entity.Purchaseback_item0Entity;
|
|
|
|
|
import jnpf.purchaseback.entity.PurchaseorderEntity;
|
|
|
|
|
import jnpf.purchaseback.service.PurchasebackService;
|
|
|
|
|
import jnpf.purchaseback.service.Purchaseback_item0Service;
|
|
|
|
|
import jnpf.purchaseback.service.PurchaseorderService;
|
|
|
|
|
import jnpf.purchaseorder.entity.*;
|
|
|
|
|
import jnpf.purchaseorder.model.purchaseorder.*;
|
|
|
|
|
import jnpf.purchaseorder.service.*;
|
|
|
|
|
import jnpf.receiptin.entity.ReceiptinEntity;
|
|
|
|
|
import jnpf.receiptin.entity.Receiptin_item0Entity;
|
|
|
|
|
import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
|
|
|
|
|
import jnpf.receiptin.service.ReceiptinService;
|
|
|
|
|
import jnpf.reservoirarea.entity.ReservoirareaEntity;
|
|
|
|
|
import jnpf.reservoirarea.service.ReservoirareaService;
|
|
|
|
|
import jnpf.supplier.entity.SupplierEntity;
|
|
|
|
|
import jnpf.supplier.service.SupplierService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
@ -54,6 +64,7 @@ import java.io.File;
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.nio.charset.Charset;
|
|
|
|
|
import java.text.ParseException;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
@ -115,6 +126,14 @@ public class PurchaseorderController {
|
|
|
|
|
private WareHouseService wareHouseService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ContractFileService contractFileService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private SupplierService supplierService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private UserService userService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ReceiptinService receiptinService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Purchaseback_item0Service purchaseback_item0Service;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 归档
|
|
|
|
@ -534,6 +553,15 @@ public class PurchaseorderController {
|
|
|
|
|
PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
|
|
|
|
|
PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
/*SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId());
|
|
|
|
|
if(supplierEntity != null){
|
|
|
|
|
vo.setSupplierName(supplierEntity.getSupplierName());
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(vo.getCreatorTime()!=null){
|
|
|
|
|
vo.setCreatorTime(vo.getCreatorTime());
|
|
|
|
|
}
|
|
|
|
@ -543,11 +571,14 @@ public class PurchaseorderController {
|
|
|
|
|
for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){
|
|
|
|
|
if(StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())){
|
|
|
|
|
MaterialEntity materialEntity = materialService.getById(purchaseorder_item0Entity.getMaterialId());
|
|
|
|
|
if(materialEntity != null && StringUtils.isNotEmpty(materialEntity.getInArea())){
|
|
|
|
|
purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea());
|
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea());
|
|
|
|
|
if(reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){
|
|
|
|
|
purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
|
|
|
|
|
if(materialEntity != null){
|
|
|
|
|
purchaseorder_item0Entity.setMaterialName(materialEntity.getItemName());
|
|
|
|
|
if(StringUtils.isNotEmpty(materialEntity.getInArea())){
|
|
|
|
|
purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea());
|
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea());
|
|
|
|
|
if(reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){
|
|
|
|
|
purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -564,6 +595,9 @@ public class PurchaseorderController {
|
|
|
|
|
for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){
|
|
|
|
|
}
|
|
|
|
|
vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class ));
|
|
|
|
|
if(invoicesitemList != null && invoicesitemList.size() > 0){
|
|
|
|
|
vo.setInvoicesitemEntity(invoicesitemList.get(0));
|
|
|
|
|
}
|
|
|
|
|
List<PaymentListVO> paymentList = paymentService.queryByPurchaseorderId(id);
|
|
|
|
|
vo.setPaymentList(paymentList);
|
|
|
|
|
QueryWrapper<PurchasebackEntity> purchasebackWrapper = new QueryWrapper<>();
|
|
|
|
@ -608,9 +642,20 @@ public class PurchaseorderController {
|
|
|
|
|
List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class);
|
|
|
|
|
for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){
|
|
|
|
|
Map<String,Object> vehicleIdMap = new HashMap<>();
|
|
|
|
|
jg_purchaseorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("389754644018016581","vehicle_id","ticketno",jg_purchaseorder_item0Model.getVehicleId(),vehicleIdMap));
|
|
|
|
|
jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581","vehicle_id","ticketno",jg_purchaseorder_item0Model.getVehicleId(),vehicleIdMap));
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
jg_purchaseorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_purchaseorder_item0Model.getMaterialId(),materialIdMap));
|
|
|
|
|
jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_purchaseorder_item0Model.getMaterialId(),materialIdMap));
|
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId());
|
|
|
|
|
jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate());
|
|
|
|
|
|
|
|
|
|
SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId());
|
|
|
|
|
if(supplierEntity != null){
|
|
|
|
|
jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName());
|
|
|
|
|
}
|
|
|
|
|
UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId());
|
|
|
|
|
if(userEntity != null){
|
|
|
|
|
jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList);
|
|
|
|
|
List<Invoices_item0itemEntity> jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id);
|
|
|
|
@ -633,10 +678,38 @@ public class PurchaseorderController {
|
|
|
|
|
|
|
|
|
|
List<PaymentListVO> paymentList = paymentService.queryByPurchaseorderId(id);
|
|
|
|
|
vo.setPaymentList(paymentList);
|
|
|
|
|
|
|
|
|
|
List<Receiptin_item0Entity> receiptin_item0itemList = purchaseorderitemService.GetReceiptin_item0itemList(id);
|
|
|
|
|
List<Receiptin_item0Model> jg_receiptin_item0ModelList = JsonUtil.getJsonToList(receiptin_item0itemList,Receiptin_item0Model.class);
|
|
|
|
|
vo.setReceiptin_item0List(jg_receiptin_item0ModelList);
|
|
|
|
|
QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
|
|
|
|
|
receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
|
|
|
|
|
ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
|
|
|
|
|
if(receiptinEntity != null){
|
|
|
|
|
vo.setReceiptamount(receiptinEntity.getReceiptamount());
|
|
|
|
|
vo.setReceiptnum(receiptinEntity.getReceiptnum());
|
|
|
|
|
}
|
|
|
|
|
/* `receiptamount` decimal(32,6) DEFAULT NULL COMMENT '入库金额',
|
|
|
|
|
`receiptnum` decimal(32,6) DEFAULT NULL COMMENT '入库数量',*/
|
|
|
|
|
|
|
|
|
|
QueryWrapper<PurchasebackEntity> purchasebackWrapper = new QueryWrapper<>();
|
|
|
|
|
purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id);
|
|
|
|
|
List<PurchasebackEntity> PurchasebackList = purchasebackService.list(purchasebackWrapper);
|
|
|
|
|
vo.setPurchasebackList(PurchasebackList);
|
|
|
|
|
BigDecimal refundNum = new BigDecimal(0);
|
|
|
|
|
BigDecimal refundAmount = new BigDecimal(0);
|
|
|
|
|
List<Purchaseback_item0Entity> purchaseback_item0EntityList = new ArrayList<>();
|
|
|
|
|
for (PurchasebackEntity purchasebackEntity: PurchasebackList) {
|
|
|
|
|
refundNum = refundNum.add(purchasebackEntity.getRefundNum());
|
|
|
|
|
refundAmount = refundAmount.add(purchasebackEntity.getRefundAmount());
|
|
|
|
|
QueryWrapper<Purchaseback_item0Entity> purchasebackitem0Wrapper = new QueryWrapper<>();
|
|
|
|
|
purchasebackitem0Wrapper.lambda().eq(Purchaseback_item0Entity::getPurchasebackId, purchasebackEntity.getId());
|
|
|
|
|
List<Purchaseback_item0Entity> purchaseback_item0List = purchaseback_item0Service.list(purchasebackitem0Wrapper);
|
|
|
|
|
purchaseback_item0EntityList.addAll(purchaseback_item0List);
|
|
|
|
|
}
|
|
|
|
|
vo.setRefundAmount(refundAmount);
|
|
|
|
|
vo.setRefundNum(refundNum);
|
|
|
|
|
vo.setPurchaseback_item0EntityList(purchaseback_item0EntityList);
|
|
|
|
|
List<CollectionpoEntity> jg_collectionList = purchaseorderitemService.GetCollectionitemList(id);
|
|
|
|
|
List<CollectionitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class);
|
|
|
|
|
for(CollectionitemModel jg_collectionModel : jg_collectionModelList){
|
|
|
|
@ -652,9 +725,9 @@ public class PurchaseorderController {
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
Map<String,Object> contractCodeMap = new HashMap<>();
|
|
|
|
|
vo.setContractCode(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",vo.getContractCode(),contractCodeMap));
|
|
|
|
|
vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",vo.getContractCode(),contractCodeMap));
|
|
|
|
|
Map<String,Object> supplierIdMap = new HashMap<>();
|
|
|
|
|
vo.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",vo.getSupplierId(),supplierIdMap));
|
|
|
|
|
vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",vo.getSupplierId(),supplierIdMap));
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|