|
|
|
@ -16,6 +16,7 @@ import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.config.ToolUtils;
|
|
|
|
|
import jnpf.contractfile.entity.ContractFileEntity;
|
|
|
|
|
import jnpf.contractfile.service.ContractFileService;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
@ -220,7 +221,7 @@ public class PurchaseorderController {
|
|
|
|
|
purchaseorder_item0Wrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
|
|
|
|
|
List<String> poundIdList = purchaseorder_item0Service.listObjs(purchaseorder_item0Wrapper).stream().map(o -> (String) o).collect(Collectors.toList());
|
|
|
|
|
List<PoundlistEntity> poundlistEntityList = new ArrayList<>();
|
|
|
|
|
if(poundIdList.size() > 0){
|
|
|
|
|
if (poundIdList.size() > 0) {
|
|
|
|
|
poundlistEntityList = poundlistService.queryPoundListByIds(poundIdList);
|
|
|
|
|
}
|
|
|
|
|
purchaseorderVO.setPoundlistEntityList(poundlistEntityList);
|
|
|
|
@ -330,8 +331,8 @@ public class PurchaseorderController {
|
|
|
|
|
|
|
|
|
|
String s = UUID.randomUUID().toString();
|
|
|
|
|
|
|
|
|
|
cn.hutool.core.io.FileUtil.del(new File(configValueUtil.getTemporaryFilePath() +"unzip\\"+s+"\\"));
|
|
|
|
|
String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\"+s+"\\";
|
|
|
|
|
cn.hutool.core.io.FileUtil.del(new File(configValueUtil.getTemporaryFilePath() + "unzip\\" + s + "\\"));
|
|
|
|
|
String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\" + s + "\\";
|
|
|
|
|
|
|
|
|
|
// String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
|
|
|
|
|
// fileName = XSSEscape.escape(fileName);
|
|
|
|
@ -343,8 +344,18 @@ public class PurchaseorderController {
|
|
|
|
|
|
|
|
|
|
InputStream inputStream = file.getInputStream();
|
|
|
|
|
File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK"));
|
|
|
|
|
List<Object> resultList= FileCopy.getInfoAndUpFile(gbk.listFiles());
|
|
|
|
|
List<Object> resultList = null;
|
|
|
|
|
ToolUtils cache = new ToolUtils();
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
resultList = FileCopy.getInfoAndUpFile(gbk.listFiles());
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
log.info("loadProperties IOException:" + e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
inputStream.close();
|
|
|
|
|
|
|
|
|
|
cache.forceDelete(temporaryFile);
|
|
|
|
|
|
|
|
|
|
// cn.hutool.core.io.FileUtil.del(temporaryFile);
|
|
|
|
|
// FileUtil.upFile(file, filePath, fileName);
|
|
|
|
|
DownloadVO vo = DownloadVO.builder().build();
|
|
|
|
@ -523,11 +534,11 @@ public class PurchaseorderController {
|
|
|
|
|
int i = 0;
|
|
|
|
|
for (String allId : idList) {
|
|
|
|
|
QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,allId);
|
|
|
|
|
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, allId);
|
|
|
|
|
queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
|
|
|
|
|
List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
|
|
|
|
|
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
|
|
|
|
|
for (PoundlistEntity poundlistEntity: poundlistList) {
|
|
|
|
|
for (PoundlistEntity poundlistEntity : poundlistList) {
|
|
|
|
|
poundlistEntity.setPurchaseStatus("99");
|
|
|
|
|
}
|
|
|
|
|
poundlistService.updateBatchById(poundlistList);
|
|
|
|
@ -554,7 +565,7 @@ public class PurchaseorderController {
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
for (String id : idList) {
|
|
|
|
|
PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
|
|
|
|
|
if(StringUtils.isNotEmpty(entity.getSupplierId())){
|
|
|
|
|
if (StringUtils.isNotEmpty(entity.getSupplierId())) {
|
|
|
|
|
SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
|
|
|
|
|
entity.setColectionBank(supplierEntity.getBank());
|
|
|
|
|
entity.setCollectionAccount(supplierEntity.getBankAccount());
|
|
|
|
@ -584,15 +595,15 @@ public class PurchaseorderController {
|
|
|
|
|
PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
|
|
|
|
|
PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
if(StringUtils.isNotEmpty(vo.getSupplierId())) {
|
|
|
|
|
if (StringUtils.isNotEmpty(vo.getSupplierId())) {
|
|
|
|
|
SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())) {
|
|
|
|
|
vo.setSupplierName(supplierEntity.getSupplierName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(vo.getContractCode())){
|
|
|
|
|
if (StringUtils.isNotEmpty(vo.getContractCode())) {
|
|
|
|
|
ContractFileEntity contractFileEntity = contractFileService.getById(vo.getContractCode());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
|
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())) {
|
|
|
|
|
vo.setContractName(contractFileEntity.getContractName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -611,13 +622,13 @@ public class PurchaseorderController {
|
|
|
|
|
purchaseorder_item0Entity.setMaterialName(materialEntity.getItemName());
|
|
|
|
|
if (StringUtils.isNotEmpty(materialEntity.getInArea())) {
|
|
|
|
|
purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea());
|
|
|
|
|
if(StringUtils.isNotEmpty(purchaseorder_item0Entity.getReservoirareaId())){
|
|
|
|
|
if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getReservoirareaId())) {
|
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(purchaseorder_item0Entity.getReservoirareaId());
|
|
|
|
|
if(reservoirareaEntity != null){
|
|
|
|
|
if (reservoirareaEntity != null) {
|
|
|
|
|
purchaseorder_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());
|
|
|
|
|
if(StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){
|
|
|
|
|
if (StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())) {
|
|
|
|
|
WareHouseEntity wareHouseEntity = wareHouseService.getById(reservoirareaEntity.getWarehouseId());
|
|
|
|
|
if(wareHouseEntity != null){
|
|
|
|
|
if (wareHouseEntity != null) {
|
|
|
|
|
purchaseorder_item0Entity.setWarehouseName(wareHouseEntity.getName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -646,16 +657,16 @@ public class PurchaseorderController {
|
|
|
|
|
QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
|
|
|
|
|
receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
|
|
|
|
|
ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
|
|
|
|
|
if(receiptinEntity != null){
|
|
|
|
|
if (receiptinEntity != null) {
|
|
|
|
|
vo.setReceiptamount(receiptinEntity.getReceiptamount());
|
|
|
|
|
vo.setReceiptnum(receiptinEntity.getReceiptnum());
|
|
|
|
|
QueryWrapper<Receiptin_item0Entity> receiptinitem0Wrapper = new QueryWrapper<>();
|
|
|
|
|
receiptinitem0Wrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, receiptinEntity.getId());
|
|
|
|
|
List<Receiptin_item0Entity> receiptin_item0EntityList = receiptin_item0Service.list(receiptinitem0Wrapper);
|
|
|
|
|
receiptinEntity.setReceiptin_item0List(receiptin_item0EntityList);
|
|
|
|
|
vo.setReceiptin_item0List(JsonUtil.getJsonToList(receiptin_item0EntityList,Receiptin_item0Model.class ));
|
|
|
|
|
vo.setReceiptin_item0List(JsonUtil.getJsonToList(receiptin_item0EntityList, Receiptin_item0Model.class));
|
|
|
|
|
vo.setReceiptinEntity(receiptinEntity);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
vo.setReceiptinEntity(new ReceiptinEntity());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -749,11 +760,6 @@ public class PurchaseorderController {
|
|
|
|
|
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);
|
|
|
|
@ -768,7 +774,7 @@ public class PurchaseorderController {
|
|
|
|
|
List<Receiptin_item0Entity> receiptin_item0EntityList = receiptin_item0Service.list(receiptinitem0Wrapper);
|
|
|
|
|
receiptinEntity.setReceiptin_item0List(receiptin_item0EntityList);
|
|
|
|
|
vo.setReceiptinEntity(receiptinEntity);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
vo.setReceiptinEntity(new ReceiptinEntity());
|
|
|
|
|
}
|
|
|
|
|
QueryWrapper<PurchasebackEntity> purchasebackWrapper = new QueryWrapper<>();
|
|
|
|
@ -804,11 +810,11 @@ public class PurchaseorderController {
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractCode());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
|
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())) {
|
|
|
|
|
vo.setContractName(contractFileEntity.getContractName());
|
|
|
|
|
}
|
|
|
|
|
SupplierEntity supplierEntity = supplierService.getInfo(vo.getSupplierId());
|
|
|
|
|
if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())){
|
|
|
|
|
if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())) {
|
|
|
|
|
vo.setSupplierName(supplierEntity.getSupplierName());
|
|
|
|
|
}
|
|
|
|
|
// Map<String, Object> contractCodeMap = new HashMap<>();
|
|
|
|
@ -948,11 +954,11 @@ public class PurchaseorderController {
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
purchaseorderitemService.delete(entity);
|
|
|
|
|
QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId());
|
|
|
|
|
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId());
|
|
|
|
|
queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
|
|
|
|
|
List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
|
|
|
|
|
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
|
|
|
|
|
for (PoundlistEntity poundlistEntity: poundlistList) {
|
|
|
|
|
for (PoundlistEntity poundlistEntity : poundlistList) {
|
|
|
|
|
poundlistEntity.setPurchaseStatus("99");
|
|
|
|
|
}
|
|
|
|
|
poundlistService.updateBatchById(poundlistList);
|
|
|
|
@ -975,6 +981,4 @@ public class PurchaseorderController {
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|